From 6777ec139829fcacbb5dba3349143986b849bb5e Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Thu, 1 Sep 2016 16:16:44 +0200 Subject: [PATCH 001/267] adding melange downcast support for GEMOC animation support of melange:/ resource and use of external language support for progress bar while loading --- .../engine/ui/commons/RunConfiguration.java | 13 +- .../AbstractSequentialGemocLauncher.java | 4 + .../engine/commons/ModelExecutionContext.java | 6 +- .../META-INF/MANIFEST.MF | 3 +- .../modelloader/DefaultModelLoader.java | 278 +++++++++++++++--- .../xdsmlframework/api/core/IModelLoader.java | 3 + .../javaengine/ui/launcher/Launcher.java | 1 + .../tabs/LaunchConfigurationMainTab.java | 25 ++ 8 files changed, 283 insertions(+), 50 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java index 3c496e4c1..30b6b8f7e 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java @@ -49,6 +49,7 @@ protected void extractInformation() throws CoreException { _modelEntryPoint = getAttribute(LAUNCH_MODEL_ENTRY_POINT, ""); _modelInitializationMethod = getAttribute(LAUNCH_INITIALIZATION_METHOD, ""); _modelInitializationArguments = getAttribute(LAUNCH_INITIALIZATION_ARGUMENTS, ""); + _melangeQuery = getAttribute(LAUNCH_MELANGE_QUERY, ""); for (EngineAddonSpecificationExtension extension : EngineAddonSpecificationExtensionPoint.getSpecifications()) { _engineAddonExtensions.put(extension, getAttribute(extension.getName(), false)); @@ -92,13 +93,11 @@ public String getMelangeQuery() { } @Override - public URI getExecutedModelAsMelangeURI() { - //TODO: disabled until we have Melange Resource - return _modelURI; -// if (_melangeQuery.isEmpty()) -// return _modelURI; -// String melangeURIString = _modelURI.toString().replace("platform:/", "melange:/") + _melangeQuery; -// return URI.createURI(melangeURIString); + public URI getExecutedModelAsMelangeURI() { + if (_melangeQuery.isEmpty()) + return _modelURI; + String melangeURIString = _modelURI.toString().replace("platform:/", "melange:/") + _melangeQuery; + return URI.createURI(melangeURIString); } private URI _animatorURI; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java index e8557d927..1465d59a8 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java @@ -53,6 +53,9 @@ abstract public class AbstractSequentialGemocLauncher extends AbstractGemocLaunc protected IBasicExecutionEngine _executionEngine; + // progress monitor used during launch; useful for operations that wish to contribute to the progress bar + protected IProgressMonitor launchProgressMonitor = null; + protected abstract IBasicExecutionEngine createExecutionEngine(RunConfiguration runConfiguration, ExecutionMode executionMode) throws CoreException, EngineContextException; @@ -75,6 +78,7 @@ public final void launch(final ILaunchConfiguration configuration, final String try { debug("About to initialize and run the GEMOC Execution Engine..."); + launchProgressMonitor = monitor; // make sure to have the engine view when starting the engine PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java index 5bdd1d048..e64eb8503 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java @@ -75,6 +75,11 @@ public void initializeResourceModel() { setUpEditingDomain(); + //checkResourceSetContent(); + + } + + protected void checkResourceSetContent(){ // check that the initial resource hasn't been loaded more than once // (e.g. via melange) // pure debug code: has no side effect on anything @@ -92,7 +97,6 @@ public void initializeResourceModel() { foundOnce = true; } } - } protected IExecutionPlatform createExecutionPlatform() throws CoreException { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF index 4cbbfd090..dd1aede1b 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF @@ -19,7 +19,8 @@ Require-Bundle: org.gemoc.xdsmlframework.api, org.gemoc.executionframework.engine, org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", org.eclipse.ui.ide;bundle-version="3.10.2", - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" + fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", + fr.inria.diverse.melange.resource;bundle-version="0.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.gemoc.executionframework.extensions.sirius, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index be8882beb..8e6a5601b 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -28,6 +29,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.xmi.XMLResource; import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; @@ -61,6 +63,8 @@ import org.gemoc.xdsmlframework.api.core.IExecutionContext; import org.gemoc.xdsmlframework.api.core.IModelLoader; +import fr.inria.diverse.melange.resource.MelangeRegistry; +import fr.inria.diverse.melange.resource.MelangeResourceImpl; import fr.obeo.dsl.debug.ide.sirius.ui.services.AbstractDSLDebuggerServices; public class DefaultModelLoader implements IModelLoader { @@ -98,11 +102,15 @@ public Resource loadModelForAnimation(IExecutionContext context) } catch (CoreException e) { throw new RuntimeException(e); } - // At this point Sirius has loaded the model, so we just need to - // find it + // At this point Sirius has loaded the model, so we just need to find it + boolean useMelange = context.getRunConfiguration().getMelangeQuery() != null + && !context.getRunConfiguration().getMelangeQuery().isEmpty(); + // calculating model URI as MelangeURI + URI modelURI = useMelange ? context.getRunConfiguration() + .getExecutedModelAsMelangeURI() : context.getRunConfiguration() + .getExecutedModelURI(); for (Resource r : resourceSet.getResources()) { - if (r.getURI().equals( - context.getRunConfiguration().getExecutedModelURI())) { + if (r.getURI().equals(modelURI)) { resource = r; break; } @@ -159,45 +167,73 @@ public void run() { private Session openNewSiriusSession(IExecutionContext context, URI sessionResourceURI) throws CoreException { + + SubMonitor subMonitor = SubMonitor.convert(this.progressMonitor, 10); + boolean useMelange = context.getRunConfiguration().getMelangeQuery() != null && !context.getRunConfiguration().getMelangeQuery().isEmpty(); + if( useMelange){ + subMonitor.setTaskName("Loading model for animation with melange"); + } else { + subMonitor.setTaskName("Loading model for animation"); + } // calculating model URI as MelangeURI URI modelURI = useMelange ? context.getRunConfiguration() .getExecutedModelAsMelangeURI() : context.getRunConfiguration() .getExecutedModelURI(); + + subMonitor.subTask("Configuring ResourceSet"); + subMonitor.newChild(1); // create and configure resource set HashMap nsURIMapping = getnsURIMapping(context); - final ResourceSet rs = createAndConfigureResourceSet(modelURI, - nsURIMapping); + //final ResourceSet rs = createAndConfigureResourceSet(modelURI, nsURIMapping); + final ResourceSet rs = createAndConfigureResourceSetV2(modelURI, nsURIMapping); + subMonitor.subTask("Loading model"); + subMonitor.newChild(3); // load model resource and resolve all proxies - // Resource r = rs.getResource(modelURI, true); + Resource r = rs.getResource(modelURI, true); + EcoreUtil.resolveAll(rs); +// EObject root = r.getContents().get(0); + // force adaptee model resource in the main ResourceSet + if(r instanceof MelangeResourceImpl){ + MelangeResourceImpl mr = (MelangeResourceImpl)r; + rs.getResources().add(mr.getWrappedResource()); + } // calculating aird URI - URI airdURI = useMelange ? URI.createURI(sessionResourceURI.toString() - .replace("platform:/", "melange:/")) : sessionResourceURI; + /*URI airdURI = useMelange ? URI.createURI(sessionResourceURI.toString() + .replace("platform:/", "melange:/")) : sessionResourceURI;*/ + URI airdURI = sessionResourceURI; // URI airdURI = sessionResourceURI; + subMonitor.subTask("Creating Sirius session"); + subMonitor.newChild(1); // create and load sirius session final Session session = DebugSessionFactory.INSTANCE.createSession(rs, airdURI); - final IProgressMonitor monitor = new NullProgressMonitor(); + //final IProgressMonitor monitor = new NullProgressMonitor(); final TransactionalEditingDomain editingDomain = session .getTransactionalEditingDomain(); - session.open(monitor); + subMonitor.subTask("Opening Sirius session"); + session.open(subMonitor.newChild(2)); // EcoreUtil.resolveAll(rs); // activating layers + subMonitor.subTask("Opening Sirius editors"); + SubMonitor openEditorSubMonitor = subMonitor.newChild(2); for (DView view : session.getSelectedViews()) { for (DRepresentation representation : view .getOwnedRepresentations()) { + + final DSemanticDiagram diagram = (DSemanticDiagram) representation; - + openEditorSubMonitor.subTask(diagram.getName()); final List elements = new ArrayList(); elements.add(diagram); final IEditorPart editorPart = DialectUIManager.INSTANCE - .openEditor(session, representation, monitor); + .openEditor(session, representation, openEditorSubMonitor.newChild(1)); if (editorPart instanceof DDiagramEditor) { ((DDiagramEditor) editorPart).getPaletteManager() .addToolFilter(new ToolFilter() { @@ -234,7 +270,7 @@ protected void doExecute() { && !diagram.getActivatedLayers() .contains(l)) { ChangeLayerActivationCommand c = new ChangeLayerActivationCommand( - editingDomain, diagram, l, monitor); + editingDomain, diagram, l, openEditorSubMonitor.newChild(1)); c.execute(); } } @@ -253,16 +289,39 @@ private ResourceSet createAndConfigureResourceSet(URI modelURI, final String fileExtension = modelURI.fileExtension(); // indicates which melange query should be added to the xml uri handler // for a given extension - final XMLURIHandler handler = new XMLURIHandler(modelURI.query(), - fileExtension); // use to resolve cross ref + final XMLURIHandler handler = new XMLURIHandler(modelURI.query(), fileExtension); // use to resolve cross ref + // URI during XMI parsing + //final XtextPlatformResourceURIHandler handler = new XtextPlatformResourceURIHandler(); + handler.setResourceSet(rs); + rs.getLoadOptions().put(XMLResource.OPTION_URI_HANDLER, handler); + + final MelangeURIConverter converter = new MelangeURIConverter(fileExtension, nsURIMapping); + //final ExtensibleURIConverterImpl converter = new ExtensibleURIConverterImpl(); + rs.setURIConverter(converter); + // fix sirius to prevent non intentional model savings + converter.getURIHandlers().add(0, new DebugURIHandler()); + + return rs; + } + + private ResourceSet createAndConfigureResourceSetV2(URI modelURI, HashMap nsURIMapping) { + final ResourceSet rs = ResourceSetFactory.createFactory() + .createResourceSet(modelURI); + final String fileExtension = modelURI.fileExtension(); + // indicates which melange query should be added to the xml uri handler + // for a given extension + final XMLURIHandlerV2 handler = new XMLURIHandlerV2(modelURI.query(), fileExtension); // use to resolve cross ref // URI during XMI parsing - handler.setResourceSet(rs); + //final XtextPlatformResourceURIHandler handler = new XtextPlatformResourceURIHandler(); + handler.setResourceSet(rs); rs.getLoadOptions().put(XMLResource.OPTION_URI_HANDLER, handler); - final MelangeURIConverter converter = new MelangeURIConverter( - fileExtension, nsURIMapping); + + final MelangeURIConverterV2 converter = new MelangeURIConverterV2(fileExtension, nsURIMapping); + //final ExtensibleURIConverterImpl converter = new ExtensibleURIConverterImpl(); rs.setURIConverter(converter); // fix sirius to prevent non intentional model savings converter.getURIHandlers().add(0, new DebugURIHandler()); + return rs; } @@ -272,40 +331,93 @@ private ResourceSet createAndConfigureResourceSet(URI modelURI, // in some way so we can retreive it protected HashMap getnsURIMapping(IExecutionContext context) { HashMap nsURIMapping = new HashMap(); - // dirty hack, simply open the original file in a separate ResourceSet - // and ask its root element class nsURI + + final String langQuery = "lang="; String melangeQuery = context.getRunConfiguration() .getExecutedModelAsMelangeURI().query(); if (melangeQuery != null && !melangeQuery.isEmpty() - && melangeQuery.startsWith("mt=")) { - String targetNsUri = melangeQuery.substring(melangeQuery - .indexOf('=') + 1); + && melangeQuery.contains(langQuery)) { + + String targetLanguage = melangeQuery.substring(melangeQuery + .indexOf(langQuery) + langQuery.length()); + if(targetLanguage.contains("&")){ + targetLanguage = targetLanguage.substring(0, targetLanguage.indexOf("&")); + } + String targetLanguageNsURI = MelangeRegistry.INSTANCE.getLanguageByIdentifier(targetLanguage).getUri(); + + // simply open the original model file in a separate ResourceSet + // and ask its root element class nsURI Object o = EMFResource.getFirstContent(context .getRunConfiguration().getExecutedModelURI()); if (o instanceof EObject) { - // DIRTY, try to find best nsURI, need major refactoring in - // Melange, EPackage rootPackage = ((EObject) o).eClass().getEPackage(); while (rootPackage.getESuperPackage() != null) { rootPackage = rootPackage.getESuperPackage(); } - nsURIMapping.put(rootPackage.getNsURI(), targetNsUri); + nsURIMapping.put(rootPackage.getNsURI(), targetLanguageNsURI); } } - // a better solution would be to add the relevant data in xdsml and look - // for the mapping there - /* - * String xdsmluri = - * context.getLanguageDefinitionExtension().getXDSMLFilePath(); if - * (!xdsmluri.startsWith("platform:/plugin")) xdsmluri = - * "platform:/plugin" + xdsmluri; Object o = - * EMFResource.getFirstContent(xdsmluri); if(o != null && o instanceof - * LanguageDefinition){ LanguageDefinition ld = (LanguageDefinition)o; - * ... } - */ + return nsURIMapping; } + class MelangeURIConverterV2 extends ExtensibleURIConverterImpl { + + private String _fileExtension; + private HashMap _nsURIMapping; + + public MelangeURIConverterV2(String fileExtension, + HashMap nsURIMapping) { + _fileExtension = fileExtension; + _nsURIMapping = nsURIMapping; + } + + @SuppressWarnings("resource") + @Override + public InputStream createInputStream(URI uri, Map options) + throws IOException { + InputStream result = null; + + // do not modify content of files loaded using melange:/ scheme + // melange is supposed to do the job + //if (uri.scheme()!= null && uri.scheme().equals("melange")) { + // return super.createInputStream(uri); + //} + if(uri.fileExtension() == null || !uri.fileExtension().equals("aird")){ + // only the root aird must be adapted + return super.createInputStream(uri, options); + } + + InputStream originalInputStream = null; + try { + originalInputStream = super.createInputStream(uri, options); + String originalContent = convertStreamToString(originalInputStream); + String modifiedContent = originalContent; + for (Entry entry : _nsURIMapping + .entrySet()) { + modifiedContent = modifiedContent.replace( + entry.getKey(), entry.getValue()); + } + result = new StringInputStream(modifiedContent); + return result; + } finally { + if (originalInputStream != null) { + originalInputStream.close(); + } + } + + } + + private String convertStreamToString(java.io.InputStream is) { + java.util.Scanner s1 = new java.util.Scanner(is); + java.util.Scanner s2 = s1.useDelimiter("\\A"); + String result = s2.hasNext() ? s2.next() : ""; + s1.close(); + s2.close(); + return result; + } + } + class MelangeURIConverter extends ExtensibleURIConverterImpl { private String _fileExtension; @@ -326,8 +438,8 @@ public InputStream createInputStream(URI uri, Map options) // platform:/... and without the ?xx=... URI uriToUse = uri; boolean useSuperMethod = true; - - if (uri.scheme().equals("melange")) { +/* + if (uri.scheme()!= null && uri.scheme().equals("melange")) { // may be null in relative path String uriAsString = uri.toString().replace("melange:/", "platform:/"); if (uri.fileExtension() != null @@ -357,7 +469,37 @@ public InputStream createInputStream(URI uri, Map options) uriToUse = URI.createURI(uriAsString); } } - +*/ + + if (uri.fileExtension() != null + && uri.fileExtension().equals(_fileExtension)) { + /* String uriAsString = uri.toString().replace("melange:/", + "platform:/");*/ + useSuperMethod = false; + /*uriAsString = uriAsString.substring(0, + uriAsString.indexOf('?'));*/ + uriToUse = uri ; //URI.createURI(uri); + InputStream originalInputStream = null; + try { + originalInputStream = super.createInputStream(uriToUse, + options); + String originalContent = convertStreamToString(originalInputStream); + String modifiedContent = originalContent; + for (Entry entry : _nsURIMapping + .entrySet()) { + modifiedContent = modifiedContent.replace( + entry.getKey(), entry.getValue()); + } + result = new StringInputStream(modifiedContent); + } finally { + if (originalInputStream != null) { + originalInputStream.close(); + } + } + } else { + + } + if (useSuperMethod) { result = super.createInputStream(uriToUse, options); } @@ -436,10 +578,64 @@ public URI resolve(URI uri) { lastIndexOfFileExtension + fileExtensionWithPoint.length()); String newURIAsString = part1 + part2 + part3; + return URI.createURI(newURIAsString); } + else if(resolvedURI.fileExtension().equals(_fileExtension)){ + return resolvedURI; + } return resolvedURI; } } + + /** + * change scheme to melange:// for files with the given fileextension + * @author dvojtise + * + */ + class XMLURIHandlerV2 extends XtextPlatformResourceURIHandler { + + private String _queryParameters; + private String _fileExtension; + + public XMLURIHandlerV2(String queryParameters, String fileExtension) { + _queryParameters = queryParameters; + if (_queryParameters == null) + _queryParameters = ""; + else + _queryParameters = "?" + _queryParameters; + _fileExtension = fileExtension; + } + + @Override + public URI resolve(URI uri) { + URI resolvedURI = super.resolve(uri); + if (resolvedURI.scheme() != null + && !resolvedURI.scheme().equals("melange") + && resolvedURI.fileExtension().equals(_fileExtension)) { + + // TODO find a smarter way to decide if a file should be loaded as melange or not + + String fileExtensionWithPoint = "." + _fileExtension; + int lastIndexOfFileExtension = resolvedURI.toString() + .lastIndexOf(fileExtensionWithPoint); + String part1 = resolvedURI.toString().substring(0, + lastIndexOfFileExtension); + part1 = part1.replaceFirst("platform:/", "melange:/"); + String part2 = fileExtensionWithPoint + _queryParameters; + String part3 = resolvedURI.toString().substring( + lastIndexOfFileExtension + + fileExtensionWithPoint.length()); + String newURIAsString = part1 + part2 + part3; + return URI.createURI(newURIAsString); + } + return resolvedURI; + } + } + IProgressMonitor progressMonitor; + @Override + public void setProgressMonitor(IProgressMonitor progressMonitor) { + this.progressMonitor = progressMonitor; + } } diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java index 424e68b21..acea5f40f 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.gemoc.xdsmlframework.api.core; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.emf.ecore.resource.Resource; /** @@ -24,5 +25,7 @@ public interface IModelLoader { Resource loadModel(IExecutionContext context); /** load model when running in animation mode */ Resource loadModelForAnimation(IExecutionContext context); + /** if not null, the progress monitor used to report load progress */ + void setProgressMonitor(IProgressMonitor progressMonitor); } diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java index 5128f89e4..e431a3572 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java @@ -61,6 +61,7 @@ protected IBasicExecutionEngine createExecutionEngine(RunConfiguration runConfig // create and initialize engine IBasicExecutionEngine executionEngine = new PlainK3ExecutionEngine(); ModelExecutionContext executioncontext = new SequentialModelExecutionContext(runConfiguration, executionMode); + executioncontext.getExecutionPlatform().getModelLoader().setProgressMonitor(this.launchProgressMonitor); executioncontext.initializeResourceModel(); executionEngine.initialize(executioncontext); return executionEngine; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index 6c1f45f01..13d3c1b4a 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -166,6 +166,8 @@ public void performApply(ILaunchConfigurationWorkingCopy configuration) { Integer.parseInt(_delayText.getText())); configuration.setAttribute(RunConfiguration.LAUNCH_SELECTED_LANGUAGE, _languageCombo.getText()); + configuration.setAttribute(RunConfiguration.LAUNCH_MELANGE_QUERY, + _melangeQueryText.getText()); configuration.setAttribute(RunConfiguration.LAUNCH_MODEL_ENTRY_POINT, _entryPointModelElementText.getText()); configuration.setAttribute(RunConfiguration.LAUNCH_METHOD_ENTRY_POINT, @@ -339,6 +341,13 @@ public void widgetSelected(SelectionEvent e) { }); createTextLabelLayout(parent, ""); + createTextLabelLayout(parent, "Melange resource adapter query"); + _melangeQueryText = new Text(parent, SWT.SINGLE | SWT.BORDER); + _melangeQueryText.setLayoutData(createStandardLayout()); + _melangeQueryText.setFont(font); + _melangeQueryText.setEditable(false); + createTextLabelLayout(parent, ""); + return parent; } @@ -423,6 +432,22 @@ protected void updateLaunchConfigurationDialog() { _k3Area.setVisible(true); _modelInitializationMethodText.setText(getModelInitializationMethodName()); _modelInitializationArgumentsText.setEnabled(!_modelInitializationMethodText.getText().isEmpty()); + _melangeQueryText.setText(computeMelangeQuery()); + } + + /** + * compute the melange query for loading the given model as the requested language + * If the language is already the good one, the query will be empty. (ie. melange adapter is not used) + * @return + */ + protected String computeMelangeQuery(){ + String result = ""; + String languageName = this._languageCombo.getText(); + if(!this._modelLocationText.getText().isEmpty() && !languageName.isEmpty()){ + String languageMT = languageName+"MT"; // TODO find in Melange registry + result="?lang="+languageName+"&mt="+languageMT; + } + return result; } protected String getModelInitializationMethodName(){ From 848978277f44d6b3c20d274dc728e5ad0a6750a9 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Tue, 13 Sep 2016 14:03:27 +0200 Subject: [PATCH 002/267] Improved state graph layouting, and added a diff viewer allowing to compare two execution traces --- ...scientGenericSequentialModelDebugger.xtend | 4 +- pom.xml | 5 + .../trace/gemoc/api/ITraceExtractor.java | 19 +- .../gemoc/traceaddon/AbstractTraceAddon.xtend | 2 +- .../traceaddon/GenericTraceExtractor.java | 10 + .../TraceExtractorGeneratorJava.xtend | 30 +- .../.classpath | 7 + .../.project | 28 ++ .../.settings/org.eclipse.jdt.core.prefs | 7 + .../META-INF/MANIFEST.MF | 16 + .../build.properties | 5 + .../icons/IconeGemocModel-16.png | Bin 0 -> 763 bytes .../icons/insp_sbook.gif | Bin 0 -> 546 bytes .../plugin.xml | 41 ++ .../pom.xml | 15 + .../diffviewer/Activator.java | 50 +++ .../diffviewer/logic/Diff.java | 20 + .../diffviewer/logic/DiffComputer.java | 100 +++++ .../views/TimelineDiffViewerRenderer.java | 122 ++++++ .../views/TimelineDiffViewerViewPart.java | 181 ++++++++ .../META-INF/MANIFEST.MF | 8 +- .../plugin.xml | 2 +- ... => MultidimensionalTimelineRenderer.java} | 64 ++- ... => MultidimensionalTimelineViewPart.java} | 96 +---- .../META-INF/MANIFEST.MF | 10 +- .../icons/cycle_coloration.gif | Bin 0 -> 364 bytes .../icons/cycle_coloration.png | Bin 646 -> 0 bytes .../icons/jload_obj.gif | Bin 0 -> 367 bytes .../icons/refresh_layout.gif | Bin 0 -> 327 bytes .../plugin.xml | 6 + .../pom.xml | 15 + .../layout/StateGraphLayoutCommand.java | 42 ++ .../layout/StateGraphLayoutConnector.java | 109 +++++ .../layout/StateGraphLayoutSetup.java | 41 ++ .../stategraph/logic/StateGraph.java | 84 ++-- .../stategraph/logic/StateVertex.java | 23 +- .../stategraph/views/CurvedEdgeView.java | 99 +++++ .../stategraph/views/CycleView.java | 61 +++ .../stategraph/views/EdgeView.java | 27 ++ .../stategraph/views/StateGraphRenderer.java | 385 ++++++------------ .../stategraph/views/StateGraphViewPart.java | 359 +++++++++++----- .../stategraph/views/StraightEdgeView.java | 74 ++++ .../stategraph/views/VertexView.java | 112 +++++ trace/manager/pom.xml | 2 + 44 files changed, 1742 insertions(+), 539 deletions(-) create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.classpath create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.project create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.settings/org.eclipse.jdt.core.prefs create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/build.properties create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/IconeGemocModel-16.png create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/insp_sbook.gif create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/plugin.xml create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/pom.xml create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/Activator.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/Diff.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java rename trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/{timeline/FxTraceListener.java => MultidimensionalTimelineRenderer.java} (95%) rename trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/{timeline/MultidimensionalTimeLineView.java => MultidimensionalTimelineViewPart.java} (83%) create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/cycle_coloration.gif delete mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/cycle_coloration.png create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/jload_obj.gif create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/refresh_layout.gif create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/pom.xml create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CycleView.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/EdgeView.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/VertexView.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend index a0eb6ae3e..003819795 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend @@ -109,7 +109,7 @@ public class OmniscientGenericSequentialModelDebugger extends GenericSequentialM if (steppingOverStackFrameIndex != -1) { val seqEngine = engine as IExecutionEngine val stack = traceExplorer.callStack - val idx = stack.size - steppingOverStackFrameIndex + val idx = stack.size - steppingOverStackFrameIndex - 1 // We add a future break as soon as the step is over addPredicateBreak(new BiPredicate() { // The operation we want to step over @@ -152,7 +152,7 @@ public class OmniscientGenericSequentialModelDebugger extends GenericSequentialM if (steppingReturnStackFrameIndex != -1) { val seqEngine = engine as IExecutionEngine val stack = traceExplorer.callStack - val idx = stack.size - steppingReturnStackFrameIndex + val idx = stack.size - steppingReturnStackFrameIndex - 1 addPredicateBreak(new BiPredicate() { private MSEOccurrence steppedReturn = stack.get(idx).mseoccurrence diff --git a/pom.xml b/pom.xml index 6b05f7271..eacf953ac 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,11 @@ p2 http://melange-lang.org/updatesite/ + + elk + p2 + http://download.eclipse.org/elk/updates/releases/0.1.0/ + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java index 5e8c934e8..35af299bf 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java @@ -85,6 +85,13 @@ public interface ITraceExtractor { * @return A generic wrapper of the state */ StateWrapper getStateWrapper(int stateIndex); + + /** + * Creates and returns a generic wrapper of the provided specific state. + * @param state The state to create a wrapper for + * @return A generic wrapper of the state + */ + StateWrapper getStateWrapper(EObject state); /** * Returns a list of generic wrappers of the specific states located between @@ -183,17 +190,27 @@ class StateWrapper { public EObject state; public int stateIndex; public boolean breakable; + public String description; public StateWrapper() { state = null; stateIndex = -1; breakable = false; + description = ""; } - + public StateWrapper(EObject value, int stateIndex, boolean breakable) { this.state = value; this.stateIndex = stateIndex; this.breakable = breakable; + this.description = ""; + } + + public StateWrapper(EObject value, int stateIndex, boolean breakable, String description) { + this.state = value; + this.stateIndex = stateIndex; + this.breakable = breakable; + this.description = description; } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index a4cf0be3b..369068f1e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -106,8 +106,8 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi traceConstructor.addStep(step) else traceConstructor.endStep(step) - traceExplorer.updateCallStack(step) traceExtractor.update() + traceExplorer.updateCallStack(step) ]) if (shouldSave) { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index 2eceaa727..53fe751c6 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -120,4 +120,14 @@ public Collection> computeStateEquivalenceClasses() { return null; } + @Override + public StateWrapper getStateWrapper(EObject state) { + return null; + } + + @Override + public int[][] alignTraces(List states1, List states2) { + return null; + } + } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend index 2e7195a87..082ba6e39 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend @@ -294,9 +294,11 @@ class TraceExtractorGeneratorJava { public Collection> computeStateEquivalenceClasses(List states) { final Map> statesMap = new HashMap<>(); final Map<«stateFQN», List<«valueFQN»>> stateToValues = new HashMap<>(); + final Map<«stateFQN», Integer> stateToIndex = new HashMap<>(); // First we build the map of states, grouped by their number of dimensions // and we associate to each state the list of its values states.stream().distinct().map(e -> («stateFQN») e).forEach(s -> { + stateToIndex.put(s, stateToIndex.size()); final List<«valueFQN»> values = getAllStateValues(s); stateToValues.put(s, values); final int size = values.size(); @@ -331,7 +333,15 @@ class TraceExtractorGeneratorJava { equivalentStates = new ArrayList<>(); accumulator.put(n, equivalentStates); } - equivalentStates.add(state); + if (equivalentStates.isEmpty()) { + equivalentStates.add(state); + } else { + if (stateToIndex.get(state) < stateToIndex.get(equivalentStates.get(0))) { + equivalentStates.add(0, state); + } else { + equivalentStates.add(state); + } + } } }); return accumulator.values(); @@ -663,7 +673,19 @@ class TraceExtractorGeneratorJava { public StateWrapper getStateWrapper(int stateIndex) { if (stateIndex > -1 && stateIndex < statesTrace.size()) { final «stateFQN» state = statesTrace.get(stateIndex); - return new StateWrapper(state, stateIndex, isStateBreakable(state)); + return new StateWrapper(state, stateIndex, isStateBreakable(state), getStateDescription(stateIndex)); + } + return null; + } + + @Override + public StateWrapper getStateWrapper(EObject state) { + if (state instanceof «stateFQN») { + final int idx = statesTrace.indexOf(state); + if (idx != -1) { + final «stateFQN» state_cast = («stateFQN») state; + return new StateWrapper(state_cast, idx, isStateBreakable(state_cast), getStateDescription(idx)); + } } return null; } @@ -676,7 +698,7 @@ class TraceExtractorGeneratorJava { for (int i = startStateIndex; i < endStateIndex + 1; i++) { final «stateFQN» state = statesTrace.get(i); - result.add(new StateWrapper(state, i, isStateBreakable(state))); + result.add(new StateWrapper(state, i, isStateBreakable(state), getStateDescription(i))); } return result; @@ -777,7 +799,7 @@ class TraceExtractorGeneratorJava { String result = ""; for (int i = 0; i < valueTraces.size(); i++) { if (!isValueTraceIgnored(i)) { - result += (i == 0 ? "" : "\n") + getValueDescription(i, stateIndex); + result += (result.length() == 0 ? "" : "\n") + getValueDescription(i, stateIndex); } } return result; diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.classpath b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.classpath new file mode 100644 index 000000000..eca7bdba8 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.project b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.project new file mode 100644 index 000000000..820dc2c9a --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.project @@ -0,0 +1,28 @@ + + + org.gemoc.sequential_addons.diffviewer + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.settings/org.eclipse.jdt.core.prefs b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF new file mode 100644 index 000000000..8970266a9 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF @@ -0,0 +1,16 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Diffviewer +Bundle-SymbolicName: org.gemoc.sequential_addons.diffviewer;singleton:=true +Bundle-Version: 0.1.0.qualifier +Bundle-Activator: org.gemoc.sequential_addons.diffviewer.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + fr.inria.diverse.trace.api;bundle-version="1.0.0", + fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", + fr.inria.diverse.trace.gemoc;bundle-version="1.0.0", + org.gemoc.executionframework.ui, + org.gemoc.xdsmlframework.api;bundle-version="0.1.0", + org.eclipse.emf.ecore.xmi +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-ActivationPolicy: lazy diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/build.properties b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/build.properties new file mode 100644 index 000000000..e9863e281 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/IconeGemocModel-16.png b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/IconeGemocModel-16.png new file mode 100644 index 0000000000000000000000000000000000000000..1fafbd67182099ec7c67d118a2758e733972bda7 GIT binary patch literal 763 zcmVJNRCwByQe8+>VHke5bL?zWH;XC$ z?8jEypxmbDilhsP%8H1hpNnp~P>gQ6>4ykxNH;+cnMnnrWg%UNw3uFKEDJX;q~V;3 z8>I%~hU~b_v+bOno%VIkNKvLy58uoC{k-4vz3=xvBG?A?58o8=uG(5zS}m+67DJQn z)@!5N#fmmBYVLO6XDzx{mVMguM|9;Fj)`$$KT4;#iMb!)Zr5~&)7H`sJE3*p%g0rU zrl|ytxO5uPNg5^M3B;yYMA0ea53WX=pT2#!`3}B5F*HA@zglNJJ?r)02q6&6U@(AE zsRZ}DV|_d%d978(?^31f&uPn9L@i39fW= z2IBRJQCVOXJV}xp=9`{@!J#2gDC8iMNx}ZX4s0@Ba_Lr^I)^}lV53xPlY_Q(jVq_&|fhhS`(n#}yEJQ)W7sv%La2X7 zDL2|W&kRp}UnV0l6z3&OQE?QFQK;cj-+lO3m~OXMzjse9@FeNAwK#ImEhg&jJvYMt t;BedPsxId@PcR%oE!~5ye~bMszyROMBY8Tx2G#%o002ovPDHLkV1l@cTwwqJ literal 0 HcmV?d00001 diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/insp_sbook.gif b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/insp_sbook.gif new file mode 100644 index 0000000000000000000000000000000000000000..d8d7fad3d44192ded99e73a5dd3e5350e7a590e1 GIT binary patch literal 546 zcmZ?wbhEHb6krfwc*ejmd&caWH*Y(-tpUwRPK`Bb#>~ zZ0wnJ>)xZs&tJcM^Zwq$C+|Ldx_kfOr7PEd{`&ps@srMpGbYVic=`IRL&r`&e*Wst zgU9baet!Ap-P0GZ?mT>Q>)wMe-@fnOf8g`iuiw6ZZ|dyWwRhLn9b2YMpK$5&`HPp% zEm$~x*RBm$ubzAK==R<{Yqo5fwRFkU1#=trY@c%K_{Jj#*REeyvSePxrE}Yk9oc^W z?uCuZOIOSCMOoj!eC{gB?kdXZEX?UHE9xvQ zZpzF1|NsBLfB$~}{{7|4mrtKQy?F8B*|TRrL59Hr6o0ZXGB5-&=zyF9iW3I*`i7vU z=9bnLb5mPeE1R}vBa=XXKR-+BK4XgjpE*9hc4lpcjKWKoDeLRD8i**YTd$;}*QzBb zy?uv(rgp2k5Z{4=GHM#Fs*3Wwr+6i0Rr*9F#ChbT_{Hq|g4kKPI61f(TpVsOv9K|F c2RS)9-)eJnbba6I?&$HQ#nbC&TO)%t0Q2DGu>b%7 literal 0 HcmV?d00001 diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/plugin.xml b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/plugin.xml new file mode 100644 index 000000000..6d60eba6e --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/plugin.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/pom.xml b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/pom.xml new file mode 100644 index 000000000..ba18153ba --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + org.gemoc.modeldebugging.trace.manager + org.gemoc.modeldebugging.trace.manager.root + 0.1.0-SNAPSHOT + ../.. + + + org.gemoc.sequential_addons.diffviewer + eclipse-plugin + 0.1.0-SNAPSHOT + \ No newline at end of file diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/Activator.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/Activator.java new file mode 100644 index 000000000..1a26f5eef --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/Activator.java @@ -0,0 +1,50 @@ +package org.gemoc.sequential_addons.diffviewer; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.gemoc.sequential_addons.diffviewer"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/Diff.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/Diff.java new file mode 100644 index 000000000..23566fdfd --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/Diff.java @@ -0,0 +1,20 @@ +package org.gemoc.sequential_addons.diffviewer.logic; + +public class Diff { + + public enum DiffKind { + SUBST, IN, DEL, EQ + } + + public final DiffKind kind; + + public final int idx1; + + public final int idx2; + + public Diff(DiffKind kind, int idx1, int idx2) { + this.kind = kind; + this.idx1 = idx1; + this.idx2 = idx2; + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java new file mode 100644 index 000000000..a996e14bf --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java @@ -0,0 +1,100 @@ +package org.gemoc.sequential_addons.diffviewer.logic; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.emf.ecore.EObject; +import org.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; + +public class DiffComputer { + + private static int[][] alignTraces(final List states1, final List states2, + final Collection> classes) { + final Map> stateToEquivalentStates = new HashMap<>(); + classes.forEach(l -> { + l.forEach(s -> { + final List equivalentStates = new ArrayList<>(l); + equivalentStates.remove(s); + stateToEquivalentStates.put(s, equivalentStates); + }); + }); + + final int[][] m = new int[states1.size()+1][states2.size()+1]; + + for (int i = 0; i < m.length; i++) { + m[i][0] = i; + } + for (int i = 1; i < m[0].length; i++) { + m[0][i] = i; + } + + final int[][] cost = new int[states1.size()][states2.size()]; + for (int i = 0; i < cost.length; i++) { + for (int j = 0; j < cost[0].length; j++) { + if (stateToEquivalentStates.get(states1.get(i)).contains(states2.get(j))) { + cost[i][j] = 0; + } else { + cost[i][j] = 1; + } + } + } + + for (int i = 1; i < m.length; i++) { + for (int j = 1; j < m[1].length; j++) { + final int deletion = m[i-1][j] + 1; + final int insertion = m[i][j-1] + 1; + final int substitution = m[i-1][j-1] + cost[i-1][j-1]; + m[i][j] = Math.min(Math.min(insertion, deletion), substitution); + } + } + + return m; + } + + public static List computeDiff(final List states1, final List states2, + final Collection> classes) { + int[][] comparisonMatrix = alignTraces(states1, states2, classes); + for (int i = 0; i < comparisonMatrix.length; i++) { + String s = ""; + for (int j = 0; j < comparisonMatrix[0].length; j++) { + int c = comparisonMatrix[i][j]; + s += (c + (c > 9 ? " " : " ")); + } + System.out.println(s); + } + int i = comparisonMatrix.length - 1; + int j = comparisonMatrix[0].length - 1; + List diffs = new ArrayList<>(); + while (i > 0 && j > 0) { + final int current = comparisonMatrix[i][j]; + final int deletion = comparisonMatrix[i-1][j]; + final int insertion = comparisonMatrix[i][j-1]; + final int substitution = comparisonMatrix[i-1][j-1]; + if (substitution <= deletion && substitution <= insertion && + substitution == current) { + i--; + j--; + diffs.add(new Diff(DiffKind.EQ, i, j)); + } else if (deletion <= insertion && deletion <= substitution) { + i--; + diffs.add(new Diff(DiffKind.DEL, i, j)); + } else if (substitution < deletion && substitution <= insertion) { + i--; + j--; + diffs.add(new Diff(DiffKind.SUBST, i, j)); + } else if (insertion < deletion && insertion < substitution) { + j--; + diffs.add(new Diff(DiffKind.IN, i, j)); + } + } + // Since we added the i and j indexes in reverse order, + // we get them in the right order after the reverse. + Collections.reverse(diffs); + + return diffs; + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java new file mode 100644 index 000000000..233bcc99c --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java @@ -0,0 +1,122 @@ +package org.gemoc.sequential_addons.diffviewer.views; + +import java.util.List; + +import org.gemoc.sequential_addons.diffviewer.logic.Diff; + +import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StateWrapper; +import javafx.geometry.Insets; +import javafx.geometry.Pos; +import javafx.scene.control.Label; +import javafx.scene.control.OverrunStyle; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.ScrollPane.ScrollBarPolicy; +import javafx.scene.control.Tooltip; +import javafx.scene.layout.Background; +import javafx.scene.layout.BackgroundFill; +import javafx.scene.layout.Border; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Pane; +import javafx.scene.layout.StackPane; +import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; +import javafx.scene.shape.Rectangle; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; + +public class TimelineDiffViewerRenderer extends Pane { + + private final HBox line1 = new HBox(); + private final HBox line2 = new HBox(); + + private static final int H_MARGIN = 8; + private static final int V_MARGIN = 2; + private static final int DIAMETER = 24; + private static final Insets MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN, V_MARGIN, H_MARGIN); + private static final Background BACKGROUND = new Background(new BackgroundFill(Color.WHITE, null, null)); + + final private Font stateNumbersFont = Font.font("Arial", FontWeight.BOLD, 9); + + public TimelineDiffViewerRenderer() { + VBox vBox = new VBox(); + ScrollPane scrollPane = new ScrollPane(vBox); + scrollPane.minWidthProperty().bind(widthProperty()); + scrollPane.maxWidthProperty().bind(widthProperty()); + scrollPane.prefWidthProperty().bind(widthProperty()); + scrollPane.minHeightProperty().bind(heightProperty()); + scrollPane.maxHeightProperty().bind(heightProperty()); + scrollPane.prefHeightProperty().bind(heightProperty()); + scrollPane.setFitToWidth(true); + scrollPane.setFitToHeight(true); + scrollPane.setBorder(Border.EMPTY); + getChildren().add(scrollPane); + vBox.getChildren().add(line1); + vBox.getChildren().add(line2); + setBackground(BACKGROUND); + scrollPane.setBackground(BACKGROUND); + vBox.setBackground(BACKGROUND); + scrollPane.setVbarPolicy(ScrollBarPolicy.NEVER); + } + + private String computeStateLabel(int stateNumber) { + if (stateNumber > 999) { + return (stateNumber / 1000) + "k" + ((stateNumber % 1000) / 10); + } else { + return "" + stateNumber; + } + } + + private void addState(StateWrapper wrapper, HBox line, Color color) { + final Rectangle rectangle = new Rectangle(DIAMETER, DIAMETER, color); + rectangle.setArcHeight(DIAMETER); + rectangle.setArcWidth(DIAMETER); + rectangle.setUserData(wrapper.state); + Label text = new Label(computeStateLabel(wrapper.stateIndex)); + text.setTextOverrun(OverrunStyle.ELLIPSIS); + text.setAlignment(Pos.CENTER); + text.setMouseTransparent(true); + text.setTextFill(Color.WHITE); + text.setFont(stateNumbersFont); + text.setMaxWidth(DIAMETER); + final Tooltip tooltip = new Tooltip(wrapper.description); + Tooltip.install(rectangle, tooltip); + StackPane layout = new StackPane(); + StackPane.setMargin(rectangle, MARGIN_INSETS); + layout.getChildren().addAll(rectangle, text); + line.getChildren().add(layout); + } + + private void addBlank(HBox line) { + final Rectangle rectangle = new Rectangle(DIAMETER, DIAMETER, Color.TRANSPARENT); + line.getChildren().add(rectangle); + HBox.setMargin(rectangle, MARGIN_INSETS); + } + + public void fillStateLines(List stateWrappers1, + List stateWrappers2, List diffs) { + line1.getChildren().clear(); + line2.getChildren().clear(); + for (Diff diff : diffs) { + int i = diff.idx1; + int j = diff.idx2; + switch (diff.kind) { + case EQ: + addState(stateWrappers1.get(i), line1, Color.SLATEBLUE); + addState(stateWrappers2.get(j), line2, Color.SLATEBLUE); + break; + case SUBST: + addState(stateWrappers1.get(i), line1, Color.TOMATO); + addState(stateWrappers2.get(j), line2, Color.TOMATO); + break; + case DEL: + addState(stateWrappers1.get(i), line1, Color.BROWN); + addBlank(line2); + break; + case IN: + addBlank(line1); + addState(stateWrappers2.get(j), line2, Color.BROWN); + break; + } + } + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java new file mode 100644 index 000000000..ac267abb8 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java @@ -0,0 +1,181 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package org.gemoc.sequential_addons.diffviewer.views; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.IExtensionRegistry; +import org.eclipse.core.runtime.Platform; +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.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IToolBarManager; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.part.ViewPart; +import org.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; +import org.gemoc.sequential_addons.diffviewer.Activator; +import org.gemoc.sequential_addons.diffviewer.logic.Diff; +import org.gemoc.sequential_addons.diffviewer.logic.DiffComputer; +import org.gemoc.xdsmlframework.api.core.IExecutionEngine; + +import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StateWrapper; +import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon; +import javafx.embed.swt.FXCanvas; +import javafx.scene.Scene; + +public class TimelineDiffViewerViewPart extends ViewPart { + + public static final String ID = "org.gemoc.sequential_addons.diffviewer.views.TimelineDiffViewerRenderer"; + + private FXCanvas fxCanvas; + + private TimelineDiffViewerRenderer diffViewer; + + @Override + public void createPartControl(Composite parent) { + fxCanvas = new FXCanvas(parent, SWT.NONE); + diffViewer = new TimelineDiffViewerRenderer(); + Scene scene = new Scene(diffViewer); + fxCanvas.setScene(scene); + parent.getShell().addListener(SWT.Resize, (e) -> { + //TODO refresh the renderer + }); + buildMenu(parent.getShell()); + } + + + + private void buildMenu(Shell shell) { + addActionToToolbar(new AbstractEngineAction(Action.AS_PUSH_BUTTON) { + private FileDialog fileDialog; + + @Override + protected void init() { + super.init(); + setText("Compare Traces"); + setToolTipText("Compare Traces"); + ImageDescriptor id = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/insp_sbook.gif"); + setImageDescriptor(id); + setEnabled(true); + + fileDialog = new FileDialog(shell, SWT.OPEN); + fileDialog.setFilterExtensions(new String[] { "*.trace" }); + } + + @Override + public void engineSelectionChanged(IExecutionEngine engine) { + } + + @Override + public void run() { + fileDialog.setText("Choose a first trace to load"); + String filePath1 = fileDialog.open(); + if (filePath1 != null && !filePath1.equals("")) { + fileDialog.setText("Choose a second trace to load"); + String filePath2 = fileDialog.open(); + if (filePath2 != null && !filePath2.equals("")) { + Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; + Map m = reg.getExtensionToFactoryMap(); + m.put("trace", new XMIResourceFactoryImpl()); + + // Obtain a new resource set + ResourceSet resSet = new ResourceSetImpl(); + + // Get the resources + URI filePath1URI = URI.createFileURI(filePath1); + Resource traceResource1 = resSet.getResource(filePath1URI, true); + EcoreUtil.resolveAll(traceResource1); + URI filePath2URI = URI.createFileURI(filePath2); + Resource traceResource2 = resSet.getResource(filePath2URI, true); + EcoreUtil.resolveAll(traceResource2); + + AbstractTraceAddon newTraceAddon = null; + try { + IExtensionRegistry extReg = Platform.getExtensionRegistry(); + IExtensionPoint ep = extReg + .getExtensionPoint("org.gemoc.gemoc_language_workbench.engine_addon"); + IExtension[] extensions = ep.getExtensions(); + for (int i = 0; i < extensions.length && newTraceAddon == null; i++) { + IExtension ext = extensions[i]; + IConfigurationElement[] confElements = ext.getConfigurationElements(); + for (int j = 0; j < confElements.length; j++) { + IConfigurationElement confElement = confElements[j]; + String attr = confElement.getAttribute("Class"); + if (attr != null) { + Object obj = confElement.createExecutableExtension("Class"); + if (obj instanceof AbstractTraceAddon) { + AbstractTraceAddon obj_cast = (AbstractTraceAddon) obj; + if (obj_cast.isAddonForTrace(traceResource1.getContents().get(0)) && + obj_cast.isAddonForTrace(traceResource2.getContents().get(0))) { + newTraceAddon = obj_cast; + break; + } + } + } + } + } + } catch (CoreException e) { + e.printStackTrace(); + } + + if (newTraceAddon != null) { + newTraceAddon.load(traceResource1); + final List wrappers1 = newTraceAddon.getTraceExtractor() + .getStateWrappers(0, newTraceAddon.getTraceExtractor().getStatesTraceLength()-1); + final List states1 = wrappers1.stream().map(w -> w.state).collect(Collectors.toList()); + + newTraceAddon.load(traceResource2); + final List wrappers2 = newTraceAddon.getTraceExtractor() + .getStateWrappers(0, newTraceAddon.getTraceExtractor().getStatesTraceLength()-1); + final List states2 = wrappers2.stream().map(w -> w.state).collect(Collectors.toList()); + + final List allStates = new ArrayList<>(states1); + allStates.addAll(states2); + + List diffs = DiffComputer.computeDiff(states1, states2, newTraceAddon.getTraceExtractor().computeStateEquivalenceClasses(allStates)); + diffViewer.fillStateLines(wrappers1, wrappers2, diffs); + } + } + } + } + }); + } + + private void addActionToToolbar(Action action) { + IActionBars actionBars = getViewSite().getActionBars(); + IToolBarManager toolBar = actionBars.getToolBarManager(); + toolBar.add(action); + } + + @Override + public void setFocus() { + if (fxCanvas != null) { + fxCanvas.setFocus(); + } + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF index f5ebf7f98..494fa04e6 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF @@ -4,8 +4,7 @@ Bundle-Name: Gemoc MultiDimensional Timeline Addon Bundle-SymbolicName: org.gemoc.sequential_addons.multidimensional.timeline;singleton:=true Bundle-Version: 0.1.0.qualifier Bundle-Activator: org.gemoc.sequential_addons.multidimensional.timeline.Activator -Require-Bundle: org.gemoc.xdsmlframework.api, - fr.obeo.timeline;bundle-version="1.0.0", +Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", org.gemoc.executionframework.engine, org.eclipse.emf.edit.ui, org.eclipse.sirius.ui, @@ -21,7 +20,8 @@ Require-Bundle: org.gemoc.xdsmlframework.api, org.eclipse.debug.ui, org.gemoc.executionframework.engine.ui, fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", - fr.obeo.dsl.debug.ide + fr.obeo.dsl.debug.ide, + org.gemoc.xdsmlframework.api Import-Package: javafx.animation;version="2.0.0", javafx.application;version="2.0.0", javafx.beans;version="2.0.0", @@ -52,5 +52,5 @@ Import-Package: javafx.animation;version="2.0.0", Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.gemoc.sequential_addons.multidimensional.timeline, - org.gemoc.sequential_addons.multidimensional.timeline.views.timeline + org.gemoc.sequential_addons.multidimensional.timeline.views diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/plugin.xml b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/plugin.xml index 51a844021..1add59158 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/plugin.xml +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/plugin.xml @@ -9,7 +9,7 @@ diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/timeline/FxTraceListener.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java similarity index 95% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/timeline/FxTraceListener.java rename to trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index 031fa0822..7049be60c 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/timeline/FxTraceListener.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.sequential_addons.multidimensional.timeline.views.timeline; +package org.gemoc.sequential_addons.multidimensional.timeline.views; import java.util.ArrayList; import java.util.Collections; @@ -40,6 +40,7 @@ import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.collections.ListChangeListener; +import javafx.event.EventHandler; import javafx.geometry.Bounds; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -79,7 +80,7 @@ import javafx.scene.text.Font; import javafx.scene.text.FontWeight; -public class FxTraceListener extends Pane implements ITraceListener { +public class MultidimensionalTimelineRenderer extends Pane implements ITraceListener { private ITraceExplorer traceExplorer; @@ -131,7 +132,7 @@ public class FxTraceListener extends Pane implements ITraceListener { final private Supplier lastClickedStateSupplier = () -> lastClickedState; - public FxTraceListener() { + public MultidimensionalTimelineRenderer() { headerPane = new VBox(); valuesLines = new VBox(); bodyPane = new Pane(); @@ -364,10 +365,7 @@ private Pane setupValuePane(int line, Label titleLabel, Pane contentPane) { valueVBox.getChildren().remove(contentPane); } sortValueLines(); - // TODO optimize - if (stateColoration) { - refresh(); - } + traceExplorer.update(); } }); titlePane.getChildren().addAll(showValueCheckBox, titleLabel, backValue, stepValue); @@ -474,7 +472,7 @@ private void fillStateLine(HBox line, List stateWrappers, int sele if (selectedState == stateWrapper.stateIndex) { rectangle = new Rectangle(width, height, currentColor); } else { - if (stateColoration) { + if (stateColoration && !colorPalette.isEmpty()) { final int idx = stateToColor[stateWrapper.stateIndex%stateToColor.length]; if (idx != -1) { rectangle = new Rectangle(width, height, @@ -588,30 +586,29 @@ private void fillValueLine(HBox line, int idx, List valueWrappers, private static final int CURRENT_BACKWARD_STEP = 1; private static final int CURRENT_BIGSTEP = 2; - private void addGlowOnMouseOverStep(Step step, Path stepPath, List accumulator) { - final Path mousingPath = new Path(); - mousingPath.setStrokeWidth(12); - mousingPath.setStroke(Color.rgb(255, 255, 255, 0.01)); - Bindings.bindContent(mousingPath.getElements(), stepPath.getElements()); - accumulator.add(mousingPath); - // Tooltip t = new - // Tooltip(step.getMseoccurrence().getMse().getAction().getName()); - // Tooltip.install(mousingPath, t); - mousingPath.setOnMouseEntered(e -> stepPath.setEffect(glow)); - mousingPath.setOnMouseExited(e -> stepPath.setEffect(null)); - mousingPath.setOnMouseClicked(e -> { - if (e.getClickCount() > 1) { - final double x = e.getX(); - final Bounds bounds = mousingPath.getBoundsInLocal(); - final double midX = bounds.getMinX() + bounds.getWidth() / 2.; - if (x < midX) { - System.out.println("BACKWARD"); - } else { - System.out.println("FORWARD"); - } - } - }); - } +// private void addGlowOnMouseOverStep(Step step, Path stepPath, List accumulator) { +// final Path mousingPath = new Path(); +// final EventHandler onMouseEntered = e -> stepPath.setEffect(glow); +// final EventHandler onMouseExited = e -> stepPath.setEffect(null); +// mousingPath.setStrokeWidth(12); +// mousingPath.setStroke(Color.rgb(0, 0, 0, 0.20)); +// Bindings.bindContent(mousingPath.getElements(), stepPath.getElements()); +// accumulator.add(mousingPath); +// mousingPath.setOnMouseEntered(onMouseEntered); +// mousingPath.setOnMouseExited(onMouseExited); +// mousingPath.setOnMouseClicked(e -> { +// if (e.getClickCount() > 1) { +// final double x = e.getX(); +// final Bounds bounds = mousingPath.getBoundsInLocal(); +// final double midX = bounds.getMinX() + bounds.getWidth() / 2.; +// if (x < midX) { +// System.out.println("BACKWARD"); +// } else { +// System.out.println("FORWARD"); +// } +// } +// }); +// } private NumberExpression createSteps(StepWrapper stepWrapper, int depth, int currentStateStartIndex, int selectedStateIndex, List accumulator, Object[] stepTargets) { @@ -640,7 +637,7 @@ private NumberExpression createSteps(StepWrapper stepWrapper, int depth, int cur } accumulator.add(path); - addGlowOnMouseOverStep(stepWrapper.step, path, accumulator); +// addGlowOnMouseOverStep(stepWrapper.step, path, accumulator); final List subSteps = stepWrapper.subSteps; NumberExpression yOffset = new SimpleDoubleProperty(0); @@ -725,6 +722,7 @@ protected boolean computeValue() { traceExtractor.getStateWrappers(currentStateStartIndex - 1, currentStateEndIndex + 1), selectedStateIndex); } + for (int i = 0; i < traceExtractor.getNumberOfTraces(); i++) { final HBox hBox = createValueTraceLine(i); fillValueLine(hBox, i, diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/timeline/MultidimensionalTimeLineView.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java similarity index 83% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/timeline/MultidimensionalTimeLineView.java rename to trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java index df7fae6a5..5bbbebfd0 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/timeline/MultidimensionalTimeLineView.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.sequential_addons.multidimensional.timeline.views.timeline; +package org.gemoc.sequential_addons.multidimensional.timeline.views; import java.util.ArrayList; import java.util.Arrays; @@ -33,11 +33,6 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.compare.Comparison; -import org.eclipse.emf.compare.Diff; -import org.eclipse.emf.compare.EMFCompare; -import org.eclipse.emf.compare.scope.DefaultComparisonScope; -import org.eclipse.emf.compare.scope.IComparisonScope; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -77,13 +72,13 @@ import javafx.embed.swt.FXCanvas; import javafx.scene.Scene; -public class MultidimensionalTimeLineView extends EngineSelectionDependentViewPart { +public class MultidimensionalTimelineViewPart extends EngineSelectionDependentViewPart { public static final String ID = "org.gemoc.sequential_addons.multidimensional.timeline.views.timeline.MultidimensionalTimeLineView"; private FXCanvas fxCanvas; - - private FxTraceListener traceListener; + + private MultidimensionalTimelineRenderer timelineRenderer; private IMultiDimensionalTraceAddon traceAddon; @@ -105,15 +100,15 @@ public void dispose() { @Override public void createPartControl(Composite parent) { fxCanvas = new FXCanvas(parent, SWT.NONE); - traceListener = new FxTraceListener(); - Scene scene = new Scene(traceListener); + timelineRenderer = new MultidimensionalTimelineRenderer(); + Scene scene = new Scene(timelineRenderer); fxCanvas.setScene(scene); parent.getShell().addListener(SWT.Resize, (e) -> { - traceListener.refresh(); + timelineRenderer.refresh(); }); buildMenu(parent.getShell()); - final Supplier getLastClickedState = traceListener.getLastClickedStateSupplier(); + final Supplier getLastClickedState = timelineRenderer.getLastClickedStateSupplier(); final Menu menu = new Menu(fxCanvas); MenuItem launchAndBreakAtStateMenuItem = new MenuItem(menu, SWT.NONE); @@ -164,7 +159,7 @@ public void widgetSelected(SelectionEvent evt) { menu.notifyListeners(SWT.Show, event); }; - traceListener.setMenuDisplayer(displayMenu); + timelineRenderer.setMenuDisplayer(displayMenu); } private void buildMenu(Shell shell) { @@ -220,63 +215,8 @@ public void engineSelectionChanged(IExecutionEngine engine) { @Override public void run() { traceAddon = null; - traceListener.setTraceExtractor(null); - traceListener.setTraceExplorer(null); - } - }); - - addActionToToolbar(new AbstractEngineAction(Action.AS_PUSH_BUTTON) { - - private FileDialog fileDialog; - - @Override - protected void init() { - super.init(); - setText("Compare Traces"); - setToolTipText("Compare Traces"); - ImageDescriptor id = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/insp_sbook.gif"); - setImageDescriptor(id); - setEnabled(true); - - fileDialog = new FileDialog(shell, SWT.OPEN); - fileDialog.setFilterExtensions(new String[] { "*.trace" }); - } - - @Override - public void engineSelectionChanged(IExecutionEngine engine) { - } - - @Override - public void run() { - fileDialog.setText("Choose a first trace to load"); - String filePath1 = fileDialog.open(); - if (filePath1 != null && !filePath1.equals("")) { - fileDialog.setText("Choose a second trace to load"); - String filePath2 = fileDialog.open(); - if (filePath2 != null && !filePath2.equals("")) { - Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; - Map m = reg.getExtensionToFactoryMap(); - m.put("trace", new XMIResourceFactoryImpl()); - - // Obtain a new resource set - ResourceSet resSet = new ResourceSetImpl(); - - // Get the resources - URI filePath1URI = URI.createFileURI(filePath1); - Resource traceResource1 = resSet.getResource(filePath1URI, true); - EcoreUtil.resolveAll(traceResource1); - URI filePath2URI = URI.createFileURI(filePath2); - Resource traceResource2 = resSet.getResource(filePath2URI, true); - EcoreUtil.resolveAll(traceResource2); - - EMFCompare compare = EMFCompare.builder().build(); - IComparisonScope comparisonScope = new DefaultComparisonScope(traceResource1, traceResource2, - null); - Comparison comparison = compare.compare(comparisonScope); - List differences = comparison.getDifferences(); - System.out.println(differences); - } - } + timelineRenderer.setTraceExtractor(null); + timelineRenderer.setTraceExplorer(null); } }); @@ -349,8 +289,8 @@ public void run() { if (newTraceAddon != null) { traceAddon = newTraceAddon; newTraceAddon.load(traceResource); - traceListener.setTraceExtractor(traceAddon.getTraceExtractor()); - traceListener.setTraceExplorer(traceAddon.getTraceExplorer()); + timelineRenderer.setTraceExtractor(traceAddon.getTraceExtractor()); + timelineRenderer.setTraceExplorer(traceAddon.getTraceExplorer()); } } } @@ -373,7 +313,7 @@ public void engineSelectionChanged(IExecutionEngine engine) { @Override public void run() { - traceListener.setScrollLock(isChecked()); + timelineRenderer.setScrollLock(isChecked()); } }); @@ -394,7 +334,7 @@ public void engineSelectionChanged(IExecutionEngine engine) { @Override public void run() { - traceListener.setStateColoration(isChecked()); + timelineRenderer.setStateColoration(isChecked()); } }); @@ -437,7 +377,7 @@ public void run() { dialog.open(); if (dialog.getReturnCode() == Window.OK) { int state = Integer.parseInt(dialog.getValue()); - traceListener.getJumpConsumer().accept(state); + timelineRenderer.getJumpConsumer().accept(state); } } }); @@ -513,8 +453,8 @@ public boolean test(IExecutionEngine executionEngine, MSEOccurrence mseOccurrenc } } this.traceAddon = traceAddon; - traceListener.setTraceExtractor(traceAddon.getTraceExtractor()); - traceListener.setTraceExplorer(traceAddon.getTraceExplorer()); + timelineRenderer.setTraceExtractor(traceAddon.getTraceExtractor()); + timelineRenderer.setTraceExplorer(traceAddon.getTraceExplorer()); } } else { // TODO diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF index 9cfa55fe0..832db5b4a 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Stategraph Bundle-SymbolicName: org.gemoc.sequential_addons.stategraph;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 0.1.0.qualifier Bundle-Activator: org.gemoc.sequential_addons.stategraph.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -11,7 +11,13 @@ Require-Bundle: org.eclipse.ui, org.gemoc.xdsmlframework.api, org.eclipse.emf.ecore, fr.inria.diverse.trace.gemoc.api, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" + fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", + org.eclipse.emf.ecore.xmi, + fr.inria.diverse.trace.gemoc;bundle-version="1.0.0", + org.eclipse.elk.core.service;bundle-version="0.1.0", + org.eclipse.elk.graph;bundle-version="0.1.0", + com.google.guava;bundle-version="15.0.0", + org.eclipse.elk.alg.layered;bundle-version="0.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javafx.animation;version="2.0.0", javafx.application;version="2.0.0", diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/cycle_coloration.gif b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/cycle_coloration.gif new file mode 100644 index 0000000000000000000000000000000000000000..5ba5b91c5bb2b2a14f7610128ee4b3daf27dea13 GIT binary patch literal 364 zcmZ?wbhEHb6krfwxXQq=Z~MNs%GJdwODeLL^)#&w^O%|$v#`2gLu&N=y0SG(=ACgU zS>alyXdyNuDP_;d1|QtocIZcXFGQK zx=#;qpC0G|MAHKO=ZE^w3$0pPP_+h#3Rj-!`Tzev1NDI7PZmZ71~mp9kdYuiF|c(y zOfK-y;nSD&erCiXz{b+>AxSe**XMx4L0Jz&3`}a}nm@U(K^@ rxf-v~rcJ!-)p!JU?&R6VBe;M6p7p}qe8;%g9p>R)yX~BlBZD;ng)eNk literal 0 HcmV?d00001 diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/cycle_coloration.png b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/cycle_coloration.png deleted file mode 100644 index 2a63b78857356ce82822f4b732592a4aab438a4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmV;10(t$3P)$%&XtADM93`g9j z!sw|1ZS%~p7r<~Vtw+PtRsI|OvDlBZyPgMgc*naj)sHv_ZDM#r`kSdP^MJFlCxSVf zzcBIX;qyINDWTA432%SKyXu&&*)Tt&5A3inyd+J#DaO;DwQGWn`Ak2{;P>PcDi14g zD{vp=b=z4w>l8TnpY}4;a+JQNShE6mI!j-+Gv!f`YUOR##4ts7dMVp?)p`GrmcOZR zY3|SWbl-BYoz`Z7h?SQ_E^d|HyD*mRz8yQXy!o+f&9ACk1?#?60ISBcU1#EJ!7Rt= zM9oPDDDz-@nFV}2Md1O==gD=;>V2% zKQ1)vX*D|BZMLP}=;WNJr8z2Vi?sLD8y#*nTbrXYFHL=Ik^a^Om%SZ+^WtSU)_L~_ zN&W`|2C{(SPZmZ723-ankZzEl7}$CaOe^r{VPR?HD7@LkAl1jla7cztq-Tv%fG8JN zKjT6LiL!IDi3bWYq<82FWuJ30W$bWGx+UeQ;^rZ!-00~fBkUItBp@s-@1i6U9?26e zBBJFYCmzqQzCc}V@e*A{scbc|)oWIZs_8072&hSH+rDkRlcuDa^!@|;cR6XRNgh9O S{IIj?*>mS(FFHFiSOWmr(}#Ef literal 0 HcmV?d00001 diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/refresh_layout.gif b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/refresh_layout.gif new file mode 100644 index 0000000000000000000000000000000000000000..3ca04d06ff9c811a6f791d029a802a7be4681ff4 GIT binary patch literal 327 zcmZ?wbhEHb6krfwxXQrrJWa!4-LeYm0=|77MK@5?WI%v@BcT|Ns9CR0WDZSr{1@R2g(Yrh@#$z?O1g zQh|q#RHw+PiyoXB)1AE)3U1~skT{fJ?U6BUYICAZn$5HYp3GD7dKS#fQdLEHHy z6I^aRo~tUt;P2kV + + + + diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/pom.xml b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/pom.xml new file mode 100644 index 000000000..514831895 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + org.gemoc.modeldebugging.trace.manager + org.gemoc.modeldebugging.trace.manager.root + 0.1.0-SNAPSHOT + ../.. + + + org.gemoc.sequential_addons.stategraph + eclipse-plugin + 0.1.0-SNAPSHOT + \ No newline at end of file diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java new file mode 100644 index 000000000..02a972107 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java @@ -0,0 +1,42 @@ +package org.gemoc.sequential_addons.stategraph.layout; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import org.eclipse.elk.alg.layered.p2layers.LayeringStrategy; +import org.eclipse.elk.alg.layered.properties.LayeredOptions; +import org.eclipse.elk.core.LayoutConfigurator; +import org.eclipse.elk.core.options.CoreOptions; +import org.eclipse.elk.core.service.DiagramLayoutEngine; +import org.eclipse.elk.core.service.DiagramLayoutEngine.Parameters; +import org.eclipse.elk.graph.KNode; +import org.eclipse.elk.graph.properties.Property; +import org.eclipse.ui.IWorkbenchPart; +import org.gemoc.sequential_addons.stategraph.logic.StateVertex; +import org.gemoc.sequential_addons.stategraph.views.VertexView; + +public class StateGraphLayoutCommand { + + final private IWorkbenchPart workbenchPart; + + final private Property> VERTEX2SHAPE_MAP = new Property>( + "vertex.to.shape.map", new HashMap<>()); + + public StateGraphLayoutCommand(IWorkbenchPart workbenchPart) { + this.workbenchPart = workbenchPart; + } + + public void applyLayout(Map nodeToShape, Set movedVertice) { + Parameters params = new Parameters(); + LayoutConfigurator configurator = new LayoutConfigurator(); + configurator.configure(KNode.class) + .setProperty(CoreOptions.ALGORITHM, "org.eclipse.elk.layered") + .setProperty(LayeredOptions.LAYERING_STRATEGY, LayeringStrategy.COFFMAN_GRAHAM) + .setProperty(LayeredOptions.LAYERING_COFFMAN_GRAHAM_LAYER_BOUND, 5) + .setProperty(CoreOptions.SPACING_NODE, 50.0f) + .setProperty(VERTEX2SHAPE_MAP, nodeToShape); + params.addLayoutRun(configurator); + DiagramLayoutEngine.invokeLayout(workbenchPart, null, params); + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java new file mode 100644 index 000000000..f0a05702f --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java @@ -0,0 +1,109 @@ +package org.gemoc.sequential_addons.stategraph.layout; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +import org.eclipse.elk.core.klayoutdata.KShapeLayout; +import org.eclipse.elk.core.math.KVector; +import org.eclipse.elk.core.options.CoreOptions; +import org.eclipse.elk.core.service.IDiagramLayoutConnector; +import org.eclipse.elk.core.service.LayoutMapping; +import org.eclipse.elk.core.util.ElkUtil; +import org.eclipse.elk.graph.KEdge; +import org.eclipse.elk.graph.KGraphElement; +import org.eclipse.elk.graph.KNode; +import org.eclipse.elk.graph.properties.IPropertyHolder; +import org.eclipse.elk.graph.properties.Property; +import org.eclipse.ui.IWorkbenchPart; +import org.gemoc.sequential_addons.stategraph.logic.DirectedGraph; +import org.gemoc.sequential_addons.stategraph.logic.StateGraph; +import org.gemoc.sequential_addons.stategraph.logic.StateVertex; +import org.gemoc.sequential_addons.stategraph.views.StateGraphViewPart; +import org.gemoc.sequential_addons.stategraph.views.VertexView; + +public class StateGraphLayoutConnector implements IDiagramLayoutConnector { + + @Override + public LayoutMapping buildLayoutGraph(IWorkbenchPart workbenchPart, Object diagramPart) { + + StateGraphViewPart layoutRootPart = null; + + if (!(workbenchPart instanceof StateGraphViewPart)) { + return null; + } + + layoutRootPart = (StateGraphViewPart) workbenchPart; + final StateGraph stateGraph = layoutRootPart.getStateGraph(); + LayoutMapping mapping = new LayoutMapping(workbenchPart); + mapping.setParentElement(layoutRootPart); + + KNode topNode = ElkUtil.createInitializedNode(); + mapping.getGraphMap().put(topNode, layoutRootPart); + mapping.setLayoutGraph(topNode); + + final Set movedVertice = layoutRootPart.getMovedVertice(); + + final List vertice = new ArrayList<>(stateGraph.getVertice()); + vertice.removeAll(movedVertice); + + for (StateVertex vertex : vertice) { + KNode node = createNode(mapping, vertex, topNode); + mapping.getGraphMap().put(node, vertex); + } + + List> edges = stateGraph.getEdges().stream() + .filter(e -> !movedVertice.contains(e.getSource()) && !movedVertice.contains(e.getTarget())) + .collect(Collectors.toList()); + + for (DirectedGraph.Edge edge : edges) { + KEdge kEdge = createEdge(mapping, edge); + mapping.getGraphMap().put(kEdge, edge); + } + + return mapping; + } + + private KNode createNode(final LayoutMapping mapping, final StateVertex nodeStateVertex, final KNode rootNode) { + KNode childLayoutNode = ElkUtil.createInitializedNode(); + rootNode.getChildren().add(childLayoutNode); + KShapeLayout nodeLayout = childLayoutNode.getData(KShapeLayout.class); + nodeLayout.setSize(24, 24); + ((KShapeLayout) nodeLayout).resetModificationFlag(); + nodeLayout.setProperty(CoreOptions.NODE_SIZE_MINIMUM, new KVector(24, 24)); + mapping.getGraphMap().put(childLayoutNode, nodeStateVertex); + return childLayoutNode; + } + + private KEdge createEdge(final LayoutMapping mapping, final DirectedGraph.Edge edge) { + KEdge layoutEdge = ElkUtil.createInitializedEdge(); + layoutEdge.setSource((KNode) mapping.getGraphMap().inverse().get(edge.getSource())); + layoutEdge.setTarget((KNode) mapping.getGraphMap().inverse().get(edge.getTarget())); + mapping.getGraphMap().put(layoutEdge, edge); + return layoutEdge; + } + + final private Property> VERTEX2SHAPE_MAP = new Property>( + "vertex.to.shape.map", new HashMap<>()); + + @Override + public void applyLayout(LayoutMapping layoutMapping, IPropertyHolder propertyHolder) { + for (Entry entry : layoutMapping.getGraphMap().entrySet()) { + final KShapeLayout layout = entry.getKey().getData(KShapeLayout.class); + if (layout != null) { + final double xPos = layout.getXpos(); + final double yPos = layout.getYpos(); + Map map = layout.getProperty(VERTEX2SHAPE_MAP); + Optional.ofNullable(map.get(entry.getValue())).ifPresent(v -> { + v.setTranslateX(xPos); + v.setTranslateY(yPos); + }); + } + } + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java new file mode 100644 index 000000000..9fb6cc9c5 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java @@ -0,0 +1,41 @@ +package org.gemoc.sequential_addons.stategraph.layout; + +import java.util.Collection; + +import org.eclipse.elk.core.service.IDiagramLayoutConnector; +import org.eclipse.elk.core.service.ILayoutSetup; +import org.gemoc.sequential_addons.stategraph.logic.StateVertex; +import org.gemoc.sequential_addons.stategraph.views.StateGraphViewPart; + +import com.google.inject.Binder; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Module; +import com.google.inject.util.Modules; + +public class StateGraphLayoutSetup implements ILayoutSetup { + + public Injector createInjector(final Module defaultModule) { + return Guice.createInjector(Modules.override(defaultModule).with(new StateGraphLayoutModule())); + } + + public static class StateGraphLayoutModule implements Module { + @Override + public void configure(final Binder binder) { + binder.bind(IDiagramLayoutConnector.class).to(StateGraphLayoutConnector.class); + } + } + + @Override + public boolean supports(Object object) { + if (object instanceof Collection) { + for (Object o : (Collection) object) { + if (o instanceof StateVertex) { + return true; + } + } + return false; + } + return object instanceof StateGraphViewPart || object instanceof StateVertex; + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java index 976d7aa50..6a035093d 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java @@ -16,20 +16,20 @@ import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StepWrapper; import fr.inria.diverse.trace.gemoc.api.ITraceListener; -public class StateGraph extends DirectedGraph implements ITraceListener { - +public class StateGraph extends DirectedGraphimplements ITraceListener { + private ITraceExtractor traceExtractor; - + private ITraceExplorer traceExplorer; - + private final Map stateToNode = new HashMap<>(); - + private final Map stateToEquivalentState = new HashMap<>(); - + private final List equivalentStates = new ArrayList<>(); - + private BiConsumer renderCommand = null; - + public void setTraceExtractor(ITraceExtractor traceExtractor) { this.traceExtractor = traceExtractor; } @@ -44,15 +44,15 @@ public void setTraceExplorer(ITraceExplorer traceExplorer) { } update(); } - + public void setUpdateCommand(BiConsumer command) { renderCommand = command; } - + @Override public void update() { stateToEquivalentState.clear(); - traceExtractor.computeStateEquivalenceClasses().stream().forEach(l->{ + traceExtractor.computeStateEquivalenceClasses().stream().forEach(l -> { EObject equivalentState = null; for (EObject state : l) { if (equivalentStates.contains(state)) { @@ -65,20 +65,22 @@ public void update() { equivalentStates.add(equivalentState); } else { l.remove(equivalentState); - l.forEach(s->{ + l.forEach(s -> { equivalentStates.remove(s); removeVertex(stateToNode.remove(s)); }); } - stateToEquivalentState.put(equivalentState,equivalentState); + stateToEquivalentState.put(equivalentState, equivalentState); for (EObject otherState : l) { - stateToEquivalentState.put(otherState,equivalentState); + stateToEquivalentState.put(otherState, equivalentState); } }); - final List stateWrappers = traceExtractor.getStateWrappers(0, traceExtractor.getStatesTraceLength()); + + final List stateWrappers = traceExtractor.getStateWrappers(0, + traceExtractor.getStatesTraceLength()); final List stepWrappers = traceExtractor.getStepWrappers(0, traceExtractor.getStatesTraceLength()); final List> addedEdges = new ArrayList<>(); - + while (!stepWrappers.isEmpty()) { final StepWrapper stepWrapper = stepWrappers.remove(0); if (stepWrapper.endingIndex != -1 && stepWrapper.subSteps.isEmpty()) { @@ -89,24 +91,28 @@ public void update() { addedEdges.add(addedEdge); } } - stepWrappers.addAll(0,stepWrapper.subSteps.stream().map(s->traceExtractor.getStepWrapper(s)).collect(Collectors.toList())); + stepWrappers.addAll(0, stepWrapper.subSteps.stream().map(s -> traceExtractor.getStepWrapper(s)) + .collect(Collectors.toList())); } - + final List> edgesToRemove = new ArrayList<>(getEdges()); edgesToRemove.removeAll(addedEdges); edgesToRemove.forEach(e -> removeEdge(e)); - + if (renderCommand != null) { StateVertex currentNode = null; - final StateWrapper currentStateWrapper = traceExtractor.getStateWrapper(traceExplorer.getCurrentStateIndex()); - if (currentStateWrapper != null) { - final EObject equivalentState = stateToEquivalentState.get(currentStateWrapper.state); - currentNode = stateToNode.get(equivalentState); + if (traceExplorer != null) { + final StateWrapper currentStateWrapper = traceExtractor + .getStateWrapper(traceExplorer.getCurrentStateIndex()); + if (currentStateWrapper != null) { + final EObject equivalentState = stateToEquivalentState.get(currentStateWrapper.state); + currentNode = stateToNode.get(equivalentState); + } } renderCommand.accept(false, currentNode); } } - + public Edge addEdge(StateWrapper startStateWrapper, StateWrapper endStateWrapper, EObject step) { final EObject startState = startStateWrapper.state; final EObject endState = endStateWrapper.state; @@ -117,7 +123,7 @@ public Edge addEdge(StateWrapper startStateWrapper, StateWrapper en } else { StateVertex startNode = null; StateVertex endNode = null; - for (Entry entry : stateToNode.entrySet()) { + for (Entry entry : stateToNode.entrySet()) { final EObject entryState = entry.getKey(); if (startNode == null) { if (equivalentStartState == entryState) { @@ -125,40 +131,48 @@ public Edge addEdge(StateWrapper startStateWrapper, StateWrapper en continue; } } - + if (endNode == null) { if (equivalentEndState == entryState) { endNode = entry.getValue(); } } - + if (startNode != null && endNode != null) { break; } } - + if (startNode == null) { - startNode = addVertex(new StateVertex(traceExtractor.getStateDescription(startStateWrapper.stateIndex))); + startNode = addVertex(new StateVertex(traceExtractor.getStateDescription(startStateWrapper.stateIndex), + startStateWrapper.stateIndex)); stateToNode.put(equivalentStartState, startNode); } else { - startNode.setTooltip(traceExtractor.getStateDescription(startStateWrapper.stateIndex)); + final int startIndex = traceExtractor.getStateWrapper(equivalentStartState).stateIndex; + final String description = traceExtractor.getStateDescription(startIndex); + startNode.setTooltip(description); + startNode.setIndex(startIndex); } if (endNode == null) { - endNode = addVertex(new StateVertex(traceExtractor.getStateDescription(endStateWrapper.stateIndex))); + endNode = addVertex(new StateVertex(traceExtractor.getStateDescription(endStateWrapper.stateIndex), + endStateWrapper.stateIndex)); stateToNode.put(equivalentEndState, endNode); } else { - endNode.setTooltip(traceExtractor.getStateDescription(endStateWrapper.stateIndex)); + final int endIndex = traceExtractor.getStateWrapper(equivalentEndState).stateIndex; + final String description = traceExtractor.getStateDescription(endIndex); + endNode.setTooltip(description); + endNode.setIndex(endIndex); } - + Edge result = getEdge(startNode, endNode); - + if (result == null) { result = addEdge(startNode, endNode); } return result; } } - + public void clear() { stateToNode.clear(); if (renderCommand != null) { diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateVertex.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateVertex.java index 3dfa48932..a3e1f24d8 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateVertex.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateVertex.java @@ -3,29 +3,38 @@ import java.util.function.Consumer; public class StateVertex { - + private String tooltip; + private int index; private Consumer command; - + public StateVertex() { } - - public StateVertex(String tooltip) { + + public StateVertex(String tooltip, int index) { this.tooltip = tooltip; } - + public String getTooltip() { return tooltip; } - + public void setTooltip(String tooltip) { this.tooltip = tooltip; if (command != null) { command.accept(tooltip); } } - + public void setOnTooltipUpdateCommand(Consumer command) { this.command = command; } + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java new file mode 100644 index 000000000..3fbb70f22 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java @@ -0,0 +1,99 @@ +package org.gemoc.sequential_addons.stategraph.views; + +import javafx.beans.binding.DoubleBinding; +import javafx.beans.property.DoubleProperty; +import javafx.beans.value.ChangeListener; +import javafx.scene.paint.Color; +import javafx.scene.shape.Polygon; +import javafx.scene.shape.QuadCurve; + +public class CurvedEdgeView extends EdgeView { + + public CurvedEdgeView(final DoubleProperty sX, final DoubleProperty sY, final DoubleProperty eX, + final DoubleProperty eY) { + super(sX, sY, eX, eY); + + final DoubleBinding cX = new DoubleBinding() { + + { + super.bind(sX, eX, a); + } + + @Override + protected double computeValue() { + final double tX = (sX.get() + eX.get()) / 2; + return tX + 20 * Math.cos(a.get() - Math.PI / 2); + } + }; + + final DoubleBinding cY = new DoubleBinding() { + + { + super.bind(sY, eY, a); + } + + @Override + protected double computeValue() { + final double tY = (sY.get() + eY.get()) / 2; + return tY + 20 * Math.sin(a.get() - Math.PI / 2); + } + }; + + final DoubleBinding aX = new DoubleBinding() { + + { + super.bind(sX, eX, cX); + } + + @Override + protected double computeValue() { + return .25 * sX.get() + .5 * cX.get() + 0.25 * eX.get(); + } + }; + + final DoubleBinding aY = new DoubleBinding() { + + { + super.bind(sY, eY, cY); + } + + @Override + protected double computeValue() { + return .25 * sY.get() + .5 * cY.get() + 0.25 * eY.get(); + } + }; + + QuadCurve quadCurve = new QuadCurve(); + quadCurve.setStrokeWidth(1.5); + quadCurve.setStroke(Color.BLUE); + quadCurve.setFill(Color.TRANSPARENT); + quadCurve.startXProperty().bind(sX); + quadCurve.startYProperty().bind(sY); + quadCurve.endXProperty().bind(eX); + quadCurve.endYProperty().bind(eY); + quadCurve.controlXProperty().bind(cX); + quadCurve.controlYProperty().bind(cY); + + Polygon arrow = new Polygon(); + arrow.setFill(Color.BLUE); + final ChangeListener listener = (_0, _1, _2) -> { + final double angle = a.get() + Math.PI; + final double x = aX.get(); + final double y = aY.get(); + final double x0 = x + 5 * Math.cos(angle); + final double x1 = x + 5 * Math.cos(angle + 2 * Math.PI / 3); + final double x2 = x + 5 * Math.cos(angle - 2 * Math.PI / 3); + final double y0 = y + 5 * Math.sin(angle); + final double y1 = y + 5 * Math.sin(angle + 2 * Math.PI / 3); + final double y2 = y + 5 * Math.sin(angle - 2 * Math.PI / 3); + arrow.getPoints().clear(); + arrow.getPoints().addAll(x0, y0, x1, y1, x2, y2); + }; + + aX.addListener(listener); + aY.addListener(listener); + a.addListener(listener); + + getChildren().addAll(quadCurve, arrow); + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CycleView.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CycleView.java new file mode 100644 index 000000000..152284eb8 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CycleView.java @@ -0,0 +1,61 @@ +package org.gemoc.sequential_addons.stategraph.views; + +import java.util.ArrayList; +import java.util.List; + +import org.gemoc.sequential_addons.stategraph.logic.alg.IHullAlgorithm; +import org.gemoc.sequential_addons.stategraph.logic.alg.JarvisMarch; + +import javafx.beans.value.ChangeListener; +import javafx.scene.Node; +import javafx.scene.paint.Color; +import javafx.scene.paint.Paint; +import javafx.scene.shape.Polygon; +import javafx.scene.shape.StrokeLineJoin; +import javafx.scene.shape.StrokeType; + +public class CycleView extends Polygon { + + private final static IHullAlgorithm HULL_ALGORITHM = new JarvisMarch(); + + public CycleView(final List nodes, final int cycleIndex, final double hueInterval) { + Paint p = Color.hsb(cycleIndex * hueInterval, 0.75, 0.70, 0.25); + setFill(p); + setStroke(p); + setStrokeWidth(20); + setStrokeLineJoin(StrokeLineJoin.ROUND); + setStrokeType(StrokeType.OUTSIDE); + updateHull(nodes, HULL_ALGORITHM); + final ChangeListener listener = (_0, _1, _2) -> { + updateHull(nodes, HULL_ALGORITHM); + }; + for (Node n : nodes) { + n.translateXProperty().addListener(listener); + n.translateYProperty().addListener(listener); + } + } + + private void updateHull(List nodes, IHullAlgorithm hullAlgo) { + List points = new ArrayList<>(); + + for (Node n : nodes) { + points.add(new double[] { n.getTranslateX(), n.getTranslateY() }); + } + + List coordinates = new ArrayList<>(); + if (points.size() <= 3) { + for (double[] point : points) { + coordinates.add(point[0]); + coordinates.add(point[1]); + } + } else { + for (double[] point : hullAlgo.convexHull(points)) { + coordinates.add(point[0]); + coordinates.add(point[1]); + } + } + + getPoints().clear(); + getPoints().addAll(coordinates); + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/EdgeView.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/EdgeView.java new file mode 100644 index 000000000..6bfdef1c0 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/EdgeView.java @@ -0,0 +1,27 @@ +package org.gemoc.sequential_addons.stategraph.views; + +import javafx.beans.binding.DoubleBinding; +import javafx.beans.property.DoubleProperty; +import javafx.scene.Group; + +public abstract class EdgeView extends Group { + + protected final DoubleBinding a; + + public EdgeView(final DoubleProperty sX, final DoubleProperty sY, final DoubleProperty eX, + final DoubleProperty eY) { + a = new DoubleBinding() { + private final DoubleBinding dX = sX.subtract(eX); + private final DoubleBinding dY = sY.subtract(eY); + + { + super.bind(dX, dY); + } + + @Override + protected double computeValue() { + return Math.atan2(dY.get(), dX.get()); + } + }; + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java index 54ef4fddc..8a011f517 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java @@ -2,357 +2,199 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; +import org.gemoc.sequential_addons.stategraph.layout.StateGraphLayoutCommand; import org.gemoc.sequential_addons.stategraph.logic.DirectedGraph.Edge; import org.gemoc.sequential_addons.stategraph.logic.StateGraph; import org.gemoc.sequential_addons.stategraph.logic.StateVertex; -import org.gemoc.sequential_addons.stategraph.logic.alg.IHullAlgorithm; -import org.gemoc.sequential_addons.stategraph.logic.alg.JarvisMarch; import org.gemoc.sequential_addons.stategraph.logic.alg.JohnsonSimpleCycles; import javafx.application.Platform; -import javafx.beans.binding.DoubleBinding; -import javafx.beans.property.DoubleProperty; -import javafx.beans.value.ChangeListener; +import javafx.scene.Group; import javafx.scene.Node; -import javafx.scene.control.Tooltip; import javafx.scene.layout.Background; import javafx.scene.layout.BackgroundFill; import javafx.scene.layout.Pane; import javafx.scene.paint.Color; -import javafx.scene.paint.Paint; -import javafx.scene.shape.Circle; -import javafx.scene.shape.LineTo; -import javafx.scene.shape.MoveTo; -import javafx.scene.shape.Path; -import javafx.scene.shape.Polygon; -import javafx.scene.shape.Shape; -import javafx.scene.shape.StrokeLineJoin; -import javafx.scene.shape.StrokeType; public class StateGraphRenderer extends Pane { private StateGraph stateGraph; - - final private Map nodeToShape = new HashMap<>(); - - final private Map,Shape> edgeToShape = new HashMap<>(); - - final private List hulls = new ArrayList<>(); - private double mouseX; + final private StateGraphLayoutCommand layoutCommand; + + final private Map nodeToGroup = new HashMap<>(); + + final private Map, EdgeView> edgeToGroup = new HashMap<>(); - private double mouseY; + final private Set movedVertice = new HashSet<>(); + + final private List hulls = new ArrayList<>(); - public StateGraphRenderer(StateGraph stateGraph) { + final private JohnsonSimpleCycles cycleFindingAlgorithm; + + public StateGraphRenderer(StateGraph stateGraph, StateGraphLayoutCommand layoutCommand) { + this.layoutCommand = layoutCommand; this.stateGraph = stateGraph; - this.stateGraph.setUpdateCommand((clear, currentVertex)->render(clear, currentVertex)); + this.stateGraph.setUpdateCommand((clear, currentVertex) -> render(clear, currentVertex)); setBackground(new Background(new BackgroundFill(Color.WHITE, null, null))); + cycleFindingAlgorithm = new JohnsonSimpleCycles<>(this.stateGraph); } - - public void setStateGraph(StateGraph stateGraph) { + + public void setStateGraph(final StateGraph stateGraph) { this.stateGraph = stateGraph; - this.stateGraph.setUpdateCommand((clear, currentVertex)->render(clear, currentVertex)); + this.stateGraph.setUpdateCommand((clear, currentVertex) -> render(clear, currentVertex)); + cycleFindingAlgorithm.setGraph(this.stateGraph); } - private Circle createVertexShape(StateVertex node) { - final double radius = Math.log(1 + (stateGraph.getIncomingEdges(node).size() + stateGraph.getOutgoingEdges(node).size())) * 5; - Circle circle = new Circle(radius); - - final int n = stateGraph.getVertice().indexOf(node); - if (n / 5 == 1) { - circle.setTranslateX(500 - n % 5 * 100); - } else { - circle.setTranslateX(100 + n % 5 * 100); - } - circle.setTranslateY(100 + n / 5 * 100); - circle.setFill(Color.SLATEBLUE); - - circle.setOnMousePressed(event -> { - mouseX = event.getX(); - mouseY = event.getY(); - }); - - circle.setOnMouseDragged(event -> { - double deltaX = event.getX() - mouseX; - double deltaY = event.getY() - mouseY; - circle.setTranslateX(circle.getTranslateX() + deltaX); - circle.setTranslateY(circle.getTranslateY() + deltaY); - }); - - final String s = node.getTooltip(); - final Tooltip t = new Tooltip(s); - Tooltip.install(circle, t); - node.setOnTooltipUpdateCommand(text -> Platform.runLater(() -> t.setText(text))); - - return circle; - } - - private Shape createEdgeShape(Edge edge, Circle startVertex, Circle endVertex) { - final Path path = new Path(); - path.setStrokeWidth(1.5); - path.setStroke(Color.BLUE); - final MoveTo moveTo = new MoveTo(); - moveTo.xProperty().bind(startVertex.translateXProperty()); - moveTo.yProperty().bind(startVertex.translateYProperty()); - - final DoubleBinding a = new DoubleBinding() { - private final DoubleBinding dX = startVertex.translateXProperty().subtract(endVertex.translateXProperty()); - private final DoubleBinding dY = startVertex.translateYProperty().subtract(endVertex.translateYProperty()); - { - super.bind(dX, dY); - } - @Override - protected double computeValue() { - return Math.atan2(dY.get(), dX.get()); - } - }; - - final DoubleBinding x = new DoubleBinding() { - private final DoubleProperty cX = endVertex.translateXProperty(); - private final DoubleProperty r = endVertex.radiusProperty(); - { - super.bind(cX, r, a); - } - @Override - protected double computeValue() { - return cX.get() + Math.cos(a.get()) * r.get(); - } - }; - - final DoubleBinding y = new DoubleBinding() { - private final DoubleProperty cY = endVertex.translateYProperty(); - private final DoubleProperty r = endVertex.radiusProperty(); - { - super.bind(cY, r, a); - } - @Override - protected double computeValue() { - return cY.get() + Math.sin(a.get()) * r.get(); - } - }; - - final LineTo lineTo = new LineTo(); - lineTo.xProperty().bind(x); - lineTo.yProperty().bind(y); - - final DoubleBinding aX1 = new DoubleBinding() { - { - super.bind(a,x); - } - @Override - protected double computeValue() { - return x.get() + Math.cos(a.get() - Math.PI / 6) * 5; - } - }; - - final DoubleBinding aY1 = new DoubleBinding() { - { - super.bind(a,y); - } - @Override - protected double computeValue() { - return y.get() + Math.sin(a.get() - Math.PI / 6) * 5; - } - }; - - final DoubleBinding aX2 = new DoubleBinding() { - { - super.bind(a,x); - } - @Override - protected double computeValue() { - return x.get() + Math.cos(a.get() + Math.PI / 6) * 5; - } - }; - - final DoubleBinding aY2 = new DoubleBinding() { - { - super.bind(a,y); - } - @Override - protected double computeValue() { - return y.get() + Math.sin(a.get() + Math.PI / 6) * 5; - } - }; - - final LineTo lineTo2 = new LineTo(); - lineTo2.xProperty().bind(aX1); - lineTo2.yProperty().bind(aY1); - - final MoveTo moveTo2 = new MoveTo(); - moveTo2.xProperty().bind(x); - moveTo2.yProperty().bind(y); - - final LineTo lineTo3 = new LineTo(); - lineTo3.xProperty().bind(aX2); - lineTo3.yProperty().bind(aY2); - - path.getElements().addAll(moveTo,lineTo,lineTo2,moveTo2,lineTo3); - - return path; - } - private boolean changed = false; private StateVertex currentVertex = null; - + private void render(boolean clear, StateVertex currentVertex) { this.currentVertex = currentVertex; Platform.runLater(() -> { + if (clear) { + changed = true; getChildren().clear(); - nodeToShape.clear(); - edgeToShape.clear(); + nodeToGroup.clear(); + edgeToGroup.clear(); } - + final Map, StateVertex> workList = new HashMap<>(); - final List vertexShapesToAdd = new ArrayList<>(); - final List edgeShapesToAdd = new ArrayList<>(); - final List vertice = stateGraph.getVertice(); - final List verticeToRemove = new ArrayList<>(nodeToShape.keySet()); + final List vertexShapesToAdd = new ArrayList<>(); + final List edgeShapesToAdd = new ArrayList<>(); + final List vertice = stateGraph.getVertice().stream() + .sorted((v1, v2) -> {return v1.getIndex() - v2.getIndex();}) + .collect(Collectors.toList()); + final List verticeToRemove = new ArrayList<>(nodeToGroup.keySet()); verticeToRemove.removeAll(vertice); - + if (!verticeToRemove.isEmpty()) { changed = true; } - - verticeToRemove.forEach(n->{ - final Shape vertexShape = nodeToShape.get(n); - nodeToShape.remove(n); + + verticeToRemove.forEach(n -> { + final VertexView vertexShape = nodeToGroup.get(n); + nodeToGroup.remove(n); if (vertexShape != null) { getChildren().remove(vertexShape); } }); - - for (StateVertex v : vertice) { - Circle vertexShape = nodeToShape.get(v); + + for (int i = 0; i < vertice.size(); i++) { + final StateVertex v = vertice.get(i); + VertexView vertexShape = nodeToGroup.get(v); if (vertexShape == null) { changed = true; - vertexShape = createVertexShape(v); - nodeToShape.put(v, vertexShape); + vertexShape = new VertexView(i, v); + nodeToGroup.put(v, vertexShape); vertexShapesToAdd.add(vertexShape); - } else { - final double radius = Math.log(1 + (stateGraph.getIncomingEdges(v).size() + stateGraph.getOutgoingEdges(v).size())) * 5; - vertexShape.setRadius(radius); } - if (currentVertex == v) { - vertexShape.setFill(Color.CORAL); - } else { - vertexShape.setFill(Color.SLATEBLUE); - } - + vertexShape.setCurrentState(currentVertex == v); + vertexShape.setStateIndex(i); + for (Edge e : stateGraph.getOutgoingEdges(v)) { workList.put(e, v); } } - - final List> edgesToRemove = new ArrayList<>(edgeToShape.keySet()); - + + final List> edgesToRemove = new ArrayList<>(edgeToGroup.keySet()); + for (StateVertex v : vertice) { for (Edge e : stateGraph.getIncomingEdges(v)) { final StateVertex w = workList.get(e); if (w != null && v != w) { - Shape edgeShape = edgeToShape.get(e); - if (edgeShape == null) { - changed = true; - edgeShape = createEdgeShape(e, nodeToShape.get(w), nodeToShape.get(v)); - edgeToShape.put(e, edgeShape); - edgeShapesToAdd.add(edgeShape); + final Edge reverseEdge = stateGraph.getEdge(v, w); + if (reverseEdge != null) { + EdgeView edgeGroup = edgeToGroup.get(e); + if (edgeGroup == null || edgeGroup instanceof StraightEdgeView) { + changed = true; + final VertexView source = nodeToGroup.get(w); + final VertexView target = nodeToGroup.get(v); + edgeGroup = new CurvedEdgeView(source.translateXProperty(), source.translateYProperty(), + target.translateXProperty(), target.translateYProperty()); + edgeToGroup.put(e, edgeGroup); + edgeShapesToAdd.add(edgeGroup); + } + edgesToRemove.remove(e); + EdgeView reverseEdgeGroup = edgeToGroup.get(reverseEdge); + if (reverseEdgeGroup == null || reverseEdgeGroup instanceof StraightEdgeView) { + changed = true; + final VertexView source = nodeToGroup.get(v); + final VertexView target = nodeToGroup.get(w); + reverseEdgeGroup = new CurvedEdgeView(source.translateXProperty(), source.translateYProperty(), + target.translateXProperty(), target.translateYProperty()); + edgeToGroup.put(reverseEdge, reverseEdgeGroup); + edgeShapesToAdd.add(reverseEdgeGroup); + } + edgesToRemove.remove(reverseEdge); + } else { + EdgeView edgeGroup = edgeToGroup.get(e); + if (edgeGroup == null || edgeGroup instanceof CurvedEdgeView) { + changed = true; + final VertexView source = nodeToGroup.get(w); + final VertexView target = nodeToGroup.get(v); + edgeGroup = new StraightEdgeView(source.translateXProperty(), source.translateYProperty(), + target.translateXProperty(), target.translateYProperty()); + edgeToGroup.put(e, edgeGroup); + edgeShapesToAdd.add(edgeGroup); + } + edgesToRemove.remove(e); } - edgesToRemove.remove(e); } } } - + if (!edgesToRemove.isEmpty()) { changed = true; } - - edgesToRemove.forEach(e->{ - final Shape edgeShape = edgeToShape.get(e); - edgeToShape.remove(e); - if (edgeShape != null) { - getChildren().remove(edgeShape); + + edgesToRemove.forEach(e -> { + final Group edgeGroup = edgeToGroup.get(e); + edgeToGroup.remove(e); + if (edgeGroup != null) { + getChildren().remove(edgeGroup); } }); - - getChildren().addAll(0,edgeShapesToAdd); + + getChildren().addAll(0, edgeShapesToAdd); getChildren().addAll(vertexShapesToAdd); - + + if (changed) { + layoutCommand.applyLayout(nodeToGroup, movedVertice); + } + if (!isCycleColorationEnabled) { getChildren().removeAll(hulls); hulls.clear(); } else if (changed) { getChildren().removeAll(hulls); hulls.clear(); - - final JohnsonSimpleCycles algo = new JohnsonSimpleCycles<>(stateGraph); - final List> cycles = algo.findSimpleCycles(); - final IHullAlgorithm hullAlgo = new JarvisMarch(); - + final List> cycles = cycleFindingAlgorithm.findSimpleCycles(); if (!cycles.isEmpty()) { double hueInterval = 360. / (double) cycles.size(); - for (int i = 0; i < cycles.size(); i++) { - Polygon hull = new Polygon(); - Paint p = Color.hsb(i * hueInterval, 0.75, 0.70, 0.25); - hull.setFill(p); - hull.setStroke(p); - hull.setStrokeWidth(20); - hull.setStrokeLineJoin(StrokeLineJoin.ROUND); - hull.setStrokeType(StrokeType.OUTSIDE); - getChildren().add(0, hull); - hulls.add(hull); - List nodes = cycles.get(i).stream().map(v -> (Node) nodeToShape.get(v)) + List nodes = cycles.get(i).stream().map(v -> (Node) nodeToGroup.get(v)) .collect(Collectors.toList()); - - updateHull(hull, nodes, hullAlgo); - - final ChangeListener listener = (_0,_1,_2) -> { - updateHull(hull, nodes, hullAlgo); - }; - - for (Node n : nodes) { - n.translateXProperty().addListener(listener); - n.translateYProperty().addListener(listener); - } + CycleView cycleView = new CycleView(nodes, i, hueInterval); + getChildren().add(0, cycleView); + hulls.add(cycleView); } } - - changed = false; } + + changed = false; }); } - - private void updateHull(Polygon hull, List nodes, IHullAlgorithm hullAlgo) { - List points = new ArrayList<>(); - - for (Node n : nodes) { - points.add(new double[] {n.getTranslateX(), n.getTranslateY()}); - } - - List coordinates = new ArrayList<>(); - if (points.size() <= 3) { - for (double[] point : points) { - coordinates.add(point[0]); - coordinates.add(point[1]); - } - } else { - for (double[] point : hullAlgo.convexHull(points)) { - coordinates.add(point[0]); - coordinates.add(point[1]); - } - } - - hull.getPoints().clear(); - hull.getPoints().addAll(coordinates); - } private boolean isCycleColorationEnabled = false; - + public void setCycleColorationEnabled(boolean checked) { if (isCycleColorationEnabled != checked) { isCycleColorationEnabled = checked; @@ -360,4 +202,13 @@ public void setCycleColorationEnabled(boolean checked) { render(false, currentVertex); } } + + public void forceLayout() { + movedVertice.clear(); + Platform.runLater(() -> layoutCommand.applyLayout(nodeToGroup, movedVertice)); + } + + public Set getMovedVertice() { + return movedVertice; + } } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java index ee5e957c7..e7ee8ed78 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java @@ -1,105 +1,256 @@ -package org.gemoc.sequential_addons.stategraph.views; - -import java.util.Set; -import org.gemoc.sequential_addons.stategraph.Activator; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IActionBars; -import org.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; -import org.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; -import org.gemoc.sequential_addons.stategraph.logic.StateGraph; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; - -import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; -import javafx.embed.swt.FXCanvas; -import javafx.scene.Scene; -import javafx.scene.layout.Pane; - -public class StateGraphViewPart extends EngineSelectionDependentViewPart { - - public static final String ID = "org.gemoc.sequential_addons.multidimensional.timeline.views.timeline.StateGraphViewPart"; - - private FXCanvas fxCanvas; - - private StateGraphRenderer renderer; - - private StateGraph stateGraph; - - private Pane root; - - @Override - public void engineSelectionChanged(IExecutionEngine engine) { - if (engine != null) { - Set traceAddons = engine.getAddonsTypedBy(IMultiDimensionalTraceAddon.class); - if (!traceAddons.isEmpty()) { - final IMultiDimensionalTraceAddon traceAddon = traceAddons.iterator().next(); - stateGraph = new StateGraph(); - stateGraph.setTraceExtractor(traceAddon.getTraceExtractor()); - stateGraph.setTraceExplorer(traceAddon.getTraceExplorer()); - renderer.setStateGraph(stateGraph); - } - } - } - - private void setupRoot() { - stateGraph = new StateGraph(); - renderer = new StateGraphRenderer(stateGraph); - root.getChildren().add(renderer); - renderer.minWidthProperty().bind(root.widthProperty()); - renderer.prefWidthProperty().bind(root.widthProperty()); - renderer.maxWidthProperty().bind(root.widthProperty()); - renderer.minHeightProperty().bind(root.heightProperty()); - renderer.prefHeightProperty().bind(root.heightProperty()); - renderer.maxHeightProperty().bind(root.heightProperty()); - } - - @Override - public void createPartControl(Composite parent) { - fxCanvas = new FXCanvas(parent, SWT.NONE); - root = new Pane(); - final Scene scene = new Scene(root); - fxCanvas.setScene(scene); - setupRoot(); - buildMenu(parent.getShell()); - } - - private void buildMenu(Shell shell) { - addActionToToolbar(new AbstractEngineAction(Action.AS_CHECK_BOX) { - @Override - protected void init() { - super.init(); - setText("Toggle Cycle Coloration"); - setToolTipText("Toggle Cycle Coloration"); - ImageDescriptor id = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/cycle_coloration.png"); - setImageDescriptor(id); - setEnabled(true); - } - - @Override - public void engineSelectionChanged(IExecutionEngine engine) { - } - - @Override - public void run() { - renderer.setCycleColorationEnabled(isChecked()); - } - }); - } - - private void addActionToToolbar(Action action) { - IActionBars actionBars = getViewSite().getActionBars(); - IToolBarManager toolBar = actionBars.getToolBarManager(); - toolBar.add(action); - } - - @Override - public void setFocus() { - if (fxCanvas != null) { - fxCanvas.setFocus(); - } - } +package org.gemoc.sequential_addons.stategraph.views; + +import java.util.Map; +import java.util.Set; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.IExtensionRegistry; +import org.eclipse.core.runtime.Platform; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IToolBarManager; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IActionBars; +import org.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; +import org.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; +import org.gemoc.sequential_addons.stategraph.Activator; +import org.gemoc.sequential_addons.stategraph.layout.StateGraphLayoutCommand; +import org.gemoc.sequential_addons.stategraph.logic.StateGraph; +import org.gemoc.sequential_addons.stategraph.logic.StateVertex; +import org.gemoc.xdsmlframework.api.core.IExecutionEngine; + +import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; +import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon; +import javafx.embed.swt.FXCanvas; +import javafx.scene.Cursor; +import javafx.scene.Scene; +import javafx.scene.layout.Background; +import javafx.scene.layout.BackgroundFill; +import javafx.scene.layout.Pane; +import javafx.scene.paint.Color; + +public class StateGraphViewPart extends EngineSelectionDependentViewPart { + + public static final String ID = "org.gemoc.sequential_addons.multidimensional.timeline.views.timeline.StateGraphViewPart"; + + private FXCanvas fxCanvas; + + private StateGraphRenderer renderer; + + private StateGraph stateGraph; + + private Pane root; + + private double mouseX; + + private double mouseY; + + public StateGraph getStateGraph() { + return stateGraph; + } + + @Override + public void engineSelectionChanged(IExecutionEngine engine) { + if (engine != null) { + Set traceAddons = engine.getAddonsTypedBy(IMultiDimensionalTraceAddon.class); + if (!traceAddons.isEmpty()) { + final IMultiDimensionalTraceAddon traceAddon = traceAddons.iterator().next(); + stateGraph = new StateGraph(); + stateGraph.setTraceExtractor(traceAddon.getTraceExtractor()); + stateGraph.setTraceExplorer(traceAddon.getTraceExplorer()); + renderer.setStateGraph(stateGraph); + } + } + } + + private void setupRoot() { + stateGraph = new StateGraph(); + renderer = new StateGraphRenderer(stateGraph, new StateGraphLayoutCommand(this)); + root.setBackground(new Background(new BackgroundFill(Color.WHITE, null, null))); + root.getChildren().add(renderer); + renderer.minWidthProperty().bind(root.widthProperty()); + renderer.prefWidthProperty().bind(root.widthProperty()); + renderer.maxWidthProperty().bind(root.widthProperty()); + renderer.minHeightProperty().bind(root.heightProperty()); + renderer.prefHeightProperty().bind(root.heightProperty()); + renderer.maxHeightProperty().bind(root.heightProperty()); + + root.setOnMousePressed(event -> { + root.setCursor(Cursor.MOVE); + mouseX = event.getX(); + mouseY = event.getY(); + event.consume(); + }); + + root.setOnMouseReleased(event -> { + root.setCursor(Cursor.DEFAULT); + }); + + root.setOnMouseDragged(event -> { + double deltaX = event.getX() - mouseX; + double deltaY = event.getY() - mouseY; + renderer.setTranslateX(renderer.getTranslateX() + deltaX); + renderer.setTranslateY(renderer.getTranslateY() + deltaY); + mouseX = event.getX(); + mouseY = event.getY(); + event.consume(); + }); + } + + @Override + public void createPartControl(Composite parent) { + fxCanvas = new FXCanvas(parent, SWT.NONE); + root = new Pane(); + final Scene scene = new Scene(root); + fxCanvas.setScene(scene); + setupRoot(); + buildMenu(parent.getShell()); + } + + private void buildMenu(Shell shell) { + addActionToToolbar(new AbstractEngineAction(Action.AS_CHECK_BOX) { + @Override + protected void init() { + super.init(); + setText("Toggle Cycle Coloration"); + setToolTipText("Toggle Cycle Coloration"); + ImageDescriptor id = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, + "icons/cycle_coloration.gif"); + setImageDescriptor(id); + setEnabled(true); + } + + @Override + public void engineSelectionChanged(IExecutionEngine engine) { + } + + @Override + public void run() { + renderer.setCycleColorationEnabled(isChecked()); + } + }); + + addActionToToolbar(new AbstractEngineAction(Action.AS_PUSH_BUTTON) { + @Override + protected void init() { + super.init(); + setText("Refresh Layout"); + setToolTipText("Refresh Layout"); + ImageDescriptor id = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, + "icons/refresh_layout.gif"); + setImageDescriptor(id); + setEnabled(true); + } + + @Override + public void engineSelectionChanged(IExecutionEngine engine) { + } + + @Override + public void run() { + renderer.forceLayout(); + } + }); + + addActionToToolbar(new AbstractEngineAction(Action.AS_PUSH_BUTTON) { + + private FileDialog fileDialog; + + @Override + protected void init() { + super.init(); + setText("Open Trace"); + setToolTipText("Open Trace"); + ImageDescriptor id = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/jload_obj.gif"); + setImageDescriptor(id); + setEnabled(true); + + fileDialog = new FileDialog(shell, SWT.OPEN); + fileDialog.setFilterExtensions(new String[] { "*.trace" }); + } + + @Override + public void engineSelectionChanged(IExecutionEngine engine) { + } + + @Override + public void run() { + fileDialog.setText("Open Trace"); + String filePath = fileDialog.open(); + + if (filePath != null && !filePath.equals("")) { + Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; + Map m = reg.getExtensionToFactoryMap(); + m.put("trace", new XMIResourceFactoryImpl()); + + ResourceSet resSet = new ResourceSetImpl(); + URI filePath1URI = URI.createFileURI(filePath); + Resource traceResource = resSet.getResource(filePath1URI, true); + EcoreUtil.resolveAll(traceResource); + AbstractTraceAddon newTraceAddon = null; + try { + IExtensionRegistry extReg = Platform.getExtensionRegistry(); + IExtensionPoint ep = extReg + .getExtensionPoint("org.gemoc.gemoc_language_workbench.engine_addon"); + IExtension[] extensions = ep.getExtensions(); + for (int i = 0; i < extensions.length && newTraceAddon == null; i++) { + IExtension ext = extensions[i]; + IConfigurationElement[] confElements = ext.getConfigurationElements(); + for (int j = 0; j < confElements.length; j++) { + IConfigurationElement confElement = confElements[j]; + String attr = confElement.getAttribute("Class"); + if (attr != null) { + Object obj = confElement.createExecutableExtension("Class"); + if (obj instanceof AbstractTraceAddon) { + AbstractTraceAddon obj_cast = (AbstractTraceAddon) obj; + if (obj_cast.isAddonForTrace(traceResource.getContents().get(0))) { + newTraceAddon = obj_cast; + break; + } + } + } + } + } + } catch (CoreException e) { + e.printStackTrace(); + } + + if (newTraceAddon != null) { + newTraceAddon.load(traceResource); + stateGraph.setTraceExtractor(newTraceAddon.getTraceExtractor()); + stateGraph.update(); + } + } + } + }); + } + + private void addActionToToolbar(Action action) { + IActionBars actionBars = getViewSite().getActionBars(); + IToolBarManager toolBar = actionBars.getToolBarManager(); + toolBar.add(action); + } + + public Set getMovedVertice() { + return renderer.getMovedVertice(); + } + + @Override + public void setFocus() { + if (fxCanvas != null) { + fxCanvas.setFocus(); + } + } } \ No newline at end of file diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java new file mode 100644 index 000000000..d347b33a5 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java @@ -0,0 +1,74 @@ +package org.gemoc.sequential_addons.stategraph.views; + +import javafx.beans.binding.DoubleBinding; +import javafx.beans.property.DoubleProperty; +import javafx.beans.value.ChangeListener; +import javafx.scene.paint.Color; +import javafx.scene.shape.Line; +import javafx.scene.shape.Polygon; + +public class StraightEdgeView extends EdgeView { + + private final DoubleBinding aX; + + private final DoubleBinding aY; + + public StraightEdgeView(DoubleProperty sX, DoubleProperty sY, DoubleProperty eX, DoubleProperty eY) { + super(sX, sY, eX, eY); + + aX = new DoubleBinding() { + + { + super.bind(sX, eX); + } + + @Override + protected double computeValue() { + System.out.println("aX update"); + return (sX.get() + eX.get()) * .5; + } + }; + + aY = new DoubleBinding() { + + { + super.bind(sY, eY); + } + + @Override + protected double computeValue() { + System.out.println("aY update"); + return (sY.get() + eY.get()) * .5; + } + }; + + Line line = new Line(); + line.setStrokeWidth(1.5); + line.setStroke(Color.BLUE); + line.startXProperty().bind(sX); + line.startYProperty().bind(sY); + line.endXProperty().bind(eX); + line.endYProperty().bind(eY); + + Polygon arrow = new Polygon(); + arrow.setFill(Color.BLUE); + final ChangeListener listener = (_0, _1, _2) -> { + final double angle = a.get() + Math.PI; + final double x = aX.get(); + final double y = aY.get(); + final double x0 = x + 5 * Math.cos(angle); + final double x1 = x + 5 * Math.cos(angle + 2 * Math.PI / 3); + final double x2 = x + 5 * Math.cos(angle - 2 * Math.PI / 3); + final double y0 = y + 5 * Math.sin(angle); + final double y1 = y + 5 * Math.sin(angle + 2 * Math.PI / 3); + final double y2 = y + 5 * Math.sin(angle - 2 * Math.PI / 3); + arrow.getPoints().clear(); + arrow.getPoints().addAll(x0, y0, x1, y1, x2, y2); + }; + + aX.addListener(listener); + aY.addListener(listener); + + getChildren().addAll(line, arrow); + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/VertexView.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/VertexView.java new file mode 100644 index 000000000..ed8f038a6 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/VertexView.java @@ -0,0 +1,112 @@ +package org.gemoc.sequential_addons.stategraph.views; + +import org.gemoc.sequential_addons.stategraph.logic.StateVertex; + +import javafx.application.Platform; +import javafx.geometry.Pos; +import javafx.scene.Cursor; +import javafx.scene.Group; +import javafx.scene.control.Label; +import javafx.scene.control.OverrunStyle; +import javafx.scene.control.Tooltip; +import javafx.scene.effect.DropShadow; +import javafx.scene.layout.StackPane; +import javafx.scene.paint.Color; +import javafx.scene.shape.Circle; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; + +public class VertexView extends Group { + + private double mouseX; + + private double mouseY; + + private boolean currentState = false; + + private int stateIndex; + + private static final double RADIUS = 12; + + private static final DropShadow GLOW = new DropShadow(2.5, Color.BLACK); + + private static final Font STATE_INDEX_FONT = Font.font("Arial", FontWeight.BOLD, 9); + + private final Circle circle; + + private final Label label; + + public VertexView(final int stateIndex, StateVertex vertex) { + circle = new Circle(RADIUS); + circle.setFill(Color.SLATEBLUE); + + this.stateIndex = stateIndex; + + final String s = vertex.getTooltip(); + final Tooltip t = new Tooltip(s); + Tooltip.install(this, t); + vertex.setOnTooltipUpdateCommand(text -> Platform.runLater(() -> t.setText(text))); + + label = new Label(computeStateLabel(this.stateIndex)); + label.setTextOverrun(OverrunStyle.ELLIPSIS); + label.setAlignment(Pos.CENTER); + label.setMouseTransparent(true); + label.setTextFill(Color.WHITE); + label.setFont(STATE_INDEX_FONT); + label.setMaxWidth(RADIUS * 2); + StackPane layout = new StackPane(); + layout.getChildren().addAll(circle, label); + layout.setTranslateX(-RADIUS); + layout.setTranslateY(-RADIUS); + + getChildren().add(layout); + + setOnMousePressed(event -> { + circle.setCursor(Cursor.MOVE); + mouseX = event.getX(); + mouseY = event.getY(); + event.consume(); + }); + + setOnMouseReleased(event -> { + setCursor(Cursor.DEFAULT); + }); + + setOnMouseDragged(event -> { + double deltaX = event.getX() - mouseX; + double deltaY = event.getY() - mouseY; + setTranslateX(getTranslateX() + deltaX); + setTranslateY(getTranslateY() + deltaY); + event.consume(); + }); + + setOnMouseEntered(event -> circle.setEffect(GLOW)); + setOnMouseExited(event -> circle.setEffect(null)); + } + + private String computeStateLabel(int stateNumber) { + if (stateNumber > 999) { + return (stateNumber / 1000) + "k" + ((stateNumber % 1000) / 10); + } else { + return "" + stateNumber; + } + } + + public void setCurrentState(final boolean currentState) { + if (this.currentState != currentState) { + this.currentState = currentState; + if (this.currentState) { + circle.setFill(Color.CORAL); + } else { + circle.setFill(Color.SLATEBLUE); + } + } + } + + public void setStateIndex(final int stateIndex) { + if (this.stateIndex != stateIndex) { + this.stateIndex = stateIndex; + label.setText(computeStateLabel(this.stateIndex)); + } + } +} diff --git a/trace/manager/pom.xml b/trace/manager/pom.xml index f4e1f180f..4d8f6727b 100644 --- a/trace/manager/pom.xml +++ b/trace/manager/pom.xml @@ -18,6 +18,8 @@ plugins/org.gemoc.sequential_addons.multidimensional.timeline + plugins/org.gemoc.sequential_addons.stategraph + plugins/org.gemoc.sequential_addons.diffviewer releng/org.gemoc.modeldebugging.trace.manager.feature From f1ca27845818f49dbd7d764da1a9524e3bcee14e Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Tue, 13 Sep 2016 17:09:03 +0200 Subject: [PATCH 003/267] Fixed generic trace extractor and tweaked trace extractor generation --- .../traceaddon/GenericTraceExtractor.java | 5 ---- .../TraceExtractorGeneratorJava.xtend | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index 53fe751c6..a162bcf9c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -125,9 +125,4 @@ public StateWrapper getStateWrapper(EObject state) { return null; } - @Override - public int[][] alignTraces(List states1, List states2) { - return null; - } - } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend index 082ba6e39..880950267 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend @@ -228,21 +228,26 @@ class TraceExtractorGeneratorJava { } }; + private boolean compareInitialized = false; + + private IPostProcessor.Descriptor descriptor = null; + + private Registry registry = null; + + private EMFCompare compare; + private List compareEObjects(EObject e1, EObject e2) { - if (e1 == e2) { return Collections.emptyList(); } - IPostProcessor.Descriptor descriptor = new BasicPostProcessorDescriptorImpl(customPostProcessor, - Pattern.compile(".*"), null); - - Registry registry = new PostProcessorDescriptorRegistryImpl(); - registry.put(customPostProcessor.getClass().getName(), descriptor); - - final EMFCompare compare; - - compare = EMFCompare.builder().setPostProcessorRegistry(registry).setDiffEngine(diffEngine).build(); + if (!compareInitialized) { + descriptor = new BasicPostProcessorDescriptorImpl(customPostProcessor, Pattern.compile(".*"), null); + registry = new PostProcessorDescriptorRegistryImpl(); + registry.put(customPostProcessor.getClass().getName(), descriptor); + compare = EMFCompare.builder().setPostProcessorRegistry(registry).setDiffEngine(diffEngine).build(); + compareInitialized = true; + } final IComparisonScope scope = new DefaultComparisonScope(e1, e2, null); final Comparison comparison = compare.compare(scope); From cd096fe3725e22efc698822e1e143b5ae4191b35 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Thu, 15 Sep 2016 11:55:34 +0200 Subject: [PATCH 004/267] all gemoc commons have been gathered in one single build/updatesite --- framework/execution_framework/pom.xml | 5 ----- framework/framework_commons/pom.xml | 5 ----- framework/xdsml_framework/pom.xml | 5 ----- java_execution/pom.xml | 5 ----- trace/commons/pom.xml | 7 +------ trace/generator/pom.xml | 8 +------- trace/manager/pom.xml | 7 +------ 7 files changed, 3 insertions(+), 39 deletions(-) diff --git a/framework/execution_framework/pom.xml b/framework/execution_framework/pom.xml index ddff32c18..bb265b04b 100644 --- a/framework/execution_framework/pom.xml +++ b/framework/execution_framework/pom.xml @@ -57,11 +57,6 @@ p2 https://ci.inria.fr/gemoc/job/gemoc-studio_commons/lastSuccessfulBuild/artifact/commons/releng/org.gemoc.commons.repository/target/repository/ - - gemoc-studio_gemoc_commons on CI - p2 - https://ci.inria.fr/gemoc/job/gemoc-studio_gemoc_commons/lastSuccessfulBuild/artifact/gemoc_commons/releng/org.gemoc.gemoc_commons.repository/target/repository/ - + modelanimation_executionengine_java on CI p2 diff --git a/trace/manager/pom.xml b/trace/manager/pom.xml index 4d8f6727b..debd5069e 100644 --- a/trace/manager/pom.xml +++ b/trace/manager/pom.xml @@ -49,12 +49,7 @@ - - - gemoc-studio_gemoc_commons on CI - p2 - https://ci.inria.fr/gemoc/job/gemoc-studio_gemoc_commons/lastSuccessfulBuild/artifact/gemoc_commons/releng/org.gemoc.gemoc_commons.repository/target/repository/ - + modelanimation_executionengine_java on CI p2 From 38a1367565f352365a198a268255f29eab0e884b Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 19 Sep 2016 11:39:48 +0200 Subject: [PATCH 005/267] adding stegraph view to the feature (and studio) --- .../feature.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml index fd11a0572..eaedebeb1 100644 --- a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml +++ b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml @@ -21,6 +21,12 @@ download-size="0" install-size="0" version="0.0.0" + unpack="false"/> + From 3b4284e4f848dccdcb08a978d1838185d1255e92 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Tue, 20 Sep 2016 11:31:03 +0200 Subject: [PATCH 006/267] Improved diff viewer --- .../META-INF/MANIFEST.MF | 3 +- .../diffviewer/logic/DiffComputer.java | 549 ++++++++++++++++-- .../views/TimelineDiffViewerRenderer.java | 449 +++++++++++++- .../views/TimelineDiffViewerViewPart.java | 26 +- .../diffviewer/views/ValueView.java | 54 ++ .../MultidimensionalTimelineRenderer.java | 30 - 6 files changed, 1003 insertions(+), 108 deletions(-) create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF index 8970266a9..2d99e3349 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Require-Bundle: org.eclipse.ui, fr.inria.diverse.trace.gemoc;bundle-version="1.0.0", org.gemoc.executionframework.ui, org.gemoc.xdsmlframework.api;bundle-version="0.1.0", - org.eclipse.emf.ecore.xmi + org.eclipse.emf.ecore.xmi, + org.eclipse.emf.compare Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java index a996e14bf..99b04fe95 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java @@ -1,100 +1,579 @@ package org.gemoc.sequential_addons.diffviewer.logic; +import java.io.FileNotFoundException; +import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import org.eclipse.emf.common.util.Monitor; +import org.eclipse.emf.compare.Comparison; +import org.eclipse.emf.compare.EMFCompare; +import org.eclipse.emf.compare.Match; +import org.eclipse.emf.compare.diff.DefaultDiffEngine; +import org.eclipse.emf.compare.diff.DiffBuilder; +import org.eclipse.emf.compare.diff.FeatureFilter; +import org.eclipse.emf.compare.diff.IDiffEngine; +import org.eclipse.emf.compare.diff.IDiffProcessor; +import org.eclipse.emf.compare.internal.spec.MatchSpec; +import org.eclipse.emf.compare.postprocessor.BasicPostProcessorDescriptorImpl; +import org.eclipse.emf.compare.postprocessor.IPostProcessor; +import org.eclipse.emf.compare.postprocessor.IPostProcessor.Descriptor.Registry; +import org.eclipse.emf.compare.postprocessor.PostProcessorDescriptorRegistryImpl; +import org.eclipse.emf.compare.scope.DefaultComparisonScope; +import org.eclipse.emf.compare.scope.IComparisonScope; +import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EReference; import org.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; +import javafx.util.Pair; + +@SuppressWarnings("restriction") public class DiffComputer { - private static int[][] alignTraces(final List states1, final List states2, - final Collection> classes) { - final Map> stateToEquivalentStates = new HashMap<>(); + private IDiffEngine diffEngine = null; + + private void configureDiffEngine() { + IDiffProcessor diffProcessor = new DiffBuilder(); + diffEngine = new DefaultDiffEngine(diffProcessor) { + @Override + protected FeatureFilter createFeatureFilter() { + return new FeatureFilter() { + @Override + protected boolean isIgnoredReference(Match match, EReference reference) { + final String name = reference.getName(); + return name.equals("parent") || name.equals("states") || name.equals("statesNoOpposite"); + } + }; + } + }; + } + + private final IPostProcessor customPostProcessor = new IPostProcessor() { + + private final Function getIdFunction = e -> e.eClass().getName(); + + @Override + public void postMatch(Comparison comparison, Monitor monitor) { + final List matches = new ArrayList<>(comparison.getMatches()); + final List treatedMatches = new ArrayList<>(); + matches.forEach(m1 -> { + matches.forEach(m2 -> { + if (m1 != m2 && !treatedMatches.contains(m2)) { + final EObject left; + final EObject right; + if (m1.getLeft() != null && m1.getRight() == null && m2.getLeft() == null + && m2.getRight() != null) { + left = m1.getLeft(); + right = m2.getRight(); + } else if (m2.getLeft() != null && m2.getRight() == null && m1.getLeft() == null + && m1.getRight() != null) { + left = m2.getLeft(); + right = m1.getRight(); + } else { + return; + } + final String leftId = getIdFunction.apply(left); + final String rightId = getIdFunction.apply(right); + if (leftId.equals(rightId)) { + comparison.getMatches().remove(m1); + comparison.getMatches().remove(m2); + final Match match = new MatchSpec(); + match.setLeft(left); + match.setRight(right); + comparison.getMatches().add(match); + } + } + }); + treatedMatches.add(m1); + }); + } + + @Override + public void postDiff(Comparison comparison, Monitor monitor) { + } + + @Override + public void postRequirements(Comparison comparison, Monitor monitor) { + } + + @Override + public void postEquivalences(Comparison comparison, Monitor monitor) { + } + + @Override + public void postConflicts(Comparison comparison, Monitor monitor) { + } + + @Override + public void postComparison(Comparison comparison, Monitor monitor) { + } + }; + + private boolean compareInitialized = false; + + private IPostProcessor.Descriptor descriptor = null; + + @SuppressWarnings("rawtypes") + private Registry registry = null; + + private EMFCompare compare; + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private boolean compareEObjects(EObject e1, EObject e2) { + if (e1 == e2) { + return true; + } + + if (e1 == null || e2 == null) { + return false; + } + + if (e1.eClass() != e2.eClass()) { + return false; + } + + if (!compareInitialized) { + configureDiffEngine(); + descriptor = new BasicPostProcessorDescriptorImpl(customPostProcessor, Pattern.compile(".*"), null); + registry = new PostProcessorDescriptorRegistryImpl(); + registry.put(customPostProcessor.getClass().getName(), descriptor); + compare = EMFCompare.builder().setPostProcessorRegistry(registry).setDiffEngine(diffEngine).build(); + compareInitialized = true; + } + + final IComparisonScope scope = new DefaultComparisonScope(e1, e2, null); + final Comparison comparison = compare.compare(scope); + return comparison.getDifferences().isEmpty(); + } + + private boolean compareTraces(final List trace1, final List trace2) { + final int length1 = trace1.size(); + final int length2 = trace2.size(); + + if (length1 != length2) { + return false; + } + boolean result = true; + int i = 0; + while (i < length1 && result) { + result = compareEObjects(trace1.get(i), trace2.get(i)); + i++; + } + return result; + } + + private int computeDistanceBetweenTraces(final List trace1, final List trace2) { + final int[][] m = new int[trace1.size() + 1][trace2.size() + 1]; + + for (int i = 0; i < m.length; i++) { + m[i][0] = i; + } + for (int i = 1; i < m[0].length; i++) { + m[0][i] = i; + } + + final int[][] cost = new int[trace1.size()][trace2.size()]; + for (int i = 0; i < cost.length; i++) { + for (int j = 0; j < cost[0].length; j++) { + if (compareEObjects(trace1.get(i), trace2.get(j))) { + cost[i][j] = 0; + } else { + cost[i][j] = 1; + } + } + } + + int result = 0; + + for (int i = 1; i < m.length; i++) { + for (int j = 1; j < m[1].length; j++) { + final int deletion = m[i - 1][j] + 1; + final int insertion = m[i][j - 1] + 1; + final int substitution = m[i - 1][j - 1] + cost[i - 1][j - 1]; + result = Math.min(Math.min(insertion, deletion), substitution); + m[i][j] = result; + } + } + + return result; + } + + private Map matchTraces(final List> traces1, List> traces2) { + final Map> pairs = new HashMap<>(); + for (int i = 0; i < traces1.size(); i++) { + for (int j = 0; j < traces2.size(); j++) { + final int k = computeDistanceBetweenTraces(traces1.get(i), traces2.get(j)); + List l = pairs.get(k); + if (l == null) { + l = new ArrayList<>(); + pairs.put(k, l); + } + l.add(new int[] { i, j }); + } + } + + List distances = pairs.keySet().stream().sorted().collect(Collectors.toList()); + Map result = new HashMap<>(); + for (Integer d : distances) { + List l = pairs.get(d); + while (l != null && !l.isEmpty()) { + int[] p = l.remove(0); + result.put(p, d); + pairs.values().forEach(toClean -> toClean.removeIf(t -> t[0] == p[0] || t[1] == p[1])); + } + } + + return result; + } + + private EClass getTraceEClass(final List trace) { + EClass result = null; + for (EObject e : trace) { + if (e != null) { + result = e.eClass(); + break; + } + } + return result; + } + + private final List diffs = new ArrayList<>(); + + public List getDiffs() { + return diffs; + } + + private final List, List>> eqGroup = new ArrayList<>(); + + public List, List>> getEqGroup() { + return eqGroup; + } + + private final List, List>> substGroup = new ArrayList<>(); + + public List, List>> getSubstGroup() { + return substGroup; + } + + private final List> inGroup = new ArrayList<>(); + + public List> getInGroup() { + return inGroup; + } + + private final List> delGroup = new ArrayList<>(); + + public List> getDelGroup() { + return delGroup; + } + + public void loadTraces(final List> traces1, final List> traces2) { + final Map>> traceGroups1 = new HashMap<>(); + final Map>> traceGroups2 = new HashMap<>(); + + for (List trace : traces1) { + EClass eClass = getTraceEClass(trace); + if (eClass != null) { + List> l = traceGroups1.get(eClass); + if (l == null) { + l = new ArrayList<>(); + traceGroups1.put(eClass, l); + } + l.add(trace); + } + } + + for (List trace : traces2) { + final EClass eClass = getTraceEClass(trace); + if (eClass != null) { + List> l = traceGroups2.get(eClass); + if (l == null) { + l = new ArrayList<>(); + traceGroups2.put(eClass, l); + } + l.add(trace); + } + } + + eqGroup.clear(); + substGroup.clear(); + inGroup.clear(); + delGroup.clear(); + + final Set classes = new HashSet<>(traceGroups1.keySet()); + classes.addAll(traceGroups2.keySet()); + final List classesSorted = classes.stream().sorted((e1, e2) -> e2.getName().compareTo(e1.getName())) + .collect(Collectors.toList()); + + final Map, List>, Integer> substGroupAccumulator = new HashMap<>(); + + for (EClass eClass : classesSorted) { + if (traceGroups1.containsKey(eClass) && traceGroups2.containsKey(eClass)) { + List> traceGroup1 = traceGroups1.get(eClass); + List> traceGroup2 = traceGroups2.get(eClass); + int i = 0; + int j = 0; + while (i < traceGroup1.size()) { + List trace1 = traceGroup1.get(i); + List trace2 = traceGroup2.get(j); + if (compareTraces(trace1, trace2)) { + traceGroup1.remove(i); + traceGroup2.remove(j); + j = 0; + eqGroup.add(new Pair<>(trace1, trace2)); + } else { + if (j < traceGroup2.size() - 1) { + j++; + } else { + i++; + j = 0; + } + } + } + if (!traceGroup1.isEmpty() && !traceGroup2.isEmpty()) { + for (Map.Entry pair : matchTraces(traceGroup1, traceGroup2).entrySet()) { + final List t1 = traceGroup1.get(pair.getKey()[0]); + final List t2 = traceGroup2.get(pair.getKey()[1]); + substGroupAccumulator.put(new Pair<>(t1, t2), pair.getValue()); + } + } + } + } + + delGroup.addAll(traces1); + inGroup.addAll(traces2); + + eqGroup.forEach(p -> { + inGroup.remove(p.getKey()); + inGroup.remove(p.getValue()); + delGroup.remove(p.getKey()); + delGroup.remove(p.getValue()); + }); + + for (Map.Entry, List>, Integer> e : substGroupAccumulator.entrySet().stream() + .sorted((e1, e2) -> { + return e1.getValue() - e2.getValue(); + }).collect(Collectors.toList())) { + substGroup.add(e.getKey()); + } + + substGroup.forEach(p -> { + inGroup.remove(p.getKey()); + inGroup.remove(p.getValue()); + delGroup.remove(p.getKey()); + delGroup.remove(p.getValue()); + }); + + List> stateTrace1 = new ArrayList<>(); + List> stateTrace2 = new ArrayList<>(); + + List> valuesTrace1 = new ArrayList<>(); + List> valuesTrace2 = new ArrayList<>(); + + substGroup.forEach(p -> { + valuesTrace1.add(p.getKey()); + valuesTrace2.add(p.getValue()); + }); + + for (int i = 0; i < valuesTrace1.get(0).size(); i++) { + final List stateValues = new ArrayList<>(); + for (List l : valuesTrace1) { + stateValues.add(l.get(i)); + } + stateTrace1.add(stateValues); + } + + for (int i = 0; i < valuesTrace2.get(0).size(); i++) { + final List stateValues = new ArrayList<>(); + for (List l : valuesTrace2) { + stateValues.add(l.get(i)); + } + stateTrace2.add(stateValues); + } + + final List> allStates = new ArrayList<>(stateTrace1); + allStates.addAll(stateTrace2); + + List>> equivalenceClasses = computeEquivalenceClasses(allStates); + diffs.addAll(computeDiff(stateTrace1, stateTrace2, equivalenceClasses)); + } + + private List>> computeEquivalenceClasses(final List> states) { + final List, List>> stateToValueIndexes = new ArrayList<>(); + final List observedValues = new ArrayList<>(); + + for (List state : states) { + final List valueIndexes = new ArrayList<>(); + stateToValueIndexes.add(new Pair<>(state, valueIndexes)); + for (int i = 0; i < state.size(); i++) { + final EObject value = state.get(i); + int idx = -1; + for (int j = 0; j < observedValues.size(); j++) { + final EObject v1 = observedValues.get(j); + final EObject v2 = value; + if (compareEObjects(v1, v2)) { + idx = j; + break; + } + } + if (idx != -1) { + valueIndexes.add(idx); + } else { + valueIndexes.add(observedValues.size()); + observedValues.add(value); + } + } + } + + final int valueNb = observedValues.size(); + final Map>> result = new HashMap<>(); + + stateToValueIndexes.forEach(p -> { + final List state = p.getKey(); + final List indexes = p.getValue(); + int v = 0; + for (int i = 0; i < indexes.size(); i++) { + final int index = indexes.get(i); + v += index * Math.pow(valueNb, i); + } + List> equivalentStates = result.get(v); + if (equivalentStates == null) { + equivalentStates = new ArrayList<>(); + result.put(v, equivalentStates); + } + if (equivalentStates.isEmpty()) { + equivalentStates.add(state); + } else { + if (states.indexOf(state) < states.indexOf(equivalentStates.get(0))) { + equivalentStates.add(0, state); + } else { + equivalentStates.add(state); + } + } + }); + + return result.values().stream().collect(Collectors.toList()); + } + + private int[][] alignTraces(final List> states1, final List> states2, + final Collection>> classes) { + final Map, List>> stateToEquivalentStates = new HashMap<>(); classes.forEach(l -> { l.forEach(s -> { - final List equivalentStates = new ArrayList<>(l); + final List> equivalentStates = new ArrayList<>(l); equivalentStates.remove(s); stateToEquivalentStates.put(s, equivalentStates); }); }); - - final int[][] m = new int[states1.size()+1][states2.size()+1]; - + + final int[][] m = new int[states1.size() + 1][states2.size() + 1]; + for (int i = 0; i < m.length; i++) { m[i][0] = i; } for (int i = 1; i < m[0].length; i++) { m[0][i] = i; } - + final int[][] cost = new int[states1.size()][states2.size()]; for (int i = 0; i < cost.length; i++) { + String s = ""; for (int j = 0; j < cost[0].length; j++) { - if (stateToEquivalentStates.get(states1.get(i)).contains(states2.get(j))) { + final List s1 = states1.get(i); + final List s2 = states2.get(j); + final List> equivalentStates = stateToEquivalentStates.get(s1); + if (equivalentStates.contains(s2)) { cost[i][j] = 0; } else { cost[i][j] = 1; } + s += cost[i][j]; } + System.out.println(s); } - + for (int i = 1; i < m.length; i++) { for (int j = 1; j < m[1].length; j++) { - final int deletion = m[i-1][j] + 1; - final int insertion = m[i][j-1] + 1; - final int substitution = m[i-1][j-1] + cost[i-1][j-1]; + final int deletion = m[i - 1][j] + 1; + final int insertion = m[i][j - 1] + 1; + final int substitution = m[i - 1][j - 1] + cost[i - 1][j - 1]; m[i][j] = Math.min(Math.min(insertion, deletion), substitution); } } - + return m; } - public static List computeDiff(final List states1, final List states2, - final Collection> classes) { - int[][] comparisonMatrix = alignTraces(states1, states2, classes); + public void printHtmlTable(int[][] comparisonMatrix, int[][] highlightedCells) { + String s = ""; for (int i = 0; i < comparisonMatrix.length; i++) { - String s = ""; + s += ""; for (int j = 0; j < comparisonMatrix[0].length; j++) { int c = comparisonMatrix[i][j]; - s += (c + (c > 9 ? " " : " ")); + if (highlightedCells[i][j] != 0) { + s += "" + c + ""; + } else { + s += "" + c + ""; + } + } + s += ""; + } + PrintWriter writer = null; + try { + writer = new PrintWriter("/home/dleroy/workspace/table.html", "UTF-8"); + writer.println("" + s + "
"); + } catch (FileNotFoundException | UnsupportedEncodingException e) { + e.printStackTrace(); + } finally { + if (writer != null) { + writer.close(); } - System.out.println(s); } + + } + + public List computeDiff(final List> states1, final List> states2, + final Collection>> classes) { + final int[][] comparisonMatrix = alignTraces(states1, states2, classes); + final int[][] highlightedCells = new int[comparisonMatrix.length][comparisonMatrix[0].length]; int i = comparisonMatrix.length - 1; int j = comparisonMatrix[0].length - 1; List diffs = new ArrayList<>(); while (i > 0 && j > 0) { final int current = comparisonMatrix[i][j]; - final int deletion = comparisonMatrix[i-1][j]; - final int insertion = comparisonMatrix[i][j-1]; - final int substitution = comparisonMatrix[i-1][j-1]; - if (substitution <= deletion && substitution <= insertion && - substitution == current) { + final int deletion = comparisonMatrix[i - 1][j]; + final int insertion = comparisonMatrix[i][j - 1]; + final int substitution = comparisonMatrix[i - 1][j - 1]; + final int min = Math.min(deletion, Math.min(insertion, substitution)); + highlightedCells[i][j] = 1; + if (min == substitution) { + diffs.add(new Diff(current == substitution ? DiffKind.EQ : DiffKind.SUBST, i - 1, j - 1)); i--; j--; - diffs.add(new Diff(DiffKind.EQ, i, j)); - } else if (deletion <= insertion && deletion <= substitution) { - i--; - diffs.add(new Diff(DiffKind.DEL, i, j)); - } else if (substitution < deletion && substitution <= insertion) { + } else if (min == deletion) { + diffs.add(new Diff(DiffKind.DEL, i - 1, j - 1)); i--; + } else { + diffs.add(new Diff(DiffKind.IN, i - 1, j - 1)); j--; - diffs.add(new Diff(DiffKind.SUBST, i, j)); - } else if (insertion < deletion && insertion < substitution) { - j--; - diffs.add(new Diff(DiffKind.IN, i, j)); } } + printHtmlTable(comparisonMatrix, highlightedCells); // Since we added the i and j indexes in reverse order, // we get them in the right order after the reverse. Collections.reverse(diffs); - + return diffs; } } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java index 233bcc99c..c71254a6b 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java @@ -1,12 +1,22 @@ package org.gemoc.sequential_addons.diffviewer.views; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import org.eclipse.emf.ecore.EObject; import org.gemoc.sequential_addons.diffviewer.logic.Diff; +import org.gemoc.sequential_addons.diffviewer.logic.DiffComputer; +import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StateWrapper; +import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.ValueWrapper; import javafx.geometry.Insets; import javafx.geometry.Pos; +import javafx.scene.Cursor; +import javafx.scene.Node; import javafx.scene.control.Label; import javafx.scene.control.OverrunStyle; import javafx.scene.control.ScrollPane; @@ -20,26 +30,87 @@ import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; +import javafx.scene.paint.Paint; +import javafx.scene.shape.Polygon; import javafx.scene.shape.Rectangle; import javafx.scene.text.Font; import javafx.scene.text.FontWeight; +import javafx.util.Pair; public class TimelineDiffViewerRenderer extends Pane { - private final HBox line1 = new HBox(); - private final HBox line2 = new HBox(); - private static final int H_MARGIN = 8; private static final int V_MARGIN = 2; private static final int DIAMETER = 24; + + private static final Insets HALF_MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN / 2, V_MARGIN, H_MARGIN / 2); private static final Insets MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN, V_MARGIN, H_MARGIN); - private static final Background BACKGROUND = new Background(new BackgroundFill(Color.WHITE, null, null)); + + private static final Paint LINE_PAINT = new Color(Color.LIGHTGRAY.getRed(), Color.LIGHTGRAY.getGreen(), + Color.LIGHTGRAY.getBlue(), 0.5); + + private static final Background LINE_BACKGROUND = new Background(new BackgroundFill(LINE_PAINT, null, null)); + private static final Background HEADER_BACKGROUND = new Background(new BackgroundFill(Color.LIGHTGRAY, null, null)); + private static final Background WHITE_BACKGROUND = new Background(new BackgroundFill(Color.WHITE, null, null)); + private static final Background TRANSPARENT_BACKGROUND = new Background(new BackgroundFill(Color.TRANSPARENT, null, null)); + + private static final Font STATE_FONT = Font.font("Arial", FontWeight.BOLD, 9); + private static final Font VALUE_FONT = Font.font("Arial", FontWeight.BOLD, 11); + private static final Font GROUP_FONT = Font.font("Arial", FontWeight.BOLD, 12); + + private final VBox rootVBox = new VBox(); + private final HBox line1 = new HBox(); + private final HBox line2 = new HBox(); + private final VBox eqLines = new VBox(); + private final VBox eqBox = new VBox(); + private final VBox substLines = new VBox(); + private final VBox substBox = new VBox(); + private final VBox inLines = new VBox(); + private final VBox inBox = new VBox(); + private final VBox delLines = new VBox(); + private final VBox delBox = new VBox(); + + final Map>> lineToSegments = new HashMap<>(); + final Map> segmentToDescription = new HashMap<>(); - final private Font stateNumbersFont = Font.font("Arial", FontWeight.BOLD, 9); + private ITraceExtractor extractor1 = null; + private ITraceExtractor extractor2 = null; + + private final List> valueTraces1 = new ArrayList<>(); + private final List> valueTraces2 = new ArrayList<>(); + + private final Map valueToWrapper = new HashMap<>(); + + private void setupBox(VBox box, String labelString, VBox content) { + final HBox boxLabel = new HBox(); + final Polygon arrow = new Polygon(2.5, 10, 10, 5, 2.5, 0); + final Label label = new Label(labelString); + boxLabel.setBackground(HEADER_BACKGROUND); + label.setFont(GROUP_FONT); + HBox.setMargin(arrow, HALF_MARGIN_INSETS); + boxLabel.setAlignment(Pos.CENTER_LEFT); + boxLabel.getChildren().addAll(arrow, label); + boxLabel.setCursor(Cursor.HAND); + box.getChildren().add(boxLabel); + boxLabel.setOnMouseClicked(e -> { + if (box.getChildren().size() > 1) { + box.getChildren().remove(content); + arrow.setRotate(0); + } else { + box.getChildren().add(content); + arrow.setRotate(90); + } + }); + } public TimelineDiffViewerRenderer() { - VBox vBox = new VBox(); - ScrollPane scrollPane = new ScrollPane(vBox); + + setupBox(eqBox, "Toggle identical traces", eqLines); + setupBox(substBox, "Toggle similar traces", substLines); + setupBox(inBox, "Toggle inserted traces", inLines); + setupBox(delBox, "Toggle deleted traces", delLines); + + ScrollPane scrollPane = new ScrollPane(rootVBox); scrollPane.minWidthProperty().bind(widthProperty()); scrollPane.maxWidthProperty().bind(widthProperty()); scrollPane.prefWidthProperty().bind(widthProperty()); @@ -50,11 +121,13 @@ public TimelineDiffViewerRenderer() { scrollPane.setFitToHeight(true); scrollPane.setBorder(Border.EMPTY); getChildren().add(scrollPane); - vBox.getChildren().add(line1); - vBox.getChildren().add(line2); - setBackground(BACKGROUND); - scrollPane.setBackground(BACKGROUND); - vBox.setBackground(BACKGROUND); + rootVBox.getChildren().add(line1); + rootVBox.getChildren().add(line2); + line1.setBackground(HEADER_BACKGROUND); + line2.setBackground(HEADER_BACKGROUND); + setBackground(WHITE_BACKGROUND); + scrollPane.setBackground(WHITE_BACKGROUND); + rootVBox.setBackground(WHITE_BACKGROUND); scrollPane.setVbarPolicy(ScrollBarPolicy.NEVER); } @@ -76,7 +149,7 @@ private void addState(StateWrapper wrapper, HBox line, Color color) { text.setAlignment(Pos.CENTER); text.setMouseTransparent(true); text.setTextFill(Color.WHITE); - text.setFont(stateNumbersFont); + text.setFont(STATE_FONT); text.setMaxWidth(DIAMETER); final Tooltip tooltip = new Tooltip(wrapper.description); Tooltip.install(rectangle, tooltip); @@ -86,37 +159,373 @@ private void addState(StateWrapper wrapper, HBox line, Color color) { line.getChildren().add(layout); } - private void addBlank(HBox line) { + private void addBlankState(HBox line) { final Rectangle rectangle = new Rectangle(DIAMETER, DIAMETER, Color.TRANSPARENT); - line.getChildren().add(rectangle); HBox.setMargin(rectangle, MARGIN_INSETS); + line.getChildren().add(rectangle); + } + + private void addValue(EObject value, HBox line, String description, boolean newValue) { + final List> segments = lineToSegments.get(line); + List segment; + boolean addDescription = false; + if (segments.isEmpty()) { + segment = new ArrayList<>(); + addDescription = true; + segments.add(segment); + } else { + if (newValue) { + segment = new ArrayList<>(); + addDescription = true; + segments.add(segment); + } else { + segment = segments.get(segments.size() - 1); + if (segment == null) { + segment = new ArrayList<>(); + addDescription = true; + segments.add(segment); + } + } + + } + if (addDescription) { + List descriptions = segmentToDescription.get(line); + if (descriptions == null) { + descriptions = new ArrayList<>(); + segmentToDescription.put(line, descriptions); + } + descriptions.add(description); + } + segment.add(1); + } + + private void addDelayedValue(HBox line) { + final List> segments = lineToSegments.get(line); + final List segment = segments.get(segments.size() - 1); + segment.add(-1); } - public void fillStateLines(List stateWrappers1, - List stateWrappers2, List diffs) { + private void addBlankValue(HBox line) { + lineToSegments.get(line).add(null); + } + + private List normalizeValueTrace(List trace) { + final List result = new ArrayList<>(); + trace.stream().forEach(w -> { + while (result.size() < w.firstStateIndex) { + result.add(null); + } + while (result.size() < w.lastStateIndex + 1) { + result.add(w.value); + valueToWrapper.putIfAbsent(w.value, w); + } + }); + return result; + } + + public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor extractor2) { + this.extractor1 = extractor1; + this.extractor2 = extractor2; + valueToWrapper.clear(); + valueTraces1.clear(); + valueTraces2.clear(); + + final List wrappers1 = extractor1.getStateWrappers(0, extractor1.getStatesTraceLength()-1); + final List states1 = wrappers1.stream().map(w -> w.state).collect(Collectors.toList()); + final List> valueWrappers1 = new ArrayList<>(); + for (int i = 0; i < extractor1.getNumberOfTraces(); i++) { + final List valueWrappers = extractor1.getValueWrappers(i, 0, extractor1.getStatesTraceLength()-1); + valueWrappers1.add(valueWrappers); + final List valueTrace = normalizeValueTrace(valueWrappers); + while (valueTrace.size() < states1.size()) { + valueTrace.add(null); + } + valueTraces1.add(valueTrace); + } + + final List wrappers2 = extractor2.getStateWrappers(0, extractor2.getStatesTraceLength()-1); + final List states2 = wrappers2.stream().map(w -> w.state).collect(Collectors.toList()); + final List> valueWrappers2 = new ArrayList<>(); + for (int i = 0; i < extractor2.getNumberOfTraces(); i++) { + final List valueWrappers = extractor2.getValueWrappers(i, 0, extractor2.getStatesTraceLength()-1); + valueWrappers2.add(valueWrappers); + final List valueTrace = normalizeValueTrace(valueWrappers); + while (valueTrace.size() < states2.size()) { + valueTrace.add(null); + } + valueTraces2.add(valueTrace); + } + + final DiffComputer diffComputer = new DiffComputer(); + diffComputer.loadTraces(valueTraces1, valueTraces2); + + refresh(wrappers1, wrappers2, diffComputer); + } + + private boolean isNewValue(int idx, List list) { + return idx == 0 || (idx < list.size() && idx > 0 && list.get(idx - 1) != list.get(idx)); + } + + private void fillGap(HBox line, List trace, int idx) { + if (idx > 0 && idx < trace.size()) { + if (trace.get(idx - 1) != null || (idx < trace.size() - 1 && trace.get(idx + 1) != null)) { + addDelayedValue(line); + } else { + addBlankValue(line); + } + } else { + addBlankValue(line); + } + } + + public void refresh(List stateWrappers1, List stateWrappers2, DiffComputer diffComputer) { line1.getChildren().clear(); line2.getChildren().clear(); - for (Diff diff : diffs) { + eqLines.getChildren().clear(); + substLines.getChildren().clear(); + inLines.getChildren().clear(); + delLines.getChildren().clear(); + lineToSegments.clear(); + while (rootVBox.getChildren().size() > 2) { + rootVBox.getChildren().remove(2); + } + + final List, List>> eqGroup = diffComputer.getEqGroup(); + final List, List>> substGroup = diffComputer.getSubstGroup(); + final List> inGroup = diffComputer.getInGroup(); + final List> delGroup = diffComputer.getDelGroup(); + + if (!eqGroup.isEmpty()) { + rootVBox.getChildren().add(eqBox); + } + + if (!substGroup.isEmpty()) { + rootVBox.getChildren().add(substBox); + } + + if (!inGroup.isEmpty()) { + rootVBox.getChildren().add(inBox); + } + + if (!delGroup.isEmpty()) { + rootVBox.getChildren().add(delBox); + } + + final Map, HBox> traceToLine = new HashMap<>(); + + int c = 0; + + for (Pair, List> e : eqGroup) { + final VBox pairBox = new VBox(); + final HBox trace1Box = new HBox(); + final HBox trace2Box = new HBox(); + traceToLine.put(e.getKey(), trace1Box); + traceToLine.put(e.getValue(), trace2Box); + lineToSegments.put(trace1Box, new ArrayList<>()); + lineToSegments.put(trace2Box, new ArrayList<>()); + Label l1 = new Label(extractor1.getValueLabel(valueTraces1.indexOf(e.getKey()))); + Label l2 = new Label(extractor2.getValueLabel(valueTraces2.indexOf(e.getValue()))); + VBox.setMargin(l1, HALF_MARGIN_INSETS); + VBox.setMargin(l2, HALF_MARGIN_INSETS); + l1.setFont(VALUE_FONT); + l2.setFont(VALUE_FONT); + pairBox.getChildren().addAll(l1, trace1Box, l2, trace2Box); + eqLines.getChildren().add(pairBox); + pairBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); + trace1Box.setBackground(TRANSPARENT_BACKGROUND); + trace2Box.setBackground(TRANSPARENT_BACKGROUND); + c++; + } + + for (Pair, List> e : substGroup) { + final VBox pairBox = new VBox(); + final HBox trace1Box = new HBox(); + final HBox trace2Box = new HBox(); + traceToLine.put(e.getKey(), trace1Box); + traceToLine.put(e.getValue(), trace2Box); + lineToSegments.put(trace1Box, new ArrayList<>()); + lineToSegments.put(trace2Box, new ArrayList<>()); + Label l1 = new Label(extractor1.getValueLabel(valueTraces1.indexOf(e.getKey()))); + Label l2 = new Label(extractor2.getValueLabel(valueTraces2.indexOf(e.getValue()))); + VBox.setMargin(l1, HALF_MARGIN_INSETS); + VBox.setMargin(l2, HALF_MARGIN_INSETS); + l1.setFont(VALUE_FONT); + l2.setFont(VALUE_FONT); + pairBox.getChildren().addAll(l1, trace1Box, l2, trace2Box); + substLines.getChildren().add(pairBox); + pairBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); + trace1Box.setBackground(TRANSPARENT_BACKGROUND); + trace2Box.setBackground(TRANSPARENT_BACKGROUND); + c++; + } + + for (List in : inGroup) { + final VBox inVBox = new VBox(); + final HBox traceBox = new HBox(); + traceToLine.put(in, traceBox); + lineToSegments.put(traceBox, new ArrayList<>()); + Label l = new Label(extractor2.getValueLabel(valueTraces2.indexOf(in))); + VBox.setMargin(l, HALF_MARGIN_INSETS); + l.setFont(VALUE_FONT); + inVBox.getChildren().addAll(l, traceBox); + inLines.getChildren().add(inVBox); + traceBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); + c++; + } + + for (List del : delGroup) { + final VBox delVBox = new VBox(); + final HBox traceBox = new HBox(); + traceToLine.put(del, traceBox); + lineToSegments.put(traceBox, new ArrayList<>()); + Label l = new Label(extractor1.getValueLabel(valueTraces1.indexOf(del))); + VBox.setMargin(l, HALF_MARGIN_INSETS); + l.setFont(VALUE_FONT); + delVBox.getChildren().addAll(l, traceBox); + delLines.getChildren().add(delVBox); + traceBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); + c++; + } + + for (Diff diff : diffComputer.getDiffs()) { int i = diff.idx1; int j = diff.idx2; switch (diff.kind) { case EQ: addState(stateWrappers1.get(i), line1, Color.SLATEBLUE); addState(stateWrappers2.get(j), line2, Color.SLATEBLUE); + for (Pair, List> e : eqGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (Pair, List> e : substGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (List del : delGroup) { + String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); + } + for (List in : inGroup) { + String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); + } break; case SUBST: addState(stateWrappers1.get(i), line1, Color.TOMATO); addState(stateWrappers2.get(j), line2, Color.TOMATO); + for (Pair, List> e : eqGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (Pair, List> e : substGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (List del : delGroup) { + String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); + } + for (List in : inGroup) { + String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); + } break; case DEL: addState(stateWrappers1.get(i), line1, Color.BROWN); - addBlank(line2); + addBlankState(line2); + for (Pair, List> e : eqGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + fillGap(traceToLine.get(t2), t2, j); + } + for (Pair, List> e : substGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + fillGap(traceToLine.get(t2), t2, j); + } + for (List del : delGroup) { + String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); + } + for (List in : inGroup) { + fillGap(traceToLine.get(in), in, j); + } break; case IN: - addBlank(line1); + addBlankState(line1); addState(stateWrappers2.get(j), line2, Color.BROWN); + for (Pair, List> e : eqGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + fillGap(traceToLine.get(t1), t1, i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (Pair, List> e : substGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + fillGap(traceToLine.get(t1), t1, i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (List del : delGroup) { + fillGap(traceToLine.get(del), del, i); + } + for (List in : inGroup) { + String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); + } break; } } + processSegments(); + } + + private void processSegments() { + for (Map.Entry>> e : lineToSegments.entrySet()) { + final HBox line = e.getKey(); + final List descriptions = segmentToDescription.get(line); + final List children = line.getChildren(); + final List> segments = e.getValue(); + int idx = 0; + for (List segment : segments) { + if (segment == null) { + final Rectangle rectangle = new Rectangle(DIAMETER, 8, Color.TRANSPARENT); + HBox.setMargin(rectangle, MARGIN_INSETS); + children.add(rectangle); + } else { + int[] seg = new int[segment.size()]; + for (int i = 0; i < seg.length; i++) { + seg[i] = segment.get(i); + } + final String description = descriptions.get(idx); + final ValueView view = new ValueView(description, seg); + HBox.setMargin(view, MARGIN_INSETS); + children.add(view); + idx++; + } + } + } } } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java index ac267abb8..0a3d612a5 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java @@ -10,10 +10,7 @@ *******************************************************************************/ package org.gemoc.sequential_addons.diffviewer.views; -import java.util.ArrayList; -import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -22,7 +19,6 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; 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.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; @@ -39,11 +35,9 @@ import org.eclipse.ui.part.ViewPart; import org.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; import org.gemoc.sequential_addons.diffviewer.Activator; -import org.gemoc.sequential_addons.diffviewer.logic.Diff; -import org.gemoc.sequential_addons.diffviewer.logic.DiffComputer; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StateWrapper; +import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon; import javafx.embed.swt.FXCanvas; import javafx.scene.Scene; @@ -67,8 +61,6 @@ public void createPartControl(Composite parent) { }); buildMenu(parent.getShell()); } - - private void buildMenu(Shell shell) { addActionToToolbar(new AbstractEngineAction(Action.AS_PUSH_BUTTON) { @@ -145,20 +137,10 @@ public void run() { if (newTraceAddon != null) { newTraceAddon.load(traceResource1); - final List wrappers1 = newTraceAddon.getTraceExtractor() - .getStateWrappers(0, newTraceAddon.getTraceExtractor().getStatesTraceLength()-1); - final List states1 = wrappers1.stream().map(w -> w.state).collect(Collectors.toList()); - + final ITraceExtractor extractor1 = newTraceAddon.getTraceExtractor(); newTraceAddon.load(traceResource2); - final List wrappers2 = newTraceAddon.getTraceExtractor() - .getStateWrappers(0, newTraceAddon.getTraceExtractor().getStatesTraceLength()-1); - final List states2 = wrappers2.stream().map(w -> w.state).collect(Collectors.toList()); - - final List allStates = new ArrayList<>(states1); - allStates.addAll(states2); - - List diffs = DiffComputer.computeDiff(states1, states2, newTraceAddon.getTraceExtractor().computeStateEquivalenceClasses(allStates)); - diffViewer.fillStateLines(wrappers1, wrappers2, diffs); + final ITraceExtractor extractor2 = newTraceAddon.getTraceExtractor(); + diffViewer.loadTraces(extractor1, extractor2); } } } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java new file mode 100644 index 000000000..fedbcaa9e --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java @@ -0,0 +1,54 @@ +package org.gemoc.sequential_addons.diffviewer.views; + +import java.util.ArrayList; +import java.util.List; + +import javafx.scene.control.Tooltip; +import javafx.scene.layout.HBox; +import javafx.scene.paint.Color; +import javafx.scene.shape.Rectangle; +import javafx.scene.shape.Shape; + +public class ValueView extends HBox { + + private static final int HEIGHT = 8; + private static final int H_MARGIN = 8; + private static final int DIAMETER = 24; + + public void setSegments(int... segmentParts) { + if (segmentParts.length > 0) { + int totalLength = (DIAMETER + H_MARGIN * 2) * segmentParts.length - H_MARGIN * 2; + final List rectangles = new ArrayList<>(); + if (segmentParts.length > 1) { + for (int i = 1; i < segmentParts.length - 1; i++) { + final Rectangle r = new Rectangle(DIAMETER + H_MARGIN * 2, HEIGHT, + segmentParts[i] > 0 ? Color.BLUE : Color.LIGHTBLUE); + rectangles.add(r); + } + final Rectangle firstR = new Rectangle(DIAMETER + H_MARGIN, HEIGHT); + final Rectangle lastR = new Rectangle(totalLength - (DIAMETER + H_MARGIN), 0, DIAMETER + H_MARGIN, HEIGHT); + final Rectangle r = new Rectangle(totalLength, HEIGHT); + r.setArcHeight(HEIGHT); + r.setArcWidth(12); + final Shape s1 = Shape.intersect(firstR, r); + final Shape s2 = Shape.intersect(lastR, r); + s1.setFill(Color.BLUE); + s2.setFill(segmentParts[segmentParts.length - 1] > 0 ? Color.BLUE : Color.LIGHTBLUE); + rectangles.add(0, s1); + rectangles.add(s2); + } else { + final Rectangle r = new Rectangle(DIAMETER, HEIGHT, Color.BLUE); + r.setArcHeight(HEIGHT); + r.setArcWidth(12); + rectangles.add(r); + } + getChildren().addAll(rectangles); + } + } + + public ValueView(String description, int... segmentLengths) { + setSegments(segmentLengths); + final Tooltip tooltip = new Tooltip(description); + Tooltip.install(this, tooltip); + } +} diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index 7049be60c..1a4d6a6f2 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -40,8 +40,6 @@ import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.collections.ListChangeListener; -import javafx.event.EventHandler; -import javafx.geometry.Bounds; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.Cursor; @@ -54,7 +52,6 @@ import javafx.scene.control.ScrollBar; import javafx.scene.control.ScrollPane; import javafx.scene.control.Tooltip; -import javafx.scene.effect.Glow; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.input.MouseButton; @@ -120,8 +117,6 @@ public class MultidimensionalTimelineRenderer extends Pane implements ITraceList final private Path diagonalHatching = new Path(); - final private Glow glow = new Glow(0.8); - final private Image stepValueGraphic; final private Image backValueGraphic; @@ -586,30 +581,6 @@ private void fillValueLine(HBox line, int idx, List valueWrappers, private static final int CURRENT_BACKWARD_STEP = 1; private static final int CURRENT_BIGSTEP = 2; -// private void addGlowOnMouseOverStep(Step step, Path stepPath, List accumulator) { -// final Path mousingPath = new Path(); -// final EventHandler onMouseEntered = e -> stepPath.setEffect(glow); -// final EventHandler onMouseExited = e -> stepPath.setEffect(null); -// mousingPath.setStrokeWidth(12); -// mousingPath.setStroke(Color.rgb(0, 0, 0, 0.20)); -// Bindings.bindContent(mousingPath.getElements(), stepPath.getElements()); -// accumulator.add(mousingPath); -// mousingPath.setOnMouseEntered(onMouseEntered); -// mousingPath.setOnMouseExited(onMouseExited); -// mousingPath.setOnMouseClicked(e -> { -// if (e.getClickCount() > 1) { -// final double x = e.getX(); -// final Bounds bounds = mousingPath.getBoundsInLocal(); -// final double midX = bounds.getMinX() + bounds.getWidth() / 2.; -// if (x < midX) { -// System.out.println("BACKWARD"); -// } else { -// System.out.println("FORWARD"); -// } -// } -// }); -// } - private NumberExpression createSteps(StepWrapper stepWrapper, int depth, int currentStateStartIndex, int selectedStateIndex, List accumulator, Object[] stepTargets) { @@ -637,7 +608,6 @@ private NumberExpression createSteps(StepWrapper stepWrapper, int depth, int cur } accumulator.add(path); -// addGlowOnMouseOverStep(stepWrapper.step, path, accumulator); final List subSteps = stepWrapper.subSteps; NumberExpression yOffset = new SimpleDoubleProperty(0); From 2ead7c04f5dd0cffdd5548073c85dc9c71c71923 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Tue, 20 Sep 2016 17:09:54 +0200 Subject: [PATCH 007/267] Improved the way big traces are handled by the diff viewer --- .../diffviewer/logic/DiffComputer.java | 45 +++--- .../views/TimelineDiffViewerRenderer.java | 151 ++++++++++++------ .../diffviewer/views/ValueView.java | 85 ++++++++-- .../MultidimensionalTimelineRenderer.java | 127 ++++++--------- 4 files changed, 248 insertions(+), 160 deletions(-) diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java index 99b04fe95..2e1a039db 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java @@ -41,7 +41,19 @@ @SuppressWarnings("restriction") public class DiffComputer { + @SuppressWarnings("rawtypes") + private Registry registry = null; private IDiffEngine diffEngine = null; + private EMFCompare compare; + private IPostProcessor.Descriptor descriptor = null; + private boolean compareInitialized = false; + + private final List, List>> eqGroup = new ArrayList<>(); + private final List, List>> substGroup = new ArrayList<>(); + private final List> inGroup = new ArrayList<>(); + private final List> delGroup = new ArrayList<>(); + + private final List diffs = new ArrayList<>(); private void configureDiffEngine() { IDiffProcessor diffProcessor = new DiffBuilder(); @@ -120,15 +132,6 @@ public void postComparison(Comparison comparison, Monitor monitor) { } }; - private boolean compareInitialized = false; - - private IPostProcessor.Descriptor descriptor = null; - - @SuppressWarnings("rawtypes") - private Registry registry = null; - - private EMFCompare compare; - @SuppressWarnings({ "rawtypes", "unchecked" }) private boolean compareEObjects(EObject e1, EObject e2) { if (e1 == e2) { @@ -138,7 +141,7 @@ private boolean compareEObjects(EObject e1, EObject e2) { if (e1 == null || e2 == null) { return false; } - + if (e1.eClass() != e2.eClass()) { return false; } @@ -248,32 +251,22 @@ private EClass getTraceEClass(final List trace) { return result; } - private final List diffs = new ArrayList<>(); - public List getDiffs() { return diffs; } - private final List, List>> eqGroup = new ArrayList<>(); - public List, List>> getEqGroup() { return eqGroup; } - private final List, List>> substGroup = new ArrayList<>(); - public List, List>> getSubstGroup() { return substGroup; } - private final List> inGroup = new ArrayList<>(); - public List> getInGroup() { return inGroup; } - private final List> delGroup = new ArrayList<>(); - public List> getDelGroup() { return delGroup; } @@ -435,10 +428,10 @@ private List>> computeEquivalenceClasses(final List>> result = new HashMap<>(); - + stateToValueIndexes.forEach(p -> { final List state = p.getKey(); final List indexes = p.getValue(); @@ -462,10 +455,10 @@ private List>> computeEquivalenceClasses(final List> states1, final List> states2, final Collection>> classes) { final Map, List>> stateToEquivalentStates = new HashMap<>(); @@ -514,7 +507,7 @@ private int[][] alignTraces(final List> states1, final List computeDiff(final List> states1, final List> states2, diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java index c71254a6b..b1b6c70c7 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java @@ -13,12 +13,15 @@ import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StateWrapper; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.ValueWrapper; +import javafx.beans.property.IntegerProperty; +import javafx.beans.property.SimpleIntegerProperty; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.Cursor; import javafx.scene.Node; import javafx.scene.control.Label; import javafx.scene.control.OverrunStyle; +import javafx.scene.control.ScrollBar; import javafx.scene.control.ScrollPane; import javafx.scene.control.ScrollPane.ScrollBarPolicy; import javafx.scene.control.Tooltip; @@ -41,7 +44,8 @@ public class TimelineDiffViewerRenderer extends Pane { private static final int H_MARGIN = 8; private static final int V_MARGIN = 2; - private static final int DIAMETER = 24; + private static final int WIDTH = 24; + private static final int UNIT = WIDTH + H_MARGIN * 2; private static final Insets HALF_MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN / 2, V_MARGIN, H_MARGIN / 2); private static final Insets MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN, V_MARGIN, H_MARGIN); @@ -69,6 +73,12 @@ public class TimelineDiffViewerRenderer extends Pane { private final VBox inBox = new VBox(); private final VBox delLines = new VBox(); private final VBox delBox = new VBox(); + + private final IntegerProperty nbDisplayableStates; + private final IntegerProperty statesRange; + private final IntegerProperty nbStates; + + private int currentState = 0; final Map>> lineToSegments = new HashMap<>(); final Map> segmentToDescription = new HashMap<>(); @@ -78,33 +88,22 @@ public class TimelineDiffViewerRenderer extends Pane { private final List> valueTraces1 = new ArrayList<>(); private final List> valueTraces2 = new ArrayList<>(); + + private final List wrappers1 = new ArrayList<>(); + private final List wrappers2 = new ArrayList<>(); - private final Map valueToWrapper = new HashMap<>(); + private DiffComputer diffComputer; - private void setupBox(VBox box, String labelString, VBox content) { - final HBox boxLabel = new HBox(); - final Polygon arrow = new Polygon(2.5, 10, 10, 5, 2.5, 0); - final Label label = new Label(labelString); - boxLabel.setBackground(HEADER_BACKGROUND); - label.setFont(GROUP_FONT); - HBox.setMargin(arrow, HALF_MARGIN_INSETS); - boxLabel.setAlignment(Pos.CENTER_LEFT); - boxLabel.getChildren().addAll(arrow, label); - boxLabel.setCursor(Cursor.HAND); - box.getChildren().add(boxLabel); - boxLabel.setOnMouseClicked(e -> { - if (box.getChildren().size() > 1) { - box.getChildren().remove(content); - arrow.setRotate(0); - } else { - box.getChildren().add(content); - arrow.setRotate(90); - } - }); - } + private final Map valueToWrapper = new HashMap<>(); public TimelineDiffViewerRenderer() { + nbStates = new SimpleIntegerProperty(); + statesRange = new SimpleIntegerProperty(); + nbDisplayableStates = new SimpleIntegerProperty(); + nbDisplayableStates.bind(widthProperty().divide(UNIT)); + statesRange.bind(nbStates.subtract(nbDisplayableStates)); + setupBox(eqBox, "Toggle identical traces", eqLines); setupBox(substBox, "Toggle similar traces", substLines); setupBox(inBox, "Toggle inserted traces", inLines); @@ -121,6 +120,21 @@ public TimelineDiffViewerRenderer() { scrollPane.setFitToHeight(true); scrollPane.setBorder(Border.EMPTY); getChildren().add(scrollPane); + + final ScrollBar scrollBar = new ScrollBar(); + scrollBar.setVisibleAmount(1); + scrollBar.setBlockIncrement(10); + scrollBar.setMin(0); + scrollBar.disableProperty().bind(statesRange.lessThanOrEqualTo(0)); + scrollBar.maxProperty().bind(statesRange); + scrollBar.valueProperty().addListener((v, o, n) -> { + if (o.intValue() != n.intValue()) { + refresh(wrappers1, wrappers2, diffComputer); + currentState = Math.min(Math.max(0, n.intValue()), diffComputer.getDiffs().size()); + } + }); + + rootVBox.getChildren().add(scrollBar); rootVBox.getChildren().add(line1); rootVBox.getChildren().add(line2); line1.setBackground(HEADER_BACKGROUND); @@ -131,6 +145,28 @@ public TimelineDiffViewerRenderer() { scrollPane.setVbarPolicy(ScrollBarPolicy.NEVER); } + private void setupBox(VBox box, String labelString, VBox content) { + final HBox boxLabel = new HBox(); + final Polygon arrow = new Polygon(2.5, 10, 10, 5, 2.5, 0); + final Label label = new Label(labelString); + boxLabel.setBackground(HEADER_BACKGROUND); + label.setFont(GROUP_FONT); + HBox.setMargin(arrow, HALF_MARGIN_INSETS); + boxLabel.setAlignment(Pos.CENTER_LEFT); + boxLabel.getChildren().addAll(arrow, label); + boxLabel.setCursor(Cursor.HAND); + box.getChildren().add(boxLabel); + boxLabel.setOnMouseClicked(e -> { + if (box.getChildren().size() > 1) { + box.getChildren().remove(content); + arrow.setRotate(0); + } else { + box.getChildren().add(content); + arrow.setRotate(90); + } + }); + } + private String computeStateLabel(int stateNumber) { if (stateNumber > 999) { return (stateNumber / 1000) + "k" + ((stateNumber % 1000) / 10); @@ -140,9 +176,9 @@ private String computeStateLabel(int stateNumber) { } private void addState(StateWrapper wrapper, HBox line, Color color) { - final Rectangle rectangle = new Rectangle(DIAMETER, DIAMETER, color); - rectangle.setArcHeight(DIAMETER); - rectangle.setArcWidth(DIAMETER); + final Rectangle rectangle = new Rectangle(WIDTH, WIDTH, color); + rectangle.setArcHeight(WIDTH); + rectangle.setArcWidth(WIDTH); rectangle.setUserData(wrapper.state); Label text = new Label(computeStateLabel(wrapper.stateIndex)); text.setTextOverrun(OverrunStyle.ELLIPSIS); @@ -150,7 +186,7 @@ private void addState(StateWrapper wrapper, HBox line, Color color) { text.setMouseTransparent(true); text.setTextFill(Color.WHITE); text.setFont(STATE_FONT); - text.setMaxWidth(DIAMETER); + text.setMaxWidth(WIDTH); final Tooltip tooltip = new Tooltip(wrapper.description); Tooltip.install(rectangle, tooltip); StackPane layout = new StackPane(); @@ -160,7 +196,7 @@ private void addState(StateWrapper wrapper, HBox line, Color color) { } private void addBlankState(HBox line) { - final Rectangle rectangle = new Rectangle(DIAMETER, DIAMETER, Color.TRANSPARENT); + final Rectangle rectangle = new Rectangle(WIDTH, WIDTH, Color.TRANSPARENT); HBox.setMargin(rectangle, MARGIN_INSETS); line.getChildren().add(rectangle); } @@ -199,9 +235,25 @@ private void addValue(EObject value, HBox line, String description, boolean newV segment.add(1); } - private void addDelayedValue(HBox line) { + private void addDelayedValue(HBox line, String description) { final List> segments = lineToSegments.get(line); - final List segment = segments.get(segments.size() - 1); + final List segment; + boolean addDescription = false; + if (segments.isEmpty()) { + segment = new ArrayList<>(); + addDescription = true; + segments.add(segment); + } else { + segment = segments.get(segments.size() - 1); + } + if (addDescription) { + List descriptions = segmentToDescription.get(line); + if (descriptions == null) { + descriptions = new ArrayList<>(); + segmentToDescription.put(line, descriptions); + } + descriptions.add(description); + } segment.add(-1); } @@ -229,8 +281,10 @@ public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor e valueToWrapper.clear(); valueTraces1.clear(); valueTraces2.clear(); + wrappers1.clear(); + wrappers2.clear(); - final List wrappers1 = extractor1.getStateWrappers(0, extractor1.getStatesTraceLength()-1); + wrappers1.addAll(extractor1.getStateWrappers(0, extractor1.getStatesTraceLength()-1)); final List states1 = wrappers1.stream().map(w -> w.state).collect(Collectors.toList()); final List> valueWrappers1 = new ArrayList<>(); for (int i = 0; i < extractor1.getNumberOfTraces(); i++) { @@ -243,7 +297,7 @@ public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor e valueTraces1.add(valueTrace); } - final List wrappers2 = extractor2.getStateWrappers(0, extractor2.getStatesTraceLength()-1); + wrappers2.addAll(extractor2.getStateWrappers(0, extractor2.getStatesTraceLength()-1)); final List states2 = wrappers2.stream().map(w -> w.state).collect(Collectors.toList()); final List> valueWrappers2 = new ArrayList<>(); for (int i = 0; i < extractor2.getNumberOfTraces(); i++) { @@ -256,8 +310,9 @@ public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor e valueTraces2.add(valueTrace); } - final DiffComputer diffComputer = new DiffComputer(); + diffComputer = new DiffComputer(); diffComputer.loadTraces(valueTraces1, valueTraces2); + nbStates.set(diffComputer.getDiffs().size()); refresh(wrappers1, wrappers2, diffComputer); } @@ -266,10 +321,10 @@ private boolean isNewValue(int idx, List list) { return idx == 0 || (idx < list.size() && idx > 0 && list.get(idx - 1) != list.get(idx)); } - private void fillGap(HBox line, List trace, int idx) { + private void fillGap(HBox line, List trace, int idx, String description) { if (idx > 0 && idx < trace.size()) { if (trace.get(idx - 1) != null || (idx < trace.size() - 1 && trace.get(idx + 1) != null)) { - addDelayedValue(line); + addDelayedValue(line, description); } else { addBlankValue(line); } @@ -286,8 +341,8 @@ public void refresh(List stateWrappers1, List stateW inLines.getChildren().clear(); delLines.getChildren().clear(); lineToSegments.clear(); - while (rootVBox.getChildren().size() > 2) { - rootVBox.getChildren().remove(2); + while (rootVBox.getChildren().size() > 3) { + rootVBox.getChildren().remove(3); } final List, List>> eqGroup = diffComputer.getEqGroup(); @@ -387,7 +442,7 @@ public void refresh(List stateWrappers1, List stateW c++; } - for (Diff diff : diffComputer.getDiffs()) { + for (Diff diff : diffComputer.getDiffs().subList(currentState, currentState + nbDisplayableStates.intValue())) { int i = diff.idx1; int j = diff.idx2; switch (diff.kind) { @@ -454,22 +509,25 @@ public void refresh(List stateWrappers1, List stateW final List t1 = e.getKey(); final List t2 = e.getValue(); String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - fillGap(traceToLine.get(t2), t2, j); + fillGap(traceToLine.get(t2), t2, j, d2); } for (Pair, List> e : substGroup) { final List t1 = e.getKey(); final List t2 = e.getValue(); String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - fillGap(traceToLine.get(t2), t2, j); + fillGap(traceToLine.get(t2), t2, j, d2); } for (List del : delGroup) { String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); } for (List in : inGroup) { - fillGap(traceToLine.get(in), in, j); + String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + fillGap(traceToLine.get(in), in, j, d); } break; case IN: @@ -478,19 +536,22 @@ public void refresh(List stateWrappers1, List stateW for (Pair, List> e : eqGroup) { final List t1 = e.getKey(); final List t2 = e.getValue(); - fillGap(traceToLine.get(t1), t1, i); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + fillGap(traceToLine.get(t1), t1, i, d1); addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); } for (Pair, List> e : substGroup) { final List t1 = e.getKey(); final List t2 = e.getValue(); - fillGap(traceToLine.get(t1), t1, i); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + fillGap(traceToLine.get(t1), t1, i, d1); addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); } for (List del : delGroup) { - fillGap(traceToLine.get(del), del, i); + String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + fillGap(traceToLine.get(del), del, i, d); } for (List in : inGroup) { String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); @@ -511,7 +572,7 @@ private void processSegments() { int idx = 0; for (List segment : segments) { if (segment == null) { - final Rectangle rectangle = new Rectangle(DIAMETER, 8, Color.TRANSPARENT); + final Rectangle rectangle = new Rectangle(WIDTH, 8, Color.TRANSPARENT); HBox.setMargin(rectangle, MARGIN_INSETS); children.add(rectangle); } else { diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java index fedbcaa9e..ac7b4501c 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java @@ -6,6 +6,9 @@ import javafx.scene.control.Tooltip; import javafx.scene.layout.HBox; import javafx.scene.paint.Color; +import javafx.scene.shape.LineTo; +import javafx.scene.shape.MoveTo; +import javafx.scene.shape.Path; import javafx.scene.shape.Rectangle; import javafx.scene.shape.Shape; @@ -13,31 +16,85 @@ public class ValueView extends HBox { private static final int HEIGHT = 8; private static final int H_MARGIN = 8; - private static final int DIAMETER = 24; + private static final int WIDTH = 24; + private Shape getHatching(int length, int offset) { + final Path p = new Path(); + for (int i = 0; i < (length / 2.5) + 1; i++) { + final double x1 = (i - 1) * 2.5 + offset; + final double y1 = 8; + final double x2 = (i + 1) * 2.5 + offset; + final double y2 = 0; + final MoveTo move = new MoveTo(x1, y1); + final LineTo line = new LineTo(x2, y2); + p.getElements().addAll(move, line); + p.setStrokeWidth(1); + } + return p; + } + public void setSegments(int... segmentParts) { if (segmentParts.length > 0) { - int totalLength = (DIAMETER + H_MARGIN * 2) * segmentParts.length - H_MARGIN * 2; + int totalLength = (WIDTH + H_MARGIN * 2) * segmentParts.length - H_MARGIN * 2; final List rectangles = new ArrayList<>(); - if (segmentParts.length > 1) { - for (int i = 1; i < segmentParts.length - 1; i++) { - final Rectangle r = new Rectangle(DIAMETER + H_MARGIN * 2, HEIGHT, - segmentParts[i] > 0 ? Color.BLUE : Color.LIGHTBLUE); - rectangles.add(r); + final boolean firstSegmentIsGap = segmentParts[0] == -1; + int j = 0; + final List segmentLengths = new ArrayList<>(); + segmentLengths.add(1); + for (int i = 1; i < segmentParts.length; i++) { + if (segmentParts[i] != segmentParts[i - 1]) { + j++; + segmentLengths.add(1); + } else { + segmentLengths.add(1 + segmentLengths.remove(j)); + } + } + + if (segmentLengths.size() > 1) { + final int segmentCount = segmentLengths.size(); + for (int i = 1; i < segmentCount - 1; i++) { + final Shape s; + final int length = (WIDTH + H_MARGIN * 2) * segmentLengths.get(i); + if (i % 2 == 0 && !firstSegmentIsGap) { + s = new Rectangle(length, HEIGHT, Color.BLUE); + } else { + final Rectangle r = new Rectangle(length, HEIGHT); + s = Shape.subtract(r, getHatching(length, 0)); + s.setFill(Color.BLUE); + } + rectangles.add(s); } - final Rectangle firstR = new Rectangle(DIAMETER + H_MARGIN, HEIGHT); - final Rectangle lastR = new Rectangle(totalLength - (DIAMETER + H_MARGIN), 0, DIAMETER + H_MARGIN, HEIGHT); + + final Shape firstR; + final int l1 = (WIDTH + H_MARGIN * 2) * segmentLengths.get(0) - H_MARGIN; + if (!firstSegmentIsGap) { + firstR = new Rectangle(l1, HEIGHT); + } else { + final Rectangle r = new Rectangle(l1, HEIGHT); + firstR = Shape.subtract(r, getHatching(l1, 0)); + } + + final Shape lastR; + final int l2 = (WIDTH + H_MARGIN * 2) * segmentLengths.get(segmentCount - 1) - H_MARGIN; + if ((segmentCount - 1) % 2 == 0 && !firstSegmentIsGap) { + lastR = new Rectangle(totalLength - l2, 0, l2, HEIGHT); + } else { + final Rectangle r = new Rectangle(totalLength - l2, 0, l2, HEIGHT); + lastR = Shape.subtract(r, getHatching(l2, totalLength - l2)); + } + final Rectangle r = new Rectangle(totalLength, HEIGHT); r.setArcHeight(HEIGHT); r.setArcWidth(12); final Shape s1 = Shape.intersect(firstR, r); final Shape s2 = Shape.intersect(lastR, r); s1.setFill(Color.BLUE); - s2.setFill(segmentParts[segmentParts.length - 1] > 0 ? Color.BLUE : Color.LIGHTBLUE); + s2.setFill(Color.BLUE); rectangles.add(0, s1); rectangles.add(s2); } else { - final Rectangle r = new Rectangle(DIAMETER, HEIGHT, Color.BLUE); + final int length = (WIDTH + H_MARGIN * 2) * segmentLengths.get(0) - H_MARGIN * 2; + final Rectangle r = new Rectangle(length, HEIGHT, Color.BLUE); r.setArcHeight(HEIGHT); r.setArcWidth(12); rectangles.add(r); @@ -45,9 +102,9 @@ public void setSegments(int... segmentParts) { getChildren().addAll(rectangles); } } - - public ValueView(String description, int... segmentLengths) { - setSegments(segmentLengths); + + public ValueView(String description, int... segmentParts) { + setSegments(segmentParts); final Tooltip tooltip = new Tooltip(description); Tooltip.install(this, tooltip); } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index 1a4d6a6f2..b1a82e016 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -80,53 +80,71 @@ public class MultidimensionalTimelineRenderer extends Pane implements ITraceListener { private ITraceExplorer traceExplorer; - private ITraceExtractor traceExtractor; final private IntegerProperty currentState; - final private IntegerProperty currentStep; final private ScrollPane bodyScrollPane; - final private VBox headerPane; - final private Pane bodyPane; - final private VBox valuesLines; final private DoubleProperty valueTitleWidth; - final private DoubleProperty statesPaneHeight; - final private BooleanProperty displayGrid; - - private BooleanBinding displayGridBinding; - final private IntegerProperty nbDisplayableStates; - final private IntegerProperty visibleStatesRange; - final private IntegerProperty nbStates; + private BooleanBinding displayGridBinding; + final private Path diagonalHatching = new Path(); final private Font statesFont = Font.font("Arial", FontWeight.BOLD, 12); - final private Font valuesFont = Font.font("Arial", FontWeight.BOLD, 11); - final private Font stateNumbersFont = Font.font("Arial", FontWeight.BOLD, 9); - final private Path diagonalHatching = new Path(); - final private Image stepValueGraphic; - final private Image backValueGraphic; + private int lastClickedState = -1; + final private Consumer jumpConsumer = (i) -> traceExplorer.jump(i); + final private Supplier lastClickedStateSupplier = () -> lastClickedState; - private int lastClickedState = -1; + private boolean stateColoration; + + private static final int H_MARGIN = 8; + private static final int V_MARGIN = 2; + private static final int DIAMETER = 24; + private static final int V_HEIGHT = 8; + private static final int UNIT = DIAMETER + 2 * H_MARGIN; + private static final Insets MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN, V_MARGIN, H_MARGIN); + private static final Insets HALF_MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN / 2, V_MARGIN, H_MARGIN / 2); + private static final Background HEADER_BACKGROUND = new Background(new BackgroundFill(Color.LIGHTGRAY, null, null)); + private static final Background BODY_BACKGROUND = new Background(new BackgroundFill(Color.WHITE, null, null)); + private static final Background TRANSPARENT_BACKGROUND = new Background( + new BackgroundFill(Color.TRANSPARENT, null, null)); + private static final Paint LINE_PAINT = new Color(Color.LIGHTGRAY.getRed(), Color.LIGHTGRAY.getGreen(), + Color.LIGHTGRAY.getBlue(), 0.5); + private static final Background LINE_BACKGROUND = new Background(new BackgroundFill(LINE_PAINT, null, null)); + + private Path statesGrid = null; + private Rectangle highlightRectangle = null; + + private boolean scrollLock = false; + private final Pane statesPane = new Pane(); + + private final Image playGraphic; + private final Image replayGraphic; + + private final BooleanProperty isInReplayMode; + + private static final int CURRENT_FORWARD_STEP = 0; + private static final int CURRENT_BACKWARD_STEP = 1; + private static final int CURRENT_BIGSTEP = 2; + + private Consumer> displayMenu = null; - final private Supplier lastClickedStateSupplier = () -> lastClickedState; - public MultidimensionalTimelineRenderer() { headerPane = new VBox(); valuesLines = new VBox(); @@ -235,17 +253,6 @@ private void showState(int state, boolean jump) { currentState.set(effectiveToShow); } - private Path statesGrid = null; - private Rectangle highlightRectangle = null; - - private boolean scrollLock = false; - private final Pane statesPane = new Pane(); - - private final Image playGraphic; - private final Image replayGraphic; - - private final BooleanProperty isInReplayMode; - private Pane setupStatesPane() { final Label titleLabel = new Label("All execution states (0)"); nbStates.addListener((v, o, n) -> { @@ -384,25 +391,6 @@ private Pane setupValuePane(int line, Label titleLabel, Pane contentPane) { return valueVBox; } - private final Map valueNames = new HashMap<>(); - - private boolean stateColoration; - - private static final int H_MARGIN = 8; - private static final int V_MARGIN = 2; - private static final int DIAMETER = 24; - private static final int V_HEIGHT = 8; - private static final int UNIT = DIAMETER + 2 * H_MARGIN; - private static final Insets MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN, V_MARGIN, H_MARGIN); - private static final Insets HALF_MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN / 2, V_MARGIN, H_MARGIN / 2); - private static final Background HEADER_BACKGROUND = new Background(new BackgroundFill(Color.LIGHTGRAY, null, null)); - private static final Background BODY_BACKGROUND = new Background(new BackgroundFill(Color.WHITE, null, null)); - private static final Background TRANSPARENT_BACKGROUND = new Background( - new BackgroundFill(Color.TRANSPARENT, null, null)); - private static final Paint LINE_PAINT = new Color(Color.LIGHTGRAY.getRed(), Color.LIGHTGRAY.getGreen(), - Color.LIGHTGRAY.getBlue(), 0.5); - private static final Background LINE_BACKGROUND = new Background(new BackgroundFill(LINE_PAINT, null, null)); - private HBox createStateTraceLine() { final HBox hBox = new HBox(); statesPane.getChildren().add(hBox); @@ -448,12 +436,12 @@ private void fillStateLine(HBox line, List stateWrappers, int sele colorPalette.add(Color.hsb(i * interval, 0.75, 0.70)); } } - + final int[] stateToColor = new int[stateWrappers.size()]; for (int i = 0; i < nbColors; i++) { final List states = colorGroups.get(i); for (Integer state : states) { - stateToColor[state%stateToColor.length] = i; + stateToColor[state % stateToColor.length] = i; } } @@ -468,10 +456,9 @@ private void fillStateLine(HBox line, List stateWrappers, int sele rectangle = new Rectangle(width, height, currentColor); } else { if (stateColoration && !colorPalette.isEmpty()) { - final int idx = stateToColor[stateWrapper.stateIndex%stateToColor.length]; + final int idx = stateToColor[stateWrapper.stateIndex % stateToColor.length]; if (idx != -1) { - rectangle = new Rectangle(width, height, - colorPalette.get(idx)); + rectangle = new Rectangle(width, height, colorPalette.get(idx)); } else { rectangle = new Rectangle(width, height, otherColor); } @@ -577,10 +564,6 @@ private void fillValueLine(HBox line, int idx, List valueWrappers, } } - private static final int CURRENT_FORWARD_STEP = 0; - private static final int CURRENT_BACKWARD_STEP = 1; - private static final int CURRENT_BIGSTEP = 2; - private NumberExpression createSteps(StepWrapper stepWrapper, int depth, int currentStateStartIndex, int selectedStateIndex, List accumulator, Object[] stepTargets) { @@ -692,7 +675,7 @@ protected boolean computeValue() { traceExtractor.getStateWrappers(currentStateStartIndex - 1, currentStateEndIndex + 1), selectedStateIndex); } - + for (int i = 0; i < traceExtractor.getNumberOfTraces(); i++) { final HBox hBox = createValueTraceLine(i); fillValueLine(hBox, i, @@ -787,7 +770,6 @@ public Consumer getJumpConsumer() { } public void setTraceExplorer(ITraceExplorer traceExplorer) { - valueNames.clear(); if (this.traceExplorer != null) { this.traceExplorer.removeListener(this); } @@ -797,7 +779,7 @@ public void setTraceExplorer(ITraceExplorer traceExplorer) { } update(); } - + public void setTraceExtractor(ITraceExtractor traceExtractor) { this.traceExtractor = traceExtractor; } @@ -815,8 +797,6 @@ public void update() { refresh(); } - private Consumer> displayMenu = null; - public void setMenuDisplayer(Consumer> displayMenu) { this.displayMenu = displayMenu; } @@ -827,20 +807,17 @@ public Supplier getLastClickedStateSupplier() { private List> computeColorGroups(List stateWrappers) { final Map eObjectToWrapper = new HashMap<>(); - final List states = stateWrappers.stream().map(w->{ + final List states = stateWrappers.stream().map(w -> { eObjectToWrapper.put(w.state, w); return w.state; }).collect(Collectors.toList()); - + return traceExtractor.computeStateEquivalenceClasses(states).stream() - .map(l -> l.stream() - .map(e -> eObjectToWrapper.get(e).stateIndex) - .collect(Collectors.toList())) - .sorted((l1,l2) -> { - final int min1 = l1.stream().min((i1,i2)->i1-i2).get(); - final int min2 = l2.stream().min((i1,i2)->i1-i2).get(); - return min1-min2; - }) - .collect(Collectors.toList()); + .map(l -> l.stream().map(e -> eObjectToWrapper.get(e).stateIndex).collect(Collectors.toList())) + .sorted((l1, l2) -> { + final int min1 = l1.stream().min((i1, i2) -> i1 - i2).get(); + final int min2 = l2.stream().min((i1, i2) -> i1 - i2).get(); + return min1 - min2; + }).collect(Collectors.toList()); } } From fd241817a256311ba9bfbcce44b0a22f17c4d5d8 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Wed, 21 Sep 2016 09:30:07 +0200 Subject: [PATCH 008/267] Cleaned up diff viewer code --- .../diffviewer/logic/DiffComputer.java | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java index 2e1a039db..88c89ffaa 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java @@ -1,8 +1,5 @@ package org.gemoc.sequential_addons.diffviewer.logic; -import java.io.FileNotFoundException; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -481,7 +478,6 @@ private int[][] alignTraces(final List> states1, final List s1 = states1.get(i); final List s2 = states2.get(j); @@ -491,9 +487,7 @@ private int[][] alignTraces(final List> states1, final List> states1, final List" + c + ""; - } else { - s += "" + c + ""; - } - } - s += ""; - } - PrintWriter writer = null; - try { - writer = new PrintWriter("/home/dleroy/workspace/table.html", "UTF-8"); - writer.println("" + s + "
"); - } catch (FileNotFoundException | UnsupportedEncodingException e) { - e.printStackTrace(); - } finally { - if (writer != null) { - writer.close(); - } - } - - } - public List computeDiff(final List> states1, final List> states2, final Collection>> classes) { final int[][] comparisonMatrix = alignTraces(states1, states2, classes); @@ -562,7 +528,6 @@ public List computeDiff(final List> states1, final List Date: Wed, 21 Sep 2016 11:40:47 +0200 Subject: [PATCH 009/267] upgrade java engine version from 0.1.0.qualifier to 2.2.0.qualifier --- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- java_execution/pom.xml | 2 +- .../category.xml | 12 ++++++------ .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index 05136b6be..f38b508e5 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Sequential Language Workbench UI Bundle-SymbolicName: org.gemoc.execution.sequential.javaengine.ui;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.gemoc.execution.sequential.javaengine.ui.Activator Bundle-Vendor: INRIA Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/pom.xml b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/pom.xml index 7dfcc7e9f..4ee8d3857 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/pom.xml +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/pom.xml @@ -6,7 +6,7 @@ ../../.. org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 0.1.0-SNAPSHOT + 2.2.0-SNAPSHOT org.gemoc.execution.sequential.javaengine.ui diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF index 0048ff3b2..7375d1b17 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Sequential Language Api Bundle-SymbolicName: org.gemoc.execution.sequential.javaengine;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.2.0.qualifier Require-Bundle: org.gemoc.xdsmlframework.api, org.gemoc.execution.sequential.javaxdsml.api, org.gemoc.executionframework.engine, diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/pom.xml b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/pom.xml index 1bd9f9dd6..988683d30 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/pom.xml +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/pom.xml @@ -6,7 +6,7 @@ ../../.. org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 0.1.0-SNAPSHOT + 2.2.0-SNAPSHOT org.gemoc.execution.sequential.javaengine diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF index 6f1dfec43..db9a5d9e5 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Sequential Language Api Bundle-SymbolicName: org.gemoc.execution.sequential.javaxdsml.api;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.2.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.gemoc.xdsmlframework.api, org.gemoc.executionframework.engine.ui diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/pom.xml b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/pom.xml index a8e0bf936..4602f6185 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/pom.xml +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/pom.xml @@ -6,7 +6,7 @@ ../../.. org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 0.1.0-SNAPSHOT + 2.2.0-SNAPSHOT org.gemoc.execution.sequential.javaxdsml.api diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF index a5da4d03e..8efdc4c4a 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Sequential Java XDSML UI Bundle-SymbolicName: org.gemoc.execution.sequential.javaxdsml.ide.ui;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator Bundle-Vendor: INRIA Require-Bundle: org.eclipse.core.runtime, diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml index 3419cb179..510759d3f 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml @@ -6,7 +6,7 @@ ../../.. org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 0.1.0-SNAPSHOT + 2.2.0-SNAPSHOT org.gemoc.execution.sequential.javaxdsml.ide.ui diff --git a/java_execution/pom.xml b/java_execution/pom.xml index abc690e65..1008eac0e 100644 --- a/java_execution/pom.xml +++ b/java_execution/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 0.1.0-SNAPSHOT + 2.2.0-SNAPSHOT pom org.gemoc diff --git a/java_execution/releng/org.gemoc.execution.sequential.java.repository/category.xml b/java_execution/releng/org.gemoc.execution.sequential.java.repository/category.xml index aa601bd31..e4b1ddd49 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.java.repository/category.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.java.repository/category.xml @@ -1,21 +1,21 @@ - + - + - + - + - + - + diff --git a/java_execution/releng/org.gemoc.execution.sequential.java.repository/pom.xml b/java_execution/releng/org.gemoc.execution.sequential.java.repository/pom.xml index 55942d31b..f9f42c99e 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.java.repository/pom.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.java.repository/pom.xml @@ -5,7 +5,7 @@ ../../pom.xml org.gemoc.execution.sequential.java - 0.1.0-SNAPSHOT + 2.2.0-SNAPSHOT org.gemoc.execution.sequential.java.root diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/feature.xml b/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/feature.xml index fc778596f..f964f3ffe 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/feature.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/pom.xml b/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/pom.xml index 505c7216a..d56c50a09 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/pom.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/pom.xml @@ -6,7 +6,7 @@ ../../pom.xml org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 0.1.0-SNAPSHOT + 2.2.0-SNAPSHOT org.gemoc.execution.sequential.javaengine.feature diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/feature.xml b/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/feature.xml index 48d9fd8ba..e610d5382 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/feature.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/pom.xml b/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/pom.xml index 91afc58c2..d3241a41b 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/pom.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/pom.xml @@ -6,7 +6,7 @@ ../../pom.xml org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 0.1.0-SNAPSHOT + 2.2.0-SNAPSHOT org.gemoc.execution.sequential.javaengine.ui.feature diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/feature.xml b/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/feature.xml index e8f05de9a..5c5f18f46 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/feature.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/pom.xml b/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/pom.xml index b3771927a..4ae26f5ec 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/pom.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/pom.xml @@ -6,7 +6,7 @@ ../../pom.xml org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 0.1.0-SNAPSHOT + 2.2.0-SNAPSHOT org.gemoc.execution.sequential.javaxdsml.feature From d2019a3867fe44452ae6c6dfc6be88977dd0eab4 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Wed, 21 Sep 2016 14:15:53 +0200 Subject: [PATCH 010/267] Tweaks and fixes on state graph and diff viewer --- .../views/TimelineDiffViewerRenderer.java | 30 +++++++++++-------- .../views/TimelineDiffViewerViewPart.java | 2 +- .../stategraph/views/StateGraphRenderer.java | 7 +++++ 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java index b1b6c70c7..c72b8abeb 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java @@ -77,7 +77,7 @@ public class TimelineDiffViewerRenderer extends Pane { private final IntegerProperty nbDisplayableStates; private final IntegerProperty statesRange; private final IntegerProperty nbStates; - + private int currentState = 0; final Map>> lineToSegments = new HashMap<>(); @@ -104,6 +104,10 @@ public TimelineDiffViewerRenderer() { nbDisplayableStates.bind(widthProperty().divide(UNIT)); statesRange.bind(nbStates.subtract(nbDisplayableStates)); + nbDisplayableStates.addListener((v, o, n) -> { + refresh(); + }); + setupBox(eqBox, "Toggle identical traces", eqLines); setupBox(substBox, "Toggle similar traces", substLines); setupBox(inBox, "Toggle inserted traces", inLines); @@ -128,9 +132,9 @@ public TimelineDiffViewerRenderer() { scrollBar.disableProperty().bind(statesRange.lessThanOrEqualTo(0)); scrollBar.maxProperty().bind(statesRange); scrollBar.valueProperty().addListener((v, o, n) -> { - if (o.intValue() != n.intValue()) { - refresh(wrappers1, wrappers2, diffComputer); - currentState = Math.min(Math.max(0, n.intValue()), diffComputer.getDiffs().size()); + if (o.intValue() != n.intValue() && n.intValue() != currentState) { + currentState = n.intValue(); + refresh(); } }); @@ -314,7 +318,7 @@ public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor e diffComputer.loadTraces(valueTraces1, valueTraces2); nbStates.set(diffComputer.getDiffs().size()); - refresh(wrappers1, wrappers2, diffComputer); + refresh(); } private boolean isNewValue(int idx, List list) { @@ -333,7 +337,8 @@ private void fillGap(HBox line, List trace, int idx, String description } } - public void refresh(List stateWrappers1, List stateWrappers2, DiffComputer diffComputer) { + public void refresh() { + if (diffComputer != null) { line1.getChildren().clear(); line2.getChildren().clear(); eqLines.getChildren().clear(); @@ -447,8 +452,8 @@ public void refresh(List stateWrappers1, List stateW int j = diff.idx2; switch (diff.kind) { case EQ: - addState(stateWrappers1.get(i), line1, Color.SLATEBLUE); - addState(stateWrappers2.get(j), line2, Color.SLATEBLUE); + addState(wrappers1.get(i), line1, Color.SLATEBLUE); + addState(wrappers2.get(j), line2, Color.SLATEBLUE); for (Pair, List> e : eqGroup) { final List t1 = e.getKey(); final List t2 = e.getValue(); @@ -475,8 +480,8 @@ public void refresh(List stateWrappers1, List stateW } break; case SUBST: - addState(stateWrappers1.get(i), line1, Color.TOMATO); - addState(stateWrappers2.get(j), line2, Color.TOMATO); + addState(wrappers1.get(i), line1, Color.TOMATO); + addState(wrappers2.get(j), line2, Color.TOMATO); for (Pair, List> e : eqGroup) { final List t1 = e.getKey(); final List t2 = e.getValue(); @@ -503,7 +508,7 @@ public void refresh(List stateWrappers1, List stateW } break; case DEL: - addState(stateWrappers1.get(i), line1, Color.BROWN); + addState(wrappers1.get(i), line1, Color.BROWN); addBlankState(line2); for (Pair, List> e : eqGroup) { final List t1 = e.getKey(); @@ -532,7 +537,7 @@ public void refresh(List stateWrappers1, List stateW break; case IN: addBlankState(line1); - addState(stateWrappers2.get(j), line2, Color.BROWN); + addState(wrappers2.get(j), line2, Color.BROWN); for (Pair, List> e : eqGroup) { final List t1 = e.getKey(); final List t2 = e.getValue(); @@ -561,6 +566,7 @@ public void refresh(List stateWrappers1, List stateW } } processSegments(); + } } private void processSegments() { diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java index 0a3d612a5..f8090849a 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java @@ -57,7 +57,7 @@ public void createPartControl(Composite parent) { Scene scene = new Scene(diffViewer); fxCanvas.setScene(scene); parent.getShell().addListener(SWT.Resize, (e) -> { - //TODO refresh the renderer + diffViewer.refresh(); }); buildMenu(parent.getShell()); } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java index 8a011f517..31893d3d8 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java @@ -115,17 +115,24 @@ private void render(boolean clear, StateVertex currentVertex) { EdgeView edgeGroup = edgeToGroup.get(e); if (edgeGroup == null || edgeGroup instanceof StraightEdgeView) { changed = true; + if (edgeGroup instanceof StraightEdgeView) { + getChildren().remove(edgeGroup); + } final VertexView source = nodeToGroup.get(w); final VertexView target = nodeToGroup.get(v); edgeGroup = new CurvedEdgeView(source.translateXProperty(), source.translateYProperty(), target.translateXProperty(), target.translateYProperty()); edgeToGroup.put(e, edgeGroup); edgeShapesToAdd.add(edgeGroup); + } edgesToRemove.remove(e); EdgeView reverseEdgeGroup = edgeToGroup.get(reverseEdge); if (reverseEdgeGroup == null || reverseEdgeGroup instanceof StraightEdgeView) { changed = true; + if (reverseEdgeGroup instanceof StraightEdgeView) { + getChildren().remove(reverseEdgeGroup); + } final VertexView source = nodeToGroup.get(v); final VertexView target = nodeToGroup.get(w); reverseEdgeGroup = new CurvedEdgeView(source.translateXProperty(), source.translateYProperty(), From 517f2b0c2df50c1e274098a89501e344b94d185f Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Thu, 22 Sep 2016 13:53:37 +0200 Subject: [PATCH 011/267] Fixed curved edges on state graph --- .../stategraph/views/StateGraphRenderer.java | 7 +++++-- .../stategraph/views/StraightEdgeView.java | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java index 31893d3d8..558e24ae0 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java @@ -115,7 +115,7 @@ private void render(boolean clear, StateVertex currentVertex) { EdgeView edgeGroup = edgeToGroup.get(e); if (edgeGroup == null || edgeGroup instanceof StraightEdgeView) { changed = true; - if (edgeGroup instanceof StraightEdgeView) { + if (edgeGroup != null) { getChildren().remove(edgeGroup); } final VertexView source = nodeToGroup.get(w); @@ -130,7 +130,7 @@ private void render(boolean clear, StateVertex currentVertex) { EdgeView reverseEdgeGroup = edgeToGroup.get(reverseEdge); if (reverseEdgeGroup == null || reverseEdgeGroup instanceof StraightEdgeView) { changed = true; - if (reverseEdgeGroup instanceof StraightEdgeView) { + if (reverseEdgeGroup != null) { getChildren().remove(reverseEdgeGroup); } final VertexView source = nodeToGroup.get(v); @@ -145,6 +145,9 @@ private void render(boolean clear, StateVertex currentVertex) { EdgeView edgeGroup = edgeToGroup.get(e); if (edgeGroup == null || edgeGroup instanceof CurvedEdgeView) { changed = true; + if (edgeGroup != null) { + getChildren().remove(edgeGroup); + } final VertexView source = nodeToGroup.get(w); final VertexView target = nodeToGroup.get(v); edgeGroup = new StraightEdgeView(source.translateXProperty(), source.translateYProperty(), diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java index d347b33a5..b9e7b502c 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java @@ -24,7 +24,6 @@ public StraightEdgeView(DoubleProperty sX, DoubleProperty sY, DoubleProperty eX, @Override protected double computeValue() { - System.out.println("aX update"); return (sX.get() + eX.get()) * .5; } }; @@ -37,7 +36,6 @@ protected double computeValue() { @Override protected double computeValue() { - System.out.println("aY update"); return (sY.get() + eY.get()) * .5; } }; From df24efeb5cec48c39ab9e12db3c133e7b28d34dd Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Thu, 22 Sep 2016 17:13:30 +0200 Subject: [PATCH 012/267] Removed concurrent addons from sequential addon tab and updated trace generator to add the generated trace to the sequential addon group --- .../LaunchConfigurationDataProcessingTab.java | 103 ++++++++---------- .../GenericEngineTraceAddonGenerator.xtend | 4 + 2 files changed, 51 insertions(+), 56 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java index 5faace249..32262332e 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java @@ -30,25 +30,25 @@ import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; import org.gemoc.xdsmlframework.api.extensions.engine_addon_group.EngineAddonGroupSpecificationExtension; -public abstract class LaunchConfigurationDataProcessingTab extends LaunchConfigurationTab -{ +public abstract class LaunchConfigurationDataProcessingTab extends LaunchConfigurationTab { private HashMap _components = new HashMap<>(); - protected LaunchConfigurationDataProcessingTab() - { - for (EngineAddonSpecificationExtension extension : getExtensionSpecifications()) - { - _components.put(extension, null); + protected LaunchConfigurationDataProcessingTab() { + for (EngineAddonSpecificationExtension extension : getExtensionSpecifications()) { + final String id = extension.getAddonGroupId(); + if (id == null || id.equals("Sequential.AddonGroup") || id.equals("General.AddonGroup")) { + _components.put(extension, null); + } } } protected abstract Collection getExtensionSpecifications(); + protected abstract Collection getGroupExtensionSpecifications(); @Override - public void createControl(Composite parent) - { + public void createControl(Composite parent) { Composite content = new Composite(parent, SWT.NULL); GridLayout gl = new GridLayout(1, false); gl.marginHeight = 0; @@ -58,74 +58,69 @@ public void createControl(Composite parent) createLayout(content); } - - private void createLayout(Composite parent) - { + + private void createLayout(Composite parent) { HashMap groupmap = new HashMap(); - - - for(EngineAddonGroupSpecificationExtension extension : getGroupExtensionSpecifications()){ - groupmap.put(extension.getId(), createGroup(parent, extension.getName())); + + for (EngineAddonGroupSpecificationExtension extension : getGroupExtensionSpecifications()) { + groupmap.put(extension.getId(), createGroup(parent, extension.getName())); } - groupmap.put("", createGroup(parent, "")); - - for (EngineAddonSpecificationExtension extension : _components.keySet()) - { + groupmap.put("", createGroup(parent, "")); + + for (EngineAddonSpecificationExtension extension : _components.keySet()) { Group parentGroup = groupmap.get(""); - if(extension.getAddonGroupId() != null){ + final String addonGroupId = extension.getAddonGroupId(); + if (addonGroupId != null) { // refine the parentGroup if specified parentGroup = groupmap.get(extension.getAddonGroupId()); - if(parentGroup == null){ + if (parentGroup == null) { // back to the unsorted group parentGroup = groupmap.get(""); } - } - + } + Button checkbox = createCheckButton(parentGroup, extension.getName()); - if(extension.getShortDescription() != null){ + if (extension.getShortDescription() != null) { checkbox.setToolTipText(extension.getShortDescription()); } - //checkbox.setSelection(extension.getDefaultActivationValue()); + // checkbox.setSelection(extension.getDefaultActivationValue()); checkbox.addSelectionListener(new SelectionListener() { - + @Override public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } - + @Override - public void widgetDefaultSelected(SelectionEvent e) {} + public void widgetDefaultSelected(SelectionEvent e) { + } }); _components.put(extension, checkbox); } - + // remove empty groups - for(Group g :groupmap.values()){ - if(g.getChildren().length == 0){ + for (Group g : groupmap.values()) { + if (g.getChildren().length == 0) { g.dispose(); parent.layout(true); } } } - + @Override - public void setDefaults(ILaunchConfigurationWorkingCopy configuration) - { - for (EngineAddonSpecificationExtension entry : _components.keySet()) - { + public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { + for (EngineAddonSpecificationExtension entry : _components.keySet()) { configuration.setAttribute(entry.getName(), entry.getDefaultActivationValue()); } } @Override - public void initializeFrom(ILaunchConfiguration configuration) - { - for (EngineAddonSpecificationExtension extension : _components.keySet()) - { + public void initializeFrom(ILaunchConfiguration configuration) { + for (EngineAddonSpecificationExtension extension : _components.keySet()) { try { - boolean value = configuration.getAttribute(extension.getName(), true); -// _componentsActive.put(extension, value); + boolean value = configuration.getAttribute(extension.getName(), false); + // _componentsActive.put(extension, value); Button checkbox = _components.get(extension); checkbox.setSelection(value); } catch (CoreException e) { @@ -136,22 +131,19 @@ public void initializeFrom(ILaunchConfiguration configuration) } @Override - public void performApply(ILaunchConfigurationWorkingCopy configuration) - { - for (Entry entry : _components.entrySet()) - { + public void performApply(ILaunchConfigurationWorkingCopy configuration) { + for (Entry entry : _components.entrySet()) { configuration.setAttribute(entry.getKey().getName(), entry.getValue().getSelection()); } } @Override public boolean isValid(ILaunchConfiguration config) { - //Validate each addon - try{ + // Validate each addon + try { List addons = new ArrayList(); - for (Entry entry : _components.entrySet()) - { - if(entry.getValue().getSelection()){ + for (Entry entry : _components.entrySet()) { + if (entry.getValue().getSelection()) { addons.add(entry.getKey().instanciateComponent()); } } @@ -159,17 +151,16 @@ public boolean isValid(ILaunchConfiguration config) { for (IEngineAddon iEngineAddon : addons) { errors.addAll(iEngineAddon.validate(addons)); } - if(!errors.isEmpty()){ + if (!errors.isEmpty()) { for (String msg : errors) { setErrorMessage(msg); } return false; } - } - catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); } - + setErrorMessage(null); return true; } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index dbca50932..8c59fe04f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -146,6 +146,10 @@ class GenericEngineTraceAddonGenerator { updateDefinitionAttributeInExtensionPoint(extensionPoint, EngineAddonSpecificationExtensionPoint.GEMOC_ENGINE_ADDON_EXTENSION_POINT_OPENVIEWIDS, "org.gemoc.sequential_addons.multidimensional.timeline.views.timeline.MultidimensionalTimeLineView" ); + updateDefinitionAttributeInExtensionPoint(extensionPoint, + EngineAddonSpecificationExtensionPoint.GEMOC_ENGINE_ADDON_EXTENSION_POINT_ADDONGROUPID, "Sequential.AddonGroup" + ); + helper.saveDocument(pluginfile); } From 9cf0d235cadd1d4f1061f94f2a408fcd397cfd3e Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Thu, 22 Sep 2016 17:33:28 +0200 Subject: [PATCH 013/267] take into account ParrallelStep as currentIntruction --- .../AbstractGemocDebuggerServices.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java index 6ecf85464..a941f796a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java @@ -41,6 +41,7 @@ import org.gemoc.executionframework.extensions.sirius.modelloader.DefaultModelLoader; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import fr.inria.diverse.trace.commons.model.trace.ParallelStep; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.obeo.dsl.debug.StackFrame; import fr.obeo.dsl.debug.ide.DSLBreakpoint; @@ -422,13 +423,14 @@ public void currentInstructionChanged(String debugModelID, StackFrame frame) { EObject currentInstruction = frame.getCurrentInstruction(); final Set instructionURIs = new HashSet(); - if (currentInstruction instanceof Step) { - MSEOccurrence mseOccurrence = ((Step)currentInstruction).getMseoccurrence(); - instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse())); - if (mseOccurrence.getMse().getCaller() != null) { - instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse() - .getCaller())); + + if (currentInstruction instanceof ParallelStep) { + addMseOccurenceAndCallerToInstructionsURIs(instructionURIs,((ParallelStep)currentInstruction).getMseoccurrence()); + for(Step step: ((ParallelStep)currentInstruction).getSubSteps()){ + addMseOccurenceAndCallerToInstructionsURIs(instructionURIs,step.getMseoccurrence()); } + } else if (currentInstruction instanceof Step) { + addMseOccurenceAndCallerToInstructionsURIs(instructionURIs,((Step)currentInstruction).getMseoccurrence()); } else { instructionURIs.add(EcoreUtil.getURI(currentInstruction)); } @@ -441,6 +443,16 @@ public void currentInstructionChanged(String debugModelID, notifySirius(instructionURIs, debugModelID); } + private void addMseOccurenceAndCallerToInstructionsURIs(Set instructionURIs, MSEOccurrence mseOccurrence){ + if(mseOccurrence != null){ + instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse())); + if (mseOccurrence.getMse().getCaller() != null) { + instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse() + .getCaller())); + } + } + } + /** * {@inheritDoc} * From 3bab79a38d301bb2524af0d7225db7ba27971f09 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Fri, 23 Sep 2016 11:06:09 +0200 Subject: [PATCH 014/267] Added the diff viewer to the feature --- .../diffviewer/views/TimelineDiffViewerRenderer.java | 3 ++- .../feature.xml | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java index c72b8abeb..266051888 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java @@ -447,7 +447,8 @@ public void refresh() { c++; } - for (Diff diff : diffComputer.getDiffs().subList(currentState, currentState + nbDisplayableStates.intValue())) { + final List diffs = diffComputer.getDiffs(); + for (Diff diff : diffs.subList(currentState, Math.min(currentState + nbDisplayableStates.intValue(), diffs.size()))) { int i = diff.idx1; int j = diff.idx2; switch (diff.kind) { diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml index eaedebeb1..be918ecc2 100644 --- a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml +++ b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml @@ -21,13 +21,19 @@ download-size="0" install-size="0" version="0.0.0" - unpack="false"/> + unpack="false"/> + From 2cf045f1a5fd0f45f7d0c8096422f6eccc76e930 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Fri, 23 Sep 2016 13:37:58 +0200 Subject: [PATCH 015/267] Removed unused imports and improved diff viewer's UI --- .../ui/debug/AbstractGemocDebugger.java | 1 - .../debug/GenericSequentialModelDebugger.java | 1 - ...scientGenericSequentialModelDebugger.xtend | 1 - .../views/TimelineDiffViewerRenderer.java | 550 +++++++++--------- 4 files changed, 279 insertions(+), 274 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java index 5894f447d..a8f75543a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java @@ -48,7 +48,6 @@ import org.gemoc.executionframework.engine.ui.debug.semanticsopener.OpenSemanticsHandler; import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.core.IExecutionContext; import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.FieldChange; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.IModelChangeListenerAddon; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java index d623bf0d6..d089a508a 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java @@ -25,7 +25,6 @@ import org.gemoc.executionframework.engine.ui.debug.AbstractGemocDebugger; import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import fr.inria.diverse.trace.commons.model.trace.MSE; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend index 003819795..3c0714bbe 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend @@ -18,7 +18,6 @@ import org.eclipse.xtext.naming.QualifiedName import org.gemoc.execution.sequential.javaengine.ui.Activator import org.gemoc.executionframework.engine.core.EngineStoppedException import org.gemoc.xdsmlframework.api.core.IExecutionEngine -import org.gemoc.xdsmlframework.api.core.IExecutionEngine public class OmniscientGenericSequentialModelDebugger extends GenericSequentialModelDebugger implements ITraceListener { diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java index 266051888..d80741600 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java @@ -23,7 +23,6 @@ import javafx.scene.control.OverrunStyle; import javafx.scene.control.ScrollBar; import javafx.scene.control.ScrollPane; -import javafx.scene.control.ScrollPane.ScrollBarPolicy; import javafx.scene.control.Tooltip; import javafx.scene.layout.Background; import javafx.scene.layout.BackgroundFill; @@ -46,22 +45,23 @@ public class TimelineDiffViewerRenderer extends Pane { private static final int V_MARGIN = 2; private static final int WIDTH = 24; private static final int UNIT = WIDTH + H_MARGIN * 2; - + private static final Insets HALF_MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN / 2, V_MARGIN, H_MARGIN / 2); private static final Insets MARGIN_INSETS = new Insets(V_MARGIN, H_MARGIN, V_MARGIN, H_MARGIN); - + private static final Paint LINE_PAINT = new Color(Color.LIGHTGRAY.getRed(), Color.LIGHTGRAY.getGreen(), Color.LIGHTGRAY.getBlue(), 0.5); - + private static final Background LINE_BACKGROUND = new Background(new BackgroundFill(LINE_PAINT, null, null)); private static final Background HEADER_BACKGROUND = new Background(new BackgroundFill(Color.LIGHTGRAY, null, null)); private static final Background WHITE_BACKGROUND = new Background(new BackgroundFill(Color.WHITE, null, null)); - private static final Background TRANSPARENT_BACKGROUND = new Background(new BackgroundFill(Color.TRANSPARENT, null, null)); + private static final Background TRANSPARENT_BACKGROUND = new Background( + new BackgroundFill(Color.TRANSPARENT, null, null)); private static final Font STATE_FONT = Font.font("Arial", FontWeight.BOLD, 9); private static final Font VALUE_FONT = Font.font("Arial", FontWeight.BOLD, 11); private static final Font GROUP_FONT = Font.font("Arial", FontWeight.BOLD, 12); - + private final VBox rootVBox = new VBox(); private final HBox line1 = new HBox(); private final HBox line2 = new HBox(); @@ -79,23 +79,23 @@ public class TimelineDiffViewerRenderer extends Pane { private final IntegerProperty nbStates; private int currentState = 0; - + final Map>> lineToSegments = new HashMap<>(); final Map> segmentToDescription = new HashMap<>(); private ITraceExtractor extractor1 = null; private ITraceExtractor extractor2 = null; - + private final List> valueTraces1 = new ArrayList<>(); private final List> valueTraces2 = new ArrayList<>(); private final List wrappers1 = new ArrayList<>(); private final List wrappers2 = new ArrayList<>(); - + private DiffComputer diffComputer; - + private final Map valueToWrapper = new HashMap<>(); - + public TimelineDiffViewerRenderer() { nbStates = new SimpleIntegerProperty(); @@ -103,28 +103,37 @@ public TimelineDiffViewerRenderer() { nbDisplayableStates = new SimpleIntegerProperty(); nbDisplayableStates.bind(widthProperty().divide(UNIT)); statesRange.bind(nbStates.subtract(nbDisplayableStates)); - + nbDisplayableStates.addListener((v, o, n) -> { refresh(); }); - + setupBox(eqBox, "Toggle identical traces", eqLines); setupBox(substBox, "Toggle similar traces", substLines); setupBox(inBox, "Toggle inserted traces", inLines); setupBox(delBox, "Toggle deleted traces", delLines); - + ScrollPane scrollPane = new ScrollPane(rootVBox); scrollPane.minWidthProperty().bind(widthProperty()); scrollPane.maxWidthProperty().bind(widthProperty()); scrollPane.prefWidthProperty().bind(widthProperty()); - scrollPane.minHeightProperty().bind(heightProperty()); - scrollPane.maxHeightProperty().bind(heightProperty()); - scrollPane.prefHeightProperty().bind(heightProperty()); scrollPane.setFitToWidth(true); - scrollPane.setFitToHeight(true); scrollPane.setBorder(Border.EMPTY); + + VBox headerPane = new VBox(); + headerPane.minWidthProperty().bind(widthProperty()); + headerPane.maxWidthProperty().bind(widthProperty()); + headerPane.setBackground(HEADER_BACKGROUND); + + scrollPane.translateYProperty().bind(headerPane.heightProperty()); + scrollPane.maxHeightProperty().bind(heightProperty().subtract(headerPane.heightProperty())); + + getChildren().add(headerPane); getChildren().add(scrollPane); - + minHeightProperty().bind(headerPane.heightProperty().add(scrollPane.heightProperty())); + prefHeightProperty().bind(headerPane.heightProperty().add(scrollPane.heightProperty())); + maxHeightProperty().bind(headerPane.heightProperty().add(scrollPane.heightProperty())); + final ScrollBar scrollBar = new ScrollBar(); scrollBar.setVisibleAmount(1); scrollBar.setBlockIncrement(10); @@ -137,18 +146,16 @@ public TimelineDiffViewerRenderer() { refresh(); } }); - - rootVBox.getChildren().add(scrollBar); - rootVBox.getChildren().add(line1); - rootVBox.getChildren().add(line2); - line1.setBackground(HEADER_BACKGROUND); - line2.setBackground(HEADER_BACKGROUND); + + headerPane.getChildren().add(scrollBar); + headerPane.getChildren().add(line1); + headerPane.getChildren().add(line2); + setBackground(WHITE_BACKGROUND); scrollPane.setBackground(WHITE_BACKGROUND); rootVBox.setBackground(WHITE_BACKGROUND); - scrollPane.setVbarPolicy(ScrollBarPolicy.NEVER); } - + private void setupBox(VBox box, String labelString, VBox content) { final HBox boxLabel = new HBox(); final Polygon arrow = new Polygon(2.5, 10, 10, 5, 2.5, 0); @@ -170,7 +177,7 @@ private void setupBox(VBox box, String labelString, VBox content) { } }); } - + private String computeStateLabel(int stateNumber) { if (stateNumber > 999) { return (stateNumber / 1000) + "k" + ((stateNumber % 1000) / 10); @@ -178,7 +185,7 @@ private String computeStateLabel(int stateNumber) { return "" + stateNumber; } } - + private void addState(StateWrapper wrapper, HBox line, Color color) { final Rectangle rectangle = new Rectangle(WIDTH, WIDTH, color); rectangle.setArcHeight(WIDTH); @@ -198,13 +205,13 @@ private void addState(StateWrapper wrapper, HBox line, Color color) { layout.getChildren().addAll(rectangle, text); line.getChildren().add(layout); } - + private void addBlankState(HBox line) { final Rectangle rectangle = new Rectangle(WIDTH, WIDTH, Color.TRANSPARENT); HBox.setMargin(rectangle, MARGIN_INSETS); line.getChildren().add(rectangle); } - + private void addValue(EObject value, HBox line, String description, boolean newValue) { final List> segments = lineToSegments.get(line); List segment; @@ -226,7 +233,7 @@ private void addValue(EObject value, HBox line, String description, boolean newV segments.add(segment); } } - + } if (addDescription) { List descriptions = segmentToDescription.get(line); @@ -238,7 +245,7 @@ private void addValue(EObject value, HBox line, String description, boolean newV } segment.add(1); } - + private void addDelayedValue(HBox line, String description) { final List> segments = lineToSegments.get(line); final List segment; @@ -260,7 +267,7 @@ private void addDelayedValue(HBox line, String description) { } segment.add(-1); } - + private void addBlankValue(HBox line) { lineToSegments.get(line).add(null); } @@ -278,7 +285,7 @@ private List normalizeValueTrace(List trace) { }); return result; } - + public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor extractor2) { this.extractor1 = extractor1; this.extractor2 = extractor2; @@ -287,12 +294,13 @@ public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor e valueTraces2.clear(); wrappers1.clear(); wrappers2.clear(); - - wrappers1.addAll(extractor1.getStateWrappers(0, extractor1.getStatesTraceLength()-1)); + + wrappers1.addAll(extractor1.getStateWrappers(0, extractor1.getStatesTraceLength() - 1)); final List states1 = wrappers1.stream().map(w -> w.state).collect(Collectors.toList()); final List> valueWrappers1 = new ArrayList<>(); for (int i = 0; i < extractor1.getNumberOfTraces(); i++) { - final List valueWrappers = extractor1.getValueWrappers(i, 0, extractor1.getStatesTraceLength()-1); + final List valueWrappers = extractor1.getValueWrappers(i, 0, + extractor1.getStatesTraceLength() - 1); valueWrappers1.add(valueWrappers); final List valueTrace = normalizeValueTrace(valueWrappers); while (valueTrace.size() < states1.size()) { @@ -300,12 +308,13 @@ public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor e } valueTraces1.add(valueTrace); } - - wrappers2.addAll(extractor2.getStateWrappers(0, extractor2.getStatesTraceLength()-1)); + + wrappers2.addAll(extractor2.getStateWrappers(0, extractor2.getStatesTraceLength() - 1)); final List states2 = wrappers2.stream().map(w -> w.state).collect(Collectors.toList()); final List> valueWrappers2 = new ArrayList<>(); for (int i = 0; i < extractor2.getNumberOfTraces(); i++) { - final List valueWrappers = extractor2.getValueWrappers(i, 0, extractor2.getStatesTraceLength()-1); + final List valueWrappers = extractor2.getValueWrappers(i, 0, + extractor2.getStatesTraceLength() - 1); valueWrappers2.add(valueWrappers); final List valueTrace = normalizeValueTrace(valueWrappers); while (valueTrace.size() < states2.size()) { @@ -313,18 +322,18 @@ public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor e } valueTraces2.add(valueTrace); } - + diffComputer = new DiffComputer(); diffComputer.loadTraces(valueTraces1, valueTraces2); nbStates.set(diffComputer.getDiffs().size()); - + refresh(); } - + private boolean isNewValue(int idx, List list) { return idx == 0 || (idx < list.size() && idx > 0 && list.get(idx - 1) != list.get(idx)); } - + private void fillGap(HBox line, List trace, int idx, String description) { if (idx > 0 && idx < trace.size()) { if (trace.get(idx - 1) != null || (idx < trace.size() - 1 && trace.get(idx + 1) != null)) { @@ -336,240 +345,239 @@ private void fillGap(HBox line, List trace, int idx, String description addBlankValue(line); } } - + public void refresh() { if (diffComputer != null) { - line1.getChildren().clear(); - line2.getChildren().clear(); - eqLines.getChildren().clear(); - substLines.getChildren().clear(); - inLines.getChildren().clear(); - delLines.getChildren().clear(); - lineToSegments.clear(); - while (rootVBox.getChildren().size() > 3) { - rootVBox.getChildren().remove(3); - } + line1.getChildren().clear(); + line2.getChildren().clear(); + eqLines.getChildren().clear(); + substLines.getChildren().clear(); + inLines.getChildren().clear(); + delLines.getChildren().clear(); + lineToSegments.clear(); + rootVBox.getChildren().clear(); - final List, List>> eqGroup = diffComputer.getEqGroup(); - final List, List>> substGroup = diffComputer.getSubstGroup(); - final List> inGroup = diffComputer.getInGroup(); - final List> delGroup = diffComputer.getDelGroup(); + final List, List>> eqGroup = diffComputer.getEqGroup(); + final List, List>> substGroup = diffComputer.getSubstGroup(); + final List> inGroup = diffComputer.getInGroup(); + final List> delGroup = diffComputer.getDelGroup(); - if (!eqGroup.isEmpty()) { - rootVBox.getChildren().add(eqBox); - } - - if (!substGroup.isEmpty()) { - rootVBox.getChildren().add(substBox); - } - - if (!inGroup.isEmpty()) { - rootVBox.getChildren().add(inBox); - } - - if (!delGroup.isEmpty()) { - rootVBox.getChildren().add(delBox); - } - - final Map, HBox> traceToLine = new HashMap<>(); - - int c = 0; - - for (Pair, List> e : eqGroup) { - final VBox pairBox = new VBox(); - final HBox trace1Box = new HBox(); - final HBox trace2Box = new HBox(); - traceToLine.put(e.getKey(), trace1Box); - traceToLine.put(e.getValue(), trace2Box); - lineToSegments.put(trace1Box, new ArrayList<>()); - lineToSegments.put(trace2Box, new ArrayList<>()); - Label l1 = new Label(extractor1.getValueLabel(valueTraces1.indexOf(e.getKey()))); - Label l2 = new Label(extractor2.getValueLabel(valueTraces2.indexOf(e.getValue()))); - VBox.setMargin(l1, HALF_MARGIN_INSETS); - VBox.setMargin(l2, HALF_MARGIN_INSETS); - l1.setFont(VALUE_FONT); - l2.setFont(VALUE_FONT); - pairBox.getChildren().addAll(l1, trace1Box, l2, trace2Box); - eqLines.getChildren().add(pairBox); - pairBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); - trace1Box.setBackground(TRANSPARENT_BACKGROUND); - trace2Box.setBackground(TRANSPARENT_BACKGROUND); - c++; - } - - for (Pair, List> e : substGroup) { - final VBox pairBox = new VBox(); - final HBox trace1Box = new HBox(); - final HBox trace2Box = new HBox(); - traceToLine.put(e.getKey(), trace1Box); - traceToLine.put(e.getValue(), trace2Box); - lineToSegments.put(trace1Box, new ArrayList<>()); - lineToSegments.put(trace2Box, new ArrayList<>()); - Label l1 = new Label(extractor1.getValueLabel(valueTraces1.indexOf(e.getKey()))); - Label l2 = new Label(extractor2.getValueLabel(valueTraces2.indexOf(e.getValue()))); - VBox.setMargin(l1, HALF_MARGIN_INSETS); - VBox.setMargin(l2, HALF_MARGIN_INSETS); - l1.setFont(VALUE_FONT); - l2.setFont(VALUE_FONT); - pairBox.getChildren().addAll(l1, trace1Box, l2, trace2Box); - substLines.getChildren().add(pairBox); - pairBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); - trace1Box.setBackground(TRANSPARENT_BACKGROUND); - trace2Box.setBackground(TRANSPARENT_BACKGROUND); - c++; - } - - for (List in : inGroup) { - final VBox inVBox = new VBox(); - final HBox traceBox = new HBox(); - traceToLine.put(in, traceBox); - lineToSegments.put(traceBox, new ArrayList<>()); - Label l = new Label(extractor2.getValueLabel(valueTraces2.indexOf(in))); - VBox.setMargin(l, HALF_MARGIN_INSETS); - l.setFont(VALUE_FONT); - inVBox.getChildren().addAll(l, traceBox); - inLines.getChildren().add(inVBox); - traceBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); - c++; - } - - for (List del : delGroup) { - final VBox delVBox = new VBox(); - final HBox traceBox = new HBox(); - traceToLine.put(del, traceBox); - lineToSegments.put(traceBox, new ArrayList<>()); - Label l = new Label(extractor1.getValueLabel(valueTraces1.indexOf(del))); - VBox.setMargin(l, HALF_MARGIN_INSETS); - l.setFont(VALUE_FONT); - delVBox.getChildren().addAll(l, traceBox); - delLines.getChildren().add(delVBox); - traceBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); - c++; - } - - final List diffs = diffComputer.getDiffs(); - for (Diff diff : diffs.subList(currentState, Math.min(currentState + nbDisplayableStates.intValue(), diffs.size()))) { - int i = diff.idx1; - int j = diff.idx2; - switch (diff.kind) { - case EQ: - addState(wrappers1.get(i), line1, Color.SLATEBLUE); - addState(wrappers2.get(j), line2, Color.SLATEBLUE); - for (Pair, List> e : eqGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); - } - for (Pair, List> e : substGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); - } - for (List del : delGroup) { - String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); - addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); - } - for (List in : inGroup) { - String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); - addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); - } - break; - case SUBST: - addState(wrappers1.get(i), line1, Color.TOMATO); - addState(wrappers2.get(j), line2, Color.TOMATO); - for (Pair, List> e : eqGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); - } - for (Pair, List> e : substGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); - } - for (List del : delGroup) { - String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); - addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); - } - for (List in : inGroup) { - String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); - addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); - } - break; - case DEL: - addState(wrappers1.get(i), line1, Color.BROWN); - addBlankState(line2); - for (Pair, List> e : eqGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - fillGap(traceToLine.get(t2), t2, j, d2); - } - for (Pair, List> e : substGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - fillGap(traceToLine.get(t2), t2, j, d2); - } - for (List del : delGroup) { - String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); - addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); - } - for (List in : inGroup) { - String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); - fillGap(traceToLine.get(in), in, j, d); - } - break; - case IN: - addBlankState(line1); - addState(wrappers2.get(j), line2, Color.BROWN); - for (Pair, List> e : eqGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - fillGap(traceToLine.get(t1), t1, i, d1); - addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); - } - for (Pair, List> e : substGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - fillGap(traceToLine.get(t1), t1, i, d1); - addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); - } - for (List del : delGroup) { - String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); - fillGap(traceToLine.get(del), del, i, d); - } - for (List in : inGroup) { - String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); - addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); + if (!eqGroup.isEmpty()) { + rootVBox.getChildren().add(eqBox); + } + + if (!substGroup.isEmpty()) { + rootVBox.getChildren().add(substBox); + } + + if (!inGroup.isEmpty()) { + rootVBox.getChildren().add(inBox); + } + + if (!delGroup.isEmpty()) { + rootVBox.getChildren().add(delBox); + } + + final Map, HBox> traceToLine = new HashMap<>(); + + int c = 0; + + for (Pair, List> e : eqGroup) { + final VBox pairBox = new VBox(); + final HBox trace1Box = new HBox(); + final HBox trace2Box = new HBox(); + traceToLine.put(e.getKey(), trace1Box); + traceToLine.put(e.getValue(), trace2Box); + lineToSegments.put(trace1Box, new ArrayList<>()); + lineToSegments.put(trace2Box, new ArrayList<>()); + Label l1 = new Label(extractor1.getValueLabel(valueTraces1.indexOf(e.getKey()))); + Label l2 = new Label(extractor2.getValueLabel(valueTraces2.indexOf(e.getValue()))); + VBox.setMargin(l1, HALF_MARGIN_INSETS); + VBox.setMargin(l2, HALF_MARGIN_INSETS); + l1.setFont(VALUE_FONT); + l2.setFont(VALUE_FONT); + pairBox.getChildren().addAll(l1, trace1Box, l2, trace2Box); + eqLines.getChildren().add(pairBox); + pairBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); + trace1Box.setBackground(TRANSPARENT_BACKGROUND); + trace2Box.setBackground(TRANSPARENT_BACKGROUND); + c++; + } + + for (Pair, List> e : substGroup) { + final VBox pairBox = new VBox(); + final HBox trace1Box = new HBox(); + final HBox trace2Box = new HBox(); + traceToLine.put(e.getKey(), trace1Box); + traceToLine.put(e.getValue(), trace2Box); + lineToSegments.put(trace1Box, new ArrayList<>()); + lineToSegments.put(trace2Box, new ArrayList<>()); + Label l1 = new Label(extractor1.getValueLabel(valueTraces1.indexOf(e.getKey()))); + Label l2 = new Label(extractor2.getValueLabel(valueTraces2.indexOf(e.getValue()))); + VBox.setMargin(l1, HALF_MARGIN_INSETS); + VBox.setMargin(l2, HALF_MARGIN_INSETS); + l1.setFont(VALUE_FONT); + l2.setFont(VALUE_FONT); + pairBox.getChildren().addAll(l1, trace1Box, l2, trace2Box); + substLines.getChildren().add(pairBox); + pairBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); + trace1Box.setBackground(TRANSPARENT_BACKGROUND); + trace2Box.setBackground(TRANSPARENT_BACKGROUND); + c++; + } + + for (List in : inGroup) { + final VBox inVBox = new VBox(); + final HBox traceBox = new HBox(); + traceToLine.put(in, traceBox); + lineToSegments.put(traceBox, new ArrayList<>()); + Label l = new Label(extractor2.getValueLabel(valueTraces2.indexOf(in))); + VBox.setMargin(l, HALF_MARGIN_INSETS); + l.setFont(VALUE_FONT); + inVBox.getChildren().addAll(l, traceBox); + inLines.getChildren().add(inVBox); + traceBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); + c++; + } + + for (List del : delGroup) { + final VBox delVBox = new VBox(); + final HBox traceBox = new HBox(); + traceToLine.put(del, traceBox); + lineToSegments.put(traceBox, new ArrayList<>()); + Label l = new Label(extractor1.getValueLabel(valueTraces1.indexOf(del))); + VBox.setMargin(l, HALF_MARGIN_INSETS); + l.setFont(VALUE_FONT); + delVBox.getChildren().addAll(l, traceBox); + delLines.getChildren().add(delVBox); + traceBox.setBackground(c % 2 == 0 ? LINE_BACKGROUND : WHITE_BACKGROUND); + c++; + } + + final List diffs = diffComputer.getDiffs(); + for (Diff diff : diffs.subList(currentState, + Math.min(currentState + nbDisplayableStates.intValue(), diffs.size()))) { + int i = diff.idx1; + int j = diff.idx2; + switch (diff.kind) { + case EQ: + addState(wrappers1.get(i), line1, Color.SLATEBLUE); + addState(wrappers2.get(j), line2, Color.SLATEBLUE); + for (Pair, List> e : eqGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (Pair, List> e : substGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (List del : delGroup) { + String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); + } + for (List in : inGroup) { + String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); + } + break; + case SUBST: + addState(wrappers1.get(i), line1, Color.TOMATO); + addState(wrappers2.get(j), line2, Color.TOMATO); + for (Pair, List> e : eqGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (Pair, List> e : substGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (List del : delGroup) { + String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); + } + for (List in : inGroup) { + String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); + } + break; + case DEL: + addState(wrappers1.get(i), line1, Color.BROWN); + addBlankState(line2); + for (Pair, List> e : eqGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + fillGap(traceToLine.get(t2), t2, j, d2); + } + for (Pair, List> e : substGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + fillGap(traceToLine.get(t2), t2, j, d2); + } + for (List del : delGroup) { + String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); + } + for (List in : inGroup) { + String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + fillGap(traceToLine.get(in), in, j, d); + } + break; + case IN: + addBlankState(line1); + addState(wrappers2.get(j), line2, Color.BROWN); + for (Pair, List> e : eqGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + fillGap(traceToLine.get(t1), t1, i, d1); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (Pair, List> e : substGroup) { + final List t1 = e.getKey(); + final List t2 = e.getValue(); + String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); + String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + fillGap(traceToLine.get(t1), t1, i, d1); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } + for (List del : delGroup) { + String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + fillGap(traceToLine.get(del), del, i, d); + } + for (List in : inGroup) { + String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); + } + break; } - break; } - } - processSegments(); + processSegments(); } } - + private void processSegments() { for (Map.Entry>> e : lineToSegments.entrySet()) { final HBox line = e.getKey(); From f62fdfdcd56aa3b7a053e1497442764c584a92c0 Mon Sep 17 00:00:00 2001 From: Yvan Lussaud Date: Mon, 26 Sep 2016 11:39:51 +0200 Subject: [PATCH 016/267] Moved all upsate sites in one update site releng/org.gemoc.siriusanimation.repository. --- .travis.yml | 4 +- framework/execution_framework/pom.xml | 3 +- .../.gitignore | 1 - .../category.xml | 11 --- .../pom.xml | 15 ---- framework/framework_commons/pom.xml | 3 +- .../.gitignore | 1 - .../category.xml | 10 --- .../pom.xml | 15 ---- framework/xdsml_framework/pom.xml | 3 +- .../.gitignore | 1 - .../category.xml | 11 --- .../pom.xml | 15 ---- java_execution/pom.xml | 5 +- .../.gitignore | 1 - .../category.xml | 22 ----- .../pom.xml | 15 ---- pom.xml | 14 ++++ prepare-deploy-local-dir.sh | 4 +- .../.project | 2 +- .../about.html | 0 .../category.xml | 82 +++++++++++++++++++ .../pom.xml | 10 +-- simulationmodelanimation/pom.xml | 3 - .../fr.obeo.dsl.debug.repository/.project | 17 ---- .../fr.obeo.dsl.debug.repository/category.xml | 13 --- trace/commons/pom.xml | 1 - .../.project | 17 ---- .../category.xml | 25 ------ .../pom.xml | 26 ------ trace/generator/pom.xml | 3 +- .../about.html | 27 ------ .../category.xml | 25 ------ .../pom.xml | 26 ------ trace/manager/pom.xml | 3 +- .../.project | 17 ---- .../category.xml | 24 ------ .../pom.xml | 26 ------ 38 files changed, 112 insertions(+), 389 deletions(-) delete mode 100644 framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/.gitignore delete mode 100644 framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/category.xml delete mode 100644 framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/pom.xml delete mode 100644 framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/.gitignore delete mode 100644 framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/category.xml delete mode 100644 framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/pom.xml delete mode 100644 framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/.gitignore delete mode 100644 framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/category.xml delete mode 100644 framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/pom.xml delete mode 100644 java_execution/releng/org.gemoc.execution.sequential.java.repository/.gitignore delete mode 100644 java_execution/releng/org.gemoc.execution.sequential.java.repository/category.xml delete mode 100644 java_execution/releng/org.gemoc.execution.sequential.java.repository/pom.xml rename {trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite => releng/org.gemoc.siriusanimation.repository}/.project (87%) rename {simulationmodelanimation/releng/fr.obeo.dsl.debug.repository => releng/org.gemoc.siriusanimation.repository}/about.html (100%) create mode 100644 releng/org.gemoc.siriusanimation.repository/category.xml rename {simulationmodelanimation/releng/fr.obeo.dsl.debug.repository => releng/org.gemoc.siriusanimation.repository}/pom.xml (88%) delete mode 100644 simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/.project delete mode 100644 simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/category.xml delete mode 100644 trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/.project delete mode 100644 trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/category.xml delete mode 100644 trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/pom.xml delete mode 100644 trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/about.html delete mode 100644 trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/category.xml delete mode 100644 trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/pom.xml delete mode 100644 trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/.project delete mode 100644 trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/category.xml delete mode 100644 trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/pom.xml diff --git a/.travis.yml b/.travis.yml index 476c86dd7..4c3465ae7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ script: # Build update-site - mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution clean verify # Rename the zipped update site to nightly -- mv simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/target/fr.obeo.dsl.debug.repository-*-SNAPSHOT.zip - simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/target/fr.obeo.dsl.debug.repository-nightly.zip +- mv releng/org.gemoc.siriusanimation.repository/target/org.gemoc.siriusanimation.repository-*-SNAPSHOT.zip + releng/org.gemoc.siriusanimation.repository/target/org.gemoc.siriusanimation.repository-nightly.zip # Prepare local dirs to deploy: copy repository - chmod a+x prepare-deploy-local-dir.sh - ./prepare-deploy-local-dir.sh $TRAVIS_BUILD_DIR/simulationmodelanimation/nightly diff --git a/framework/execution_framework/pom.xml b/framework/execution_framework/pom.xml index bb265b04b..61fc9f6e2 100644 --- a/framework/execution_framework/pom.xml +++ b/framework/execution_framework/pom.xml @@ -18,9 +18,8 @@ plugins/org.gemoc.executionframework.ui plugins/org.gemoc.executionframework.extensions.sirius - + releng/org.gemoc.modeldebugging.executionframework.feature - releng/org.gemoc.modeldebugging.executionframework.repository diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/.gitignore b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/category.xml b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/category.xml deleted file mode 100644 index e455e0446..000000000 --- a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/category.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/pom.xml b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/pom.xml deleted file mode 100644 index d16634b9e..000000000 --- a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - ../../pom.xml - org.gemoc.modeldebugging.executionframework - 0.1.0-SNAPSHOT - org.gemoc.modeldebugging.executionframework.root - - - org.gemoc.modeldebugging.executionframework.repository - eclipse-repository - - \ No newline at end of file diff --git a/framework/framework_commons/pom.xml b/framework/framework_commons/pom.xml index ca281b0e4..7d1a510ec 100644 --- a/framework/framework_commons/pom.xml +++ b/framework/framework_commons/pom.xml @@ -18,9 +18,8 @@ plugins/org.gemoc.xdsmlframework.commons - + releng/org.gemoc.modeldebugging.framework.commons.feature - releng/org.gemoc.modeldebugging.framework.commons.repository diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/.gitignore b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/category.xml b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/category.xml deleted file mode 100644 index 366f7be8f..000000000 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/category.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/pom.xml b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/pom.xml deleted file mode 100644 index 78638e32a..000000000 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - ../../pom.xml - org.gemoc.modeldebugging.framework.commons - 0.1.0-SNAPSHOT - org.gemoc.modeldebugging.framework.commons.root - - - org.gemoc.modeldebugging.framework.commons.repository - eclipse-repository - - \ No newline at end of file diff --git a/framework/xdsml_framework/pom.xml b/framework/xdsml_framework/pom.xml index ec78bff25..a26af18d7 100644 --- a/framework/xdsml_framework/pom.xml +++ b/framework/xdsml_framework/pom.xml @@ -17,9 +17,8 @@ plugins/org.gemoc.xdsmlframework.ide.ui plugins/org.gemoc.xdsmlframework.extensions.sirius - + releng/org.gemoc.modeldebugging.xdsmlframework.feature - releng/org.gemoc.modeldebugging.xdsmlframework.repository diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/.gitignore b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/category.xml b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/category.xml deleted file mode 100644 index 802356ea7..000000000 --- a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/category.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/pom.xml b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/pom.xml deleted file mode 100644 index d160ecf4f..000000000 --- a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - ../../pom.xml - org.gemoc.modeldebugging.xdsmlframework - 0.1.0-SNAPSHOT - org.gemoc.modeldebugging.xdsmlframework.root - - - org.gemoc.modeldebugging.xdsmlframework.repository - eclipse-repository - - \ No newline at end of file diff --git a/java_execution/pom.xml b/java_execution/pom.xml index 1008eac0e..9bee8ec21 100644 --- a/java_execution/pom.xml +++ b/java_execution/pom.xml @@ -20,13 +20,10 @@ java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui - + releng/org.gemoc.execution.sequential.javaxdsml.feature releng/org.gemoc.execution.sequential.javaengine.feature releng/org.gemoc.execution.sequential.javaengine.ui.feature - releng/org.gemoc.execution.sequential.java.repository - - diff --git a/java_execution/releng/org.gemoc.execution.sequential.java.repository/.gitignore b/java_execution/releng/org.gemoc.execution.sequential.java.repository/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/java_execution/releng/org.gemoc.execution.sequential.java.repository/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/java_execution/releng/org.gemoc.execution.sequential.java.repository/category.xml b/java_execution/releng/org.gemoc.execution.sequential.java.repository/category.xml deleted file mode 100644 index e4b1ddd49..000000000 --- a/java_execution/releng/org.gemoc.execution.sequential.java.repository/category.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/java_execution/releng/org.gemoc.execution.sequential.java.repository/pom.xml b/java_execution/releng/org.gemoc.execution.sequential.java.repository/pom.xml deleted file mode 100644 index f9f42c99e..000000000 --- a/java_execution/releng/org.gemoc.execution.sequential.java.repository/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - ../../pom.xml - org.gemoc.execution.sequential.java - 2.2.0-SNAPSHOT - org.gemoc.execution.sequential.java.root - - - org.gemoc.execution.sequential.java.repository - eclipse-repository - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index eacf953ac..f8cf4af24 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,11 @@ + + gemoc-studio_commons on CI + p2 + https://ci.inria.fr/gemoc/job/gemoc-studio_commons/lastSuccessfulBuild/artifact/commons/releng/org.gemoc.commons.repository/target/repository/ + @@ -319,6 +324,15 @@ java_execution/pom.xml + + repository + + true + + + releng/org.gemoc.siriusanimation.repository/pom.xml + + diff --git a/prepare-deploy-local-dir.sh b/prepare-deploy-local-dir.sh index 0e7870742..a64b59d6e 100644 --- a/prepare-deploy-local-dir.sh +++ b/prepare-deploy-local-dir.sh @@ -1,11 +1,11 @@ #! /usr/bin/env sh -UPDATE_SITE_DIR=simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/target/ +UPDATE_SITE_DIR=releng/org.gemoc.siriusanimation.repository/target/ DEPLOY_LOCAL_DIR=$1 echo "Prepare deploy local dir = ${DEPLOY_LOCAL_DIR}" # Create nightly folder mkdir $DEPLOY_LOCAL_DIR # Rename the zipped update site to nightly -- mv $UPDATE_SITE_DIR/fr.obeo.dsl.debug.repository-*-SNAPSHOT.zip $UPDATE_SITE_DIR/fr.obeo.dsl.debug.repository-nightly.zip +- mv $UPDATE_SITE_DIR/org.gemoc.siriusanimation.repository-*-SNAPSHOT.zip $UPDATE_SITE_DIR/org.gemoc.siriusanimation.repository-nightly.zip # Copy update-site to deploy local dir cp -r $UPDATE_SITE_DIR/repository $DEPLOY_LOCAL_DIR cp -r $UPDATE_SITE_DIR/*.zip $DEPLOY_LOCAL_DIR diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/.project b/releng/org.gemoc.siriusanimation.repository/.project similarity index 87% rename from trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/.project rename to releng/org.gemoc.siriusanimation.repository/.project index 2024edff9..79022e8a5 100644 --- a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/.project +++ b/releng/org.gemoc.siriusanimation.repository/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.updatesite + org.gemoc.siriusanimation.repository diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/about.html b/releng/org.gemoc.siriusanimation.repository/about.html similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/about.html rename to releng/org.gemoc.siriusanimation.repository/about.html diff --git a/releng/org.gemoc.siriusanimation.repository/category.xml b/releng/org.gemoc.siriusanimation.repository/category.xml new file mode 100644 index 000000000..a77da95eb --- /dev/null +++ b/releng/org.gemoc.siriusanimation.repository/category.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + Category with all features. + + + + + Category with all sources. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/pom.xml b/releng/org.gemoc.siriusanimation.repository/pom.xml similarity index 88% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/pom.xml rename to releng/org.gemoc.siriusanimation.repository/pom.xml index 8c3a14254..71e2a99a9 100644 --- a/simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/pom.xml +++ b/releng/org.gemoc.siriusanimation.repository/pom.xml @@ -23,13 +23,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - fr.obeo.dsl.debug.parent - DSLDebugger - 1.0.0-SNAPSHOT + org.gemoc.siriusanimation.root + org.gemoc + 0.1.0-SNAPSHOT ../../pom.xml - DSLDebugger - fr.obeo.dsl.debug.repository + org.gemoc + org.gemoc.siriusanimation.repository 1.0.0-SNAPSHOT eclipse-repository diff --git a/simulationmodelanimation/pom.xml b/simulationmodelanimation/pom.xml index c2fb8efc8..07d0a4941 100644 --- a/simulationmodelanimation/pom.xml +++ b/simulationmodelanimation/pom.xml @@ -51,9 +51,6 @@ Contributors: releng/fr.obeo.dsl.debug.feature releng/fr.obeo.dsl.debug.ui.feature releng/fr.obeo.dsl.debug.sirius.ui.feature - - - releng/fr.obeo.dsl.debug.repository diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/.project b/simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/.project deleted file mode 100644 index 9a69f2dc0..000000000 --- a/simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - fr.obeo.dsl.debug.repository - - - - - - org.eclipse.pde.UpdateSiteBuilder - - - - - - org.eclipse.pde.UpdateSiteNature - - diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/category.xml b/simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/category.xml deleted file mode 100644 index 2f11190a6..000000000 --- a/simulationmodelanimation/releng/fr.obeo.dsl.debug.repository/category.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/trace/commons/pom.xml b/trace/commons/pom.xml index 6efcf729a..4d2afae7c 100644 --- a/trace/commons/pom.xml +++ b/trace/commons/pom.xml @@ -22,7 +22,6 @@ plugins/fr.inria.diverse.trace.commons.model releng/fr.inria.diverse.trace.commons.feature - releng/fr.inria.diverse.trace.commons.updatesite diff --git a/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/.project b/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/.project deleted file mode 100644 index 2024edff9..000000000 --- a/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - fr.inria.diverse.trace.updatesite - - - - - - org.eclipse.pde.UpdateSiteBuilder - - - - - - org.eclipse.pde.UpdateSiteNature - - diff --git a/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/category.xml b/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/category.xml deleted file mode 100644 index 83e9e3c03..000000000 --- a/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/category.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - Category with all features. - - - - - Category with all sources. - - - diff --git a/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/pom.xml b/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/pom.xml deleted file mode 100644 index 9d37b774d..000000000 --- a/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -4.0.0 - - - org.gemoc.modeldebugging.trace.commons - org.gemoc.modeldebugging.trace.commons.root - 0.1.0-SNAPSHOT - ../.. - - - org.gemoc.modeldebugging.trace.commons.updatesite - eclipse-repository - - - - - diff --git a/trace/generator/pom.xml b/trace/generator/pom.xml index 8e0a50237..f6a85c222 100644 --- a/trace/generator/pom.xml +++ b/trace/generator/pom.xml @@ -27,9 +27,8 @@ plugins/fr.inria.diverse.trace.plugin.generator plugins/fr.inria.diverse.trace.annotations - + releng/org.gemoc.modeldebugging.trace.generator.feature - releng/org.gemoc.modeldebugging.trace.generator.updatesite diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/about.html b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/about.html deleted file mode 100644 index 420ad0f93..000000000 --- a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/about.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - -About - - -

About This Content

- -

June 5, 2006

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

- - - \ No newline at end of file diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/category.xml b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/category.xml deleted file mode 100644 index c91294a3b..000000000 --- a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/category.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - Category with all features. - - - - - Category with all sources. - - - diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/pom.xml b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/pom.xml deleted file mode 100644 index 431547fee..000000000 --- a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -4.0.0 - - - org.gemoc.modeldebugging.trace.generator - org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT - ../.. - - - org.gemoc.modeldebugging.trace.generator.updatesite - eclipse-repository - - - - - diff --git a/trace/manager/pom.xml b/trace/manager/pom.xml index debd5069e..3bf06c2ca 100644 --- a/trace/manager/pom.xml +++ b/trace/manager/pom.xml @@ -21,9 +21,8 @@ plugins/org.gemoc.sequential_addons.stategraph plugins/org.gemoc.sequential_addons.diffviewer - + releng/org.gemoc.modeldebugging.trace.manager.feature - releng/org.gemoc.modeldebugging.trace.manager.updatesite diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/.project b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/.project deleted file mode 100644 index 2024edff9..000000000 --- a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - fr.inria.diverse.trace.updatesite - - - - - - org.eclipse.pde.UpdateSiteBuilder - - - - - - org.eclipse.pde.UpdateSiteNature - - diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/category.xml b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/category.xml deleted file mode 100644 index 1fddf824e..000000000 --- a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/category.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - Category with all features. - - - - - Category with all sources. - - - diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/pom.xml b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/pom.xml deleted file mode 100644 index d3b1dd112..000000000 --- a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.updatesite/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -4.0.0 - - - org.gemoc.modeldebugging.trace.manager - org.gemoc.modeldebugging.trace.manager.root - 0.1.0-SNAPSHOT - ../.. - - - org.gemoc.modeldebugging.trace.manager.updatesite - eclipse-repository - - - - - From 4a68d1697b41ced0b51bdebc341983e5d4140e1f Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Tue, 27 Sep 2016 10:44:24 +0200 Subject: [PATCH 017/267] Improved diff viewer UI, added a functionality allowing to only compare sections of the traces and improved the value descriptions provided by the trace extractor --- .../TraceExtractorGeneratorJava.xtend | 89 +++++++++---- .../diffviewer/logic/DiffComputer.java | 57 +++++---- .../views/TimelineDiffViewerRenderer.java | 78 +++++++----- .../views/TimelineDiffViewerViewPart.java | 47 +++++-- .../diffviewer/views/TraceSectionsDialog.java | 120 ++++++++++++++++++ .../diffviewer/views/ValueView.java | 98 +++++++++++--- 6 files changed, 383 insertions(+), 106 deletions(-) create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend index 880950267..8f29a0150 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend @@ -127,6 +127,7 @@ class TraceExtractorGeneratorJava { import org.eclipse.emf.compare.scope.IComparisonScope; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; + import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; @@ -762,6 +763,49 @@ class TraceExtractorGeneratorJava { return -1; } + private String getValueName(EObject value) { + final EObject container = value.eContainer(); + final List attributes = container.eClass().getEAllReferences().stream() + .filter(r -> r.getName().endsWith("Sequence")) + .map(r -> r.getName().substring(0, r.getName().length() - 8)).collect(Collectors.toList()); + if (attributes.isEmpty()) { + return ""; + } else { + return attributes.stream() + .filter(s -> value.getClass().getName().contains("_" + s + "_")) + .findFirst().orElse(""); + } + } + + private Object getOriginalObject(EObject eObject) { + return eObject.eClass().getEAllReferences().stream() + .filter(r -> r.getName().startsWith("originalObject")) + .findFirst().map(r -> eObject.eGet(r)).orElse(null); + } + + private String getObjectDescription(Object object) { + if (object == null) { + return "null"; + } + if (object instanceof EObject) { + final Object originalObject = getOriginalObject((EObject) object); + if (originalObject != null) { + return originalObject.toString(); + } + } + if (object instanceof Collection) { + @SuppressWarnings("unchecked") + final Collection o_cast = (Collection) object; + if (!o_cast.isEmpty()) { + List strings = o_cast.stream() + .map(o -> getObjectDescription(o)) + .collect(Collectors.toList()); + return strings.toString(); + } + } + return object.toString(); + } + @Override public String getValueLabel(int traceIndex) { String attributeName = ""; @@ -772,27 +816,15 @@ class TraceExtractorGeneratorJava { } final «valueFQN» value = valueTrace.get(0); final EObject container = value.eContainer(); - final List attributes = container.eClass().getEAllReferences().stream() - .filter(r -> r.getName().endsWith("Sequence")) - .map(r->r.getName().substring(0, r.getName().length() - 8)) - .collect(Collectors.toList()); - if (!attributes.isEmpty()) { - attributes.removeIf(s->!value.getClass().getName().contains("_" + s + "_")); - attributeName = attributes.get(0); - } - final Optional originalObject = container.eClass().getEAllReferences() - .stream().filter(r -> r.getName().equals("originalObject")) - .findFirst(); - if (originalObject.isPresent()) { - final Object o = container.eGet(originalObject.get()); - if (o instanceof EObject) { - final EObject eObject = (EObject) o; - final QualifiedName qname = nameProvider.getFullyQualifiedName(eObject); - if (qname == null) { - return attributeName + " (" + eObject.toString() + ")"; - } else { - return attributeName + " (" + qname.toString() + " :" + eObject.eClass().getName() + ")"; - } + attributeName = getValueName(value); + final Object originalObject = getOriginalObject(container); + if (originalObject instanceof EObject) { + final EObject eObject = (EObject) originalObject; + final QualifiedName qname = nameProvider.getFullyQualifiedName(eObject); + if (qname == null) { + return attributeName + " (" + eObject.toString() + ")"; + } else { + return attributeName + " (" + qname.toString() + " :" + eObject.eClass().getName() + ")"; } } } @@ -812,12 +844,23 @@ class TraceExtractorGeneratorJava { @Override public String getValueDescription(int traceIndex, int stateIndex) { + String description = getValueLabel(traceIndex) + " : "; final EObject value = getValueAt(traceIndex, stateIndex); if (value == null) { return null; } - final String description = getValueLabel(traceIndex) + " : " + value; - return description; + final String attributeName = getValueName(value); + if (attributeName.length() > 0) { + final String featureName = attributeName; + final Optional attribute = value.eClass() + .getEAllStructuralFeatures().stream() + .filter(r -> r.getName().equals(featureName)).findFirst(); + if (attribute.isPresent()) { + final Object o = value.eGet(attribute.get()); + return description + getObjectDescription(o); + } + } + return description + value; } @Override diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java index 88c89ffaa..778789121 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java @@ -130,7 +130,7 @@ public void postComparison(Comparison comparison, Monitor monitor) { }; @SuppressWarnings({ "rawtypes", "unchecked" }) - private boolean compareEObjects(EObject e1, EObject e2) { + public boolean compareEObjects(EObject e1, EObject e2) { if (e1 == e2) { return true; } @@ -271,6 +271,7 @@ public List> getDelGroup() { public void loadTraces(final List> traces1, final List> traces2) { final Map>> traceGroups1 = new HashMap<>(); final Map>> traceGroups2 = new HashMap<>(); + diffs.clear(); for (List trace : traces1) { EClass eClass = getTraceEClass(trace); @@ -314,7 +315,7 @@ public void loadTraces(final List> traces1, final List> traceGroup2 = traceGroups2.get(eClass); int i = 0; int j = 0; - while (i < traceGroup1.size()) { + while (i < traceGroup1.size() && j < traceGroup2.size()) { List trace1 = traceGroup1.get(i); List trace2 = traceGroup2.get(j); if (compareTraces(trace1, trace2)) { @@ -368,35 +369,43 @@ public void loadTraces(final List> traces1, final List> stateTrace1 = new ArrayList<>(); List> stateTrace2 = new ArrayList<>(); - List> valuesTrace1 = new ArrayList<>(); - List> valuesTrace2 = new ArrayList<>(); + if (!substGroup.isEmpty()) { + List> valuesTrace1 = new ArrayList<>(); + List> valuesTrace2 = new ArrayList<>(); - substGroup.forEach(p -> { - valuesTrace1.add(p.getKey()); - valuesTrace2.add(p.getValue()); - }); + substGroup.forEach(p -> { + valuesTrace1.add(p.getKey()); + valuesTrace2.add(p.getValue()); + }); - for (int i = 0; i < valuesTrace1.get(0).size(); i++) { - final List stateValues = new ArrayList<>(); - for (List l : valuesTrace1) { - stateValues.add(l.get(i)); + for (int i = 0; i < valuesTrace1.get(0).size(); i++) { + final List stateValues = new ArrayList<>(); + for (List l : valuesTrace1) { + stateValues.add(l.get(i)); + } + stateTrace1.add(stateValues); } - stateTrace1.add(stateValues); - } - for (int i = 0; i < valuesTrace2.get(0).size(); i++) { - final List stateValues = new ArrayList<>(); - for (List l : valuesTrace2) { - stateValues.add(l.get(i)); + for (int i = 0; i < valuesTrace2.get(0).size(); i++) { + final List stateValues = new ArrayList<>(); + for (List l : valuesTrace2) { + stateValues.add(l.get(i)); + } + stateTrace2.add(stateValues); } - stateTrace2.add(stateValues); - } - final List> allStates = new ArrayList<>(stateTrace1); - allStates.addAll(stateTrace2); + final List> allStates = new ArrayList<>(stateTrace1); + allStates.addAll(stateTrace2); - List>> equivalenceClasses = computeEquivalenceClasses(allStates); - diffs.addAll(computeDiff(stateTrace1, stateTrace2, equivalenceClasses)); + List>> equivalenceClasses = computeEquivalenceClasses(allStates); + diffs.addAll(computeDiff(stateTrace1, stateTrace2, equivalenceClasses)); + } else { + eqGroup.stream().findAny().ifPresent(p -> { + for (int i = 0; i < p.getKey().size(); i++) { + diffs.add(new Diff(DiffKind.EQ, i, i)); + } + }); + } } private List>> computeEquivalenceClasses(final List> states) { diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java index d80741600..21a4b4042 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java @@ -8,6 +8,7 @@ import org.eclipse.emf.ecore.EObject; import org.gemoc.sequential_addons.diffviewer.logic.Diff; +import org.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; import org.gemoc.sequential_addons.diffviewer.logic.DiffComputer; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; @@ -73,6 +74,7 @@ public class TimelineDiffViewerRenderer extends Pane { private final VBox inBox = new VBox(); private final VBox delLines = new VBox(); private final VBox delBox = new VBox(); + private final ScrollBar scrollBar = new ScrollBar(); private final IntegerProperty nbDisplayableStates; private final IntegerProperty statesRange; @@ -80,7 +82,7 @@ public class TimelineDiffViewerRenderer extends Pane { private int currentState = 0; - final Map>> lineToSegments = new HashMap<>(); + final Map>> lineToSegments = new HashMap<>(); final Map> segmentToDescription = new HashMap<>(); private ITraceExtractor extractor1 = null; @@ -134,7 +136,6 @@ public TimelineDiffViewerRenderer() { prefHeightProperty().bind(headerPane.heightProperty().add(scrollPane.heightProperty())); maxHeightProperty().bind(headerPane.heightProperty().add(scrollPane.heightProperty())); - final ScrollBar scrollBar = new ScrollBar(); scrollBar.setVisibleAmount(1); scrollBar.setBlockIncrement(10); scrollBar.setMin(0); @@ -212,9 +213,9 @@ private void addBlankState(HBox line) { line.getChildren().add(rectangle); } - private void addValue(EObject value, HBox line, String description, boolean newValue) { - final List> segments = lineToSegments.get(line); - List segment; + private void addValue(EObject value, HBox line, String description, boolean newValue, DiffKind diffKind) { + final List> segments = lineToSegments.get(line); + List segment; boolean addDescription = false; if (segments.isEmpty()) { segment = new ArrayList<>(); @@ -243,12 +244,16 @@ private void addValue(EObject value, HBox line, String description, boolean newV } descriptions.add(description); } - segment.add(1); + segment.add(diffKind); + } + + private void addValue(EObject value, HBox line, String description, boolean newValue) { + addValue(value, line, description, newValue, DiffKind.EQ); } private void addDelayedValue(HBox line, String description) { - final List> segments = lineToSegments.get(line); - final List segment; + final List> segments = lineToSegments.get(line); + final List segment; boolean addDescription = false; if (segments.isEmpty()) { segment = new ArrayList<>(); @@ -265,28 +270,32 @@ private void addDelayedValue(HBox line, String description) { } descriptions.add(description); } - segment.add(-1); + segment.add(DiffKind.DEL); } private void addBlankValue(HBox line) { lineToSegments.get(line).add(null); } - private List normalizeValueTrace(List trace) { + private List normalizeValueTrace(List trace, int start, int end) { final List result = new ArrayList<>(); - trace.stream().forEach(w -> { - while (result.size() < w.firstStateIndex) { + for (ValueWrapper w : trace) { + while (result.size() < w.firstStateIndex - start) { result.add(null); } - while (result.size() < w.lastStateIndex + 1) { + for (int i = Math.max(w.firstStateIndex, start); i <= Math.min(w.lastStateIndex, end); i++) { result.add(w.value); valueToWrapper.putIfAbsent(w.value, w); } - }); + } return result; } public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor extractor2) { + loadTraces(extractor1, extractor2, 0, 0, extractor1.getStatesTraceLength() - 1, extractor2.getStatesTraceLength() - 1); + } + + public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor extractor2, int s1, int s2, int e1, int e2) { this.extractor1 = extractor1; this.extractor2 = extractor2; valueToWrapper.clear(); @@ -295,29 +304,25 @@ public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor e wrappers1.clear(); wrappers2.clear(); - wrappers1.addAll(extractor1.getStateWrappers(0, extractor1.getStatesTraceLength() - 1)); - final List states1 = wrappers1.stream().map(w -> w.state).collect(Collectors.toList()); + wrappers1.addAll(extractor1.getStateWrappers(s1, e1)); final List> valueWrappers1 = new ArrayList<>(); for (int i = 0; i < extractor1.getNumberOfTraces(); i++) { - final List valueWrappers = extractor1.getValueWrappers(i, 0, - extractor1.getStatesTraceLength() - 1); + final List valueWrappers = extractor1.getValueWrappers(i, s1, e1); valueWrappers1.add(valueWrappers); - final List valueTrace = normalizeValueTrace(valueWrappers); - while (valueTrace.size() < states1.size()) { + final List valueTrace = normalizeValueTrace(valueWrappers, s1, e1); + while (valueTrace.size() < e1 - s1 + 1) { valueTrace.add(null); } valueTraces1.add(valueTrace); } - wrappers2.addAll(extractor2.getStateWrappers(0, extractor2.getStatesTraceLength() - 1)); - final List states2 = wrappers2.stream().map(w -> w.state).collect(Collectors.toList()); + wrappers2.addAll(extractor2.getStateWrappers(s2, e2)); final List> valueWrappers2 = new ArrayList<>(); for (int i = 0; i < extractor2.getNumberOfTraces(); i++) { - final List valueWrappers = extractor2.getValueWrappers(i, 0, - extractor2.getStatesTraceLength() - 1); + final List valueWrappers = extractor2.getValueWrappers(i, s2, e2); valueWrappers2.add(valueWrappers); - final List valueTrace = normalizeValueTrace(valueWrappers); - while (valueTrace.size() < states2.size()) { + final List valueTrace = normalizeValueTrace(valueWrappers, s2, e2); + while (valueTrace.size() < e2 - s2 + 1) { valueTrace.add(null); } valueTraces2.add(valueTrace); @@ -326,7 +331,9 @@ public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor e diffComputer = new DiffComputer(); diffComputer.loadTraces(valueTraces1, valueTraces2); nbStates.set(diffComputer.getDiffs().size()); - + currentState = 0; + scrollBar.setValue(0); + refresh(); } @@ -504,8 +511,13 @@ public void refresh() { final List t2 = e.getValue(); String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + if (diffComputer.compareEObjects(t1.get(i), t2.get(j))) { + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + } else { + addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1), DiffKind.SUBST); + addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2), DiffKind.SUBST); + } } for (List del : delGroup) { String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); @@ -579,19 +591,19 @@ public void refresh() { } private void processSegments() { - for (Map.Entry>> e : lineToSegments.entrySet()) { + for (Map.Entry>> e : lineToSegments.entrySet()) { final HBox line = e.getKey(); final List descriptions = segmentToDescription.get(line); final List children = line.getChildren(); - final List> segments = e.getValue(); + final List> segments = e.getValue(); int idx = 0; - for (List segment : segments) { + for (List segment : segments) { if (segment == null) { final Rectangle rectangle = new Rectangle(WIDTH, 8, Color.TRANSPARENT); HBox.setMargin(rectangle, MARGIN_INSETS); children.add(rectangle); } else { - int[] seg = new int[segment.size()]; + DiffKind[] seg = new DiffKind[segment.size()]; for (int i = 0; i < seg.length; i++) { seg[i] = segment.get(i); } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java index f8090849a..b2e288520 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java @@ -27,6 +27,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; @@ -47,9 +48,12 @@ public class TimelineDiffViewerViewPart extends ViewPart { public static final String ID = "org.gemoc.sequential_addons.diffviewer.views.TimelineDiffViewerRenderer"; private FXCanvas fxCanvas; - + private TimelineDiffViewerRenderer diffViewer; + private ITraceExtractor extractor1; + private ITraceExtractor extractor2; + @Override public void createPartControl(Composite parent) { fxCanvas = new FXCanvas(parent, SWT.NONE); @@ -61,7 +65,7 @@ public void createPartControl(Composite parent) { }); buildMenu(parent.getShell()); } - + private void buildMenu(Shell shell) { addActionToToolbar(new AbstractEngineAction(Action.AS_PUSH_BUTTON) { private FileDialog fileDialog; @@ -105,7 +109,7 @@ public void run() { URI filePath2URI = URI.createFileURI(filePath2); Resource traceResource2 = resSet.getResource(filePath2URI, true); EcoreUtil.resolveAll(traceResource2); - + AbstractTraceAddon newTraceAddon = null; try { IExtensionRegistry extReg = Platform.getExtensionRegistry(); @@ -122,8 +126,8 @@ public void run() { Object obj = confElement.createExecutableExtension("Class"); if (obj instanceof AbstractTraceAddon) { AbstractTraceAddon obj_cast = (AbstractTraceAddon) obj; - if (obj_cast.isAddonForTrace(traceResource1.getContents().get(0)) && - obj_cast.isAddonForTrace(traceResource2.getContents().get(0))) { + if (obj_cast.isAddonForTrace(traceResource1.getContents().get(0)) + && obj_cast.isAddonForTrace(traceResource2.getContents().get(0))) { newTraceAddon = obj_cast; break; } @@ -134,18 +138,45 @@ public void run() { } catch (CoreException e) { e.printStackTrace(); } - + if (newTraceAddon != null) { newTraceAddon.load(traceResource1); - final ITraceExtractor extractor1 = newTraceAddon.getTraceExtractor(); + extractor1 = newTraceAddon.getTraceExtractor(); newTraceAddon.load(traceResource2); - final ITraceExtractor extractor2 = newTraceAddon.getTraceExtractor(); + extractor2 = newTraceAddon.getTraceExtractor(); diffViewer.loadTraces(extractor1, extractor2); } } } } }); + + addActionToToolbar(new AbstractEngineAction(Action.AS_PUSH_BUTTON) { + @Override + protected void init() { + super.init(); + setText("Select Trace Sections"); + setToolTipText("Select Trace Sections"); + ImageDescriptor id = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/scoped_ovr.gif"); + setImageDescriptor(id); + setEnabled(true); + } + + @Override + public void engineSelectionChanged(IExecutionEngine engine) { + } + + @Override + public void run() { + TraceSectionsDialog dialog = new TraceSectionsDialog(shell, extractor1, extractor2); + dialog.open(); + if (dialog.getReturnCode() == Window.OK) { + diffViewer.loadTraces(extractor1, extractor2, + dialog.getS1(), dialog.getS2(), + dialog.getE1(), dialog.getE2()); + } + } + }); } private void addActionToToolbar(Action action) { diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java new file mode 100644 index 000000000..4576cc088 --- /dev/null +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java @@ -0,0 +1,120 @@ +package org.gemoc.sequential_addons.diffviewer.views; + +import org.eclipse.jface.dialogs.IMessageProvider; +import org.eclipse.jface.dialogs.TitleAreaDialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; + +import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; + +public class TraceSectionsDialog extends TitleAreaDialog { + + private Text txts1; + private Text txts2; + private Text txte1; + private Text txte2; + + private int s1 = -1; + private int s2 = -1; + private int e1 = -1; + private int e2 = -1; + + private ITraceExtractor extractor1; + private ITraceExtractor extractor2; + + public TraceSectionsDialog(Shell parentShell, ITraceExtractor extractor1, ITraceExtractor extractor2) { + super(parentShell); + this.extractor1 = extractor1; + this.extractor2 = extractor2; + } + + @Override + public void create() { + super.create(); + setTitle("Trace Sections"); + setMessage("Enter starting and ending states of trace sections", IMessageProvider.INFORMATION); + } + + @Override + protected Control createDialogArea(Composite parent) { + Composite area = (Composite) super.createDialogArea(parent); + Composite container = new Composite(area, SWT.NONE); + container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + GridLayout layout = new GridLayout(2, false); + container.setLayout(layout); + + txts1 = createLabelText(container, "First Trace Starting Index", extractor1); + txts2 = createLabelText(container, "Second Trace Starting Index", extractor2); + txte1 = createLabelText(container, "First Trace Ending Index", extractor1); + txte2 = createLabelText(container, "Second Trace Ending Index", extractor2); + + return area; + } + + private Text createLabelText(Composite container, String title, ITraceExtractor extractor) { + Label label = new Label(container, SWT.NONE); + label.setText(title); + + GridData data = new GridData(); + data.grabExcessHorizontalSpace = true; + data.horizontalAlignment = GridData.FILL; + + Text text = new Text(container, SWT.BORDER); + text.setLayoutData(data); + text.addModifyListener(m -> { +// String currentText = ((Text) m.widget).getText(); +// try { +// int i = Integer.parseInt(currentText); +// if (!(i > -1 && i < extractor.getStatesTraceLength())) { +// this.buttonBar.setEnabled(true); +// } else { +// this.buttonBar.setEnabled(false); +// } +// } catch (NumberFormatException e) { +// this.buttonBar.setEnabled(false); +// } + }); + + return text; + } + + @Override + protected boolean isResizable() { + return true; + } + + private void saveInput() { + s1 = new Integer(txts1.getText()); + s2 = new Integer(txts2.getText()); + e1 = new Integer(txte1.getText()); + e2 = new Integer(txte2.getText()); + } + + @Override + protected void okPressed() { + saveInput(); + super.okPressed(); + } + + public int getS1() { + return s1; + } + + public int getS2() { + return s2; + } + + public int getE1() { + return e1; + } + + public int getE2() { + return e2; + } +} \ No newline at end of file diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java index ac7b4501c..00a5a9a58 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; + import javafx.scene.control.Tooltip; import javafx.scene.layout.HBox; import javafx.scene.paint.Color; @@ -17,7 +19,7 @@ public class ValueView extends HBox { private static final int HEIGHT = 8; private static final int H_MARGIN = 8; private static final int WIDTH = 24; - + private Shape getHatching(int length, int offset) { final Path p = new Path(); for (int i = 0; i < (length / 2.5) + 1; i++) { @@ -33,18 +35,20 @@ private Shape getHatching(int length, int offset) { return p; } - public void setSegments(int... segmentParts) { + public void setSegments(DiffKind... segmentParts) { if (segmentParts.length > 0) { int totalLength = (WIDTH + H_MARGIN * 2) * segmentParts.length - H_MARGIN * 2; final List rectangles = new ArrayList<>(); - final boolean firstSegmentIsGap = segmentParts[0] == -1; int j = 0; final List segmentLengths = new ArrayList<>(); + final List segmentTypes = new ArrayList<>(); segmentLengths.add(1); + segmentTypes.add(segmentParts[0]); for (int i = 1; i < segmentParts.length; i++) { if (segmentParts[i] != segmentParts[i - 1]) { j++; segmentLengths.add(1); + segmentTypes.add(segmentParts[i]); } else { segmentLengths.add(1 + segmentLengths.remove(j)); } @@ -55,55 +59,113 @@ public void setSegments(int... segmentParts) { for (int i = 1; i < segmentCount - 1; i++) { final Shape s; final int length = (WIDTH + H_MARGIN * 2) * segmentLengths.get(i); - if (i % 2 == 0 && !firstSegmentIsGap) { + switch (segmentTypes.get(i)) { + case EQ: s = new Rectangle(length, HEIGHT, Color.BLUE); - } else { + break; + case SUBST: + s = new Rectangle(length, HEIGHT, Color.TOMATO); + break; + case DEL: + case IN: final Rectangle r = new Rectangle(length, HEIGHT); s = Shape.subtract(r, getHatching(length, 0)); - s.setFill(Color.BLUE); + s.setFill(Color.BROWN); + break; + default: + s = null; } rectangles.add(s); } final Shape firstR; + final Color firstC; final int l1 = (WIDTH + H_MARGIN * 2) * segmentLengths.get(0) - H_MARGIN; - if (!firstSegmentIsGap) { + switch (segmentTypes.get(0)) { + case EQ: firstR = new Rectangle(l1, HEIGHT); - } else { + firstC = Color.BLUE; + break; + case SUBST: + firstR = new Rectangle(l1, HEIGHT); + firstC = Color.TOMATO; + break; + case DEL: + case IN: final Rectangle r = new Rectangle(l1, HEIGHT); firstR = Shape.subtract(r, getHatching(l1, 0)); + firstC = Color.BROWN; + break; + default: + firstR = null; + firstC = null; } final Shape lastR; + final Color lastC; final int l2 = (WIDTH + H_MARGIN * 2) * segmentLengths.get(segmentCount - 1) - H_MARGIN; - if ((segmentCount - 1) % 2 == 0 && !firstSegmentIsGap) { + switch (segmentTypes.get(segmentCount - 1)) { + case EQ: lastR = new Rectangle(totalLength - l2, 0, l2, HEIGHT); - } else { + lastC = Color.BLUE; + break; + case SUBST: + lastR = new Rectangle(totalLength - l2, 0, l2, HEIGHT); + lastC = Color.TOMATO; + break; + case DEL: + case IN: final Rectangle r = new Rectangle(totalLength - l2, 0, l2, HEIGHT); lastR = Shape.subtract(r, getHatching(l2, totalLength - l2)); + lastC = Color.BROWN; + break; + default: + lastR = null; + lastC = null; } - + final Rectangle r = new Rectangle(totalLength, HEIGHT); r.setArcHeight(HEIGHT); r.setArcWidth(12); final Shape s1 = Shape.intersect(firstR, r); final Shape s2 = Shape.intersect(lastR, r); - s1.setFill(Color.BLUE); - s2.setFill(Color.BLUE); + s1.setFill(firstC); + s2.setFill(lastC); rectangles.add(0, s1); rectangles.add(s2); } else { final int length = (WIDTH + H_MARGIN * 2) * segmentLengths.get(0) - H_MARGIN * 2; - final Rectangle r = new Rectangle(length, HEIGHT, Color.BLUE); - r.setArcHeight(HEIGHT); - r.setArcWidth(12); - rectangles.add(r); + final Rectangle r; + switch (segmentTypes.get(0)) { + case EQ: + r = new Rectangle(length, HEIGHT, Color.BLUE); + r.setArcHeight(HEIGHT); + r.setArcWidth(12); + rectangles.add(r); + break; + case SUBST: + r = new Rectangle(length, HEIGHT, Color.TOMATO); + r.setArcHeight(HEIGHT); + r.setArcWidth(12); + rectangles.add(r); + break; + case DEL: + case IN: + r = new Rectangle(length, HEIGHT); + r.setArcHeight(HEIGHT); + r.setArcWidth(12); + final Shape s = Shape.subtract(r, getHatching(length, totalLength - length)); + s.setFill(Color.BROWN); + rectangles.add(s); + break; + } + } getChildren().addAll(rectangles); } } - public ValueView(String description, int... segmentParts) { + public ValueView(String description, DiffKind... segmentParts) { setSegments(segmentParts); final Tooltip tooltip = new Tooltip(description); Tooltip.install(this, tooltip); From c2816fecc980cc824f41b40986a72e4ef981e998 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Tue, 27 Sep 2016 16:47:31 +0200 Subject: [PATCH 018/267] Improved the description of values provided by the trace extractor --- .../TraceExtractorGeneratorJava.xtend | 51 ++++++++++++------ .../icons/scoped_ovr.gif | Bin 0 -> 60 bytes .../views/TimelineDiffViewerRenderer.java | 1 - 3 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/scoped_ovr.gif diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend index 8f29a0150..64febedf9 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend @@ -790,8 +790,18 @@ class TraceExtractorGeneratorJava { if (object instanceof EObject) { final Object originalObject = getOriginalObject((EObject) object); if (originalObject != null) { + if (originalObject instanceof EObject) { + final QualifiedName qname = nameProvider.getFullyQualifiedName((EObject) originalObject); + if (qname != null) { + return qname.getLastSegment(); + } + } return originalObject.toString(); } + QualifiedName qname = nameProvider.getFullyQualifiedName((EObject) object); + if (qname != null) { + return qname.getLastSegment(); + } } if (object instanceof Collection) { @SuppressWarnings("unchecked") @@ -810,21 +820,30 @@ class TraceExtractorGeneratorJava { public String getValueLabel(int traceIndex) { String attributeName = ""; if (traceIndex > -1 && traceIndex < valueTraces.size()) { - final List valueTrace = valueTraces.get(traceIndex); + final List valueTrace = valueTraces.get(traceIndex); if (valueTrace.isEmpty()) { return ""; } - final «valueFQN» value = valueTrace.get(0); - final EObject container = value.eContainer(); - attributeName = getValueName(value); - final Object originalObject = getOriginalObject(container); - if (originalObject instanceof EObject) { - final EObject eObject = (EObject) originalObject; - final QualifiedName qname = nameProvider.getFullyQualifiedName(eObject); - if (qname == null) { - return attributeName + " (" + eObject.toString() + ")"; - } else { - return attributeName + " (" + qname.toString() + " :" + eObject.eClass().getName() + ")"; + if (valueTrace instanceof EcoreEList) { + final EcoreEList eList = (EcoreEList) valueTrace; + final EObject owner = eList.getEObject(); + final List attributes = owner.eClass().getEAllReferences().stream() + .filter(r -> r.getName().endsWith("Sequence")) + .map(r -> r.getName().substring(0, r.getName().length() - 8)).collect(Collectors.toList()); + final Object originalObject = getOriginalObject(owner); + if (!attributes.isEmpty()) { + String n = eList.data().getClass().getComponentType().getName(); + attributeName = attributes.stream().filter(s -> n.contains("_" + s + "_")).findFirst().orElse(""); + } + if (originalObject != null) { + if (originalObject instanceof EObject) { + final EObject eObject = (EObject) originalObject; + final QualifiedName qname = nameProvider.getFullyQualifiedName(eObject); + if (qname != null) { + return attributeName + " (" + qname.toString() + " :" + eObject.eClass().getName() + ")"; + } + } + return attributeName + " (" + originalObject.toString() + ")"; } } } @@ -836,7 +855,8 @@ class TraceExtractorGeneratorJava { String result = ""; for (int i = 0; i < valueTraces.size(); i++) { if (!isValueTraceIgnored(i)) { - result += (result.length() == 0 ? "" : "\n") + getValueDescription(i, stateIndex); + String description = getValueDescription(i, stateIndex); + result += (description == null ? "" : (result.length() == 0 ? "" : "\n") + description); } } return result; @@ -844,17 +864,16 @@ class TraceExtractorGeneratorJava { @Override public String getValueDescription(int traceIndex, int stateIndex) { - String description = getValueLabel(traceIndex) + " : "; final EObject value = getValueAt(traceIndex, stateIndex); if (value == null) { return null; } + String description = getValueLabel(traceIndex) + " : "; final String attributeName = getValueName(value); if (attributeName.length() > 0) { - final String featureName = attributeName; final Optional attribute = value.eClass() .getEAllStructuralFeatures().stream() - .filter(r -> r.getName().equals(featureName)).findFirst(); + .filter(r -> r.getName().equals(attributeName)).findFirst(); if (attribute.isPresent()) { final Object o = value.eGet(attribute.get()); return description + getObjectDescription(o); diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/scoped_ovr.gif b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/scoped_ovr.gif new file mode 100644 index 0000000000000000000000000000000000000000..5b97523928378cc0e1ab7691a8155a9425df9762 GIT binary patch literal 60 zcmZ?wbhEHb Date: Tue, 27 Sep 2016 17:00:07 +0200 Subject: [PATCH 019/267] Improved the description of values when the value is a proxy --- .../plugin/generator/TraceExtractorGeneratorJava.xtend | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend index 64febedf9..8c9d23b52 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend @@ -820,7 +820,7 @@ class TraceExtractorGeneratorJava { public String getValueLabel(int traceIndex) { String attributeName = ""; if (traceIndex > -1 && traceIndex < valueTraces.size()) { - final List valueTrace = valueTraces.get(traceIndex); + final List valueTrace = valueTraces.get(traceIndex); if (valueTrace.isEmpty()) { return ""; } @@ -838,6 +838,12 @@ class TraceExtractorGeneratorJava { if (originalObject != null) { if (originalObject instanceof EObject) { final EObject eObject = (EObject) originalObject; + if (eObject.eIsProxy()) { + final String proxyToString = eObject.toString(); + final int idx = proxyToString.indexOf("eProxyURI: ") + 11; + final String s = proxyToString.substring(idx, proxyToString.length() - 1); + return attributeName + " (" + s + ")"; + } final QualifiedName qname = nameProvider.getFullyQualifiedName(eObject); if (qname != null) { return attributeName + " (" + qname.toString() + " :" + eObject.eClass().getName() + ")"; From 36903cac6f13e99b0b2fe82dbac0259ebaaeec9b Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Tue, 27 Sep 2016 16:15:54 +0200 Subject: [PATCH 020/267] remove xdsml suffix for default project name --- .../ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java index 7d7fb4973..99cba3969 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java @@ -36,7 +36,7 @@ public void addPages() { NewMelangeProjectWizardPage firstPage = (NewMelangeProjectWizardPage) getPage("wizardPage"); firstPage.setTitle("Project"); firstPage.setDescription("Create a new Gemoc Sequential Language Project"); - firstPage.updateNameProject("org.company.my_sequential_language.xdsml"); + firstPage.updateNameProject("org.company.my_sequential_language"); } @Override From 7241b95143b7fbd12e68ae8793ed656fe3ee0e0c Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Wed, 28 Sep 2016 10:05:35 +0200 Subject: [PATCH 021/267] Added missing import in trace extractor generator --- .../trace/plugin/generator/TraceExtractorGeneratorJava.xtend | 1 + 1 file changed, 1 insertion(+) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend index 8c9d23b52..db109037d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend @@ -128,6 +128,7 @@ class TraceExtractorGeneratorJava { import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; + import org.eclipse.emf.ecore.util.EcoreEList; import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; From 588ecd83d59914162ba4b2dd87a1c4cc5bb0db9b Mon Sep 17 00:00:00 2001 From: Yvan Lussaud Date: Thu, 29 Sep 2016 12:03:50 +0200 Subject: [PATCH 022/267] Fixed deploy script --- prepare-deploy-local-dir.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prepare-deploy-local-dir.sh b/prepare-deploy-local-dir.sh index a64b59d6e..2a87f9f21 100644 --- a/prepare-deploy-local-dir.sh +++ b/prepare-deploy-local-dir.sh @@ -3,9 +3,9 @@ UPDATE_SITE_DIR=releng/org.gemoc.siriusanimation.repository/target/ DEPLOY_LOCAL_DIR=$1 echo "Prepare deploy local dir = ${DEPLOY_LOCAL_DIR}" # Create nightly folder -mkdir $DEPLOY_LOCAL_DIR +mkdir -p $DEPLOY_LOCAL_DIR # Rename the zipped update site to nightly -- mv $UPDATE_SITE_DIR/org.gemoc.siriusanimation.repository-*-SNAPSHOT.zip $UPDATE_SITE_DIR/org.gemoc.siriusanimation.repository-nightly.zip +mv $UPDATE_SITE_DIR/org.gemoc.siriusanimation.repository-*-SNAPSHOT.zip $UPDATE_SITE_DIR/org.gemoc.siriusanimation.repository-nightly.zip # Copy update-site to deploy local dir cp -r $UPDATE_SITE_DIR/repository $DEPLOY_LOCAL_DIR cp -r $UPDATE_SITE_DIR/*.zip $DEPLOY_LOCAL_DIR From da310946f00c90dd3fd1d6bf9a3691ffda0365fa Mon Sep 17 00:00:00 2001 From: Yvan Lussaud Date: Thu, 29 Sep 2016 13:57:25 +0200 Subject: [PATCH 023/267] Fixed deploy script --- prepare-deploy-local-dir.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare-deploy-local-dir.sh b/prepare-deploy-local-dir.sh index 2a87f9f21..eb12f2909 100644 --- a/prepare-deploy-local-dir.sh +++ b/prepare-deploy-local-dir.sh @@ -1,5 +1,5 @@ #! /usr/bin/env sh -UPDATE_SITE_DIR=releng/org.gemoc.siriusanimation.repository/target/ +UPDATE_SITE_DIR=releng/org.gemoc.siriusanimation.repository/target DEPLOY_LOCAL_DIR=$1 echo "Prepare deploy local dir = ${DEPLOY_LOCAL_DIR}" # Create nightly folder From cd5c9aceef5b65bc4cc1e4ab6bbf739f5ef85f8c Mon Sep 17 00:00:00 2001 From: Yvan Lussaud Date: Thu, 29 Sep 2016 14:29:11 +0200 Subject: [PATCH 024/267] Fixed deploy script --- prepare-deploy-local-dir.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/prepare-deploy-local-dir.sh b/prepare-deploy-local-dir.sh index eb12f2909..24d2899da 100644 --- a/prepare-deploy-local-dir.sh +++ b/prepare-deploy-local-dir.sh @@ -4,8 +4,6 @@ DEPLOY_LOCAL_DIR=$1 echo "Prepare deploy local dir = ${DEPLOY_LOCAL_DIR}" # Create nightly folder mkdir -p $DEPLOY_LOCAL_DIR -# Rename the zipped update site to nightly -mv $UPDATE_SITE_DIR/org.gemoc.siriusanimation.repository-*-SNAPSHOT.zip $UPDATE_SITE_DIR/org.gemoc.siriusanimation.repository-nightly.zip # Copy update-site to deploy local dir cp -r $UPDATE_SITE_DIR/repository $DEPLOY_LOCAL_DIR cp -r $UPDATE_SITE_DIR/*.zip $DEPLOY_LOCAL_DIR From b1cfdddc0cf60c0041957fdb58b2951514a8c360 Mon Sep 17 00:00:00 2001 From: Yvan Lussaud Date: Thu, 29 Sep 2016 14:47:50 +0200 Subject: [PATCH 025/267] Fixed deploy script --- prepare-deploy-local-dir.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare-deploy-local-dir.sh b/prepare-deploy-local-dir.sh index 24d2899da..157ab1fe3 100644 --- a/prepare-deploy-local-dir.sh +++ b/prepare-deploy-local-dir.sh @@ -1,5 +1,5 @@ #! /usr/bin/env sh -UPDATE_SITE_DIR=releng/org.gemoc.siriusanimation.repository/target +UPDATE_SITE_DIR=$TRAVIS_BUILD_DIR/releng/org.gemoc.siriusanimation.repository/target DEPLOY_LOCAL_DIR=$1 echo "Prepare deploy local dir = ${DEPLOY_LOCAL_DIR}" # Create nightly folder From a72b021cef8ccd41943d530c7c05c05312afb663 Mon Sep 17 00:00:00 2001 From: Yvan Lussaud Date: Thu, 29 Sep 2016 14:51:03 +0200 Subject: [PATCH 026/267] Added repository profile in travis script. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c3465ae7..84587be86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ jdk: - oraclejdk8 before_install: echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc install: -- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -P use_CI_repositories,modelanimation,trace_and_framework,java_execution +- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository script: # Build update-site -- mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution clean verify +- mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository clean verify # Rename the zipped update site to nightly - mv releng/org.gemoc.siriusanimation.repository/target/org.gemoc.siriusanimation.repository-*-SNAPSHOT.zip releng/org.gemoc.siriusanimation.repository/target/org.gemoc.siriusanimation.repository-nightly.zip From a432b71a269d803ce37c0ce985e17d107b23081b Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Thu, 29 Sep 2016 16:41:06 +0200 Subject: [PATCH 027/267] Fixed NPE in generated trace constructors --- .../trace/plugin/generator/TraceConstructorGeneratorJava.xtend | 1 + 1 file changed, 1 insertion(+) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceConstructorGeneratorJava.xtend index 0abb2e2d7..05a3e4e56 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceConstructorGeneratorJava.xtend @@ -359,6 +359,7 @@ class TraceConstructorGeneratorJava { allResources.add(executedModel); «IF gemoc» allResources.addAll(org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); + allResources.removeIf(r -> r== null); «ENDIF» return allResources; } From a25113360b5c854f7509377bc30c8fe68fbd35ce Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Thu, 6 Oct 2016 16:02:21 +0200 Subject: [PATCH 028/267] do not show internal step of parallel step, because they are already shown as a parallel --- .../sirius/services/AbstractGemocDebuggerServices.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java index a941f796a..0eee3f6bf 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java @@ -430,7 +430,10 @@ public void currentInstructionChanged(String debugModelID, addMseOccurenceAndCallerToInstructionsURIs(instructionURIs,step.getMseoccurrence()); } } else if (currentInstruction instanceof Step) { - addMseOccurenceAndCallerToInstructionsURIs(instructionURIs,((Step)currentInstruction).getMseoccurrence()); + if(!(currentInstruction.eContainer() instanceof ParallelStep)){ + // do not show internal step of parallel step, because they are already shown as a parallel + addMseOccurenceAndCallerToInstructionsURIs(instructionURIs,((Step)currentInstruction).getMseoccurrence()); + } } else { instructionURIs.add(EcoreUtil.getURI(currentInstruction)); } From 1ecc3e30ff6192c29422bcbb81ad40298dc9deeb Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 7 Oct 2016 00:07:32 +0200 Subject: [PATCH 029/267] fixes "isActivated" service for ParallelStep only the ParallelStep is activated, not its sub steps --- .../services/AbstractGemocAnimatorServices.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index 1666f9225..b29dc8750 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -40,8 +40,10 @@ import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.hamcrest.core.IsInstanceOf; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import fr.inria.diverse.trace.commons.model.trace.ParallelStep; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.obeo.dsl.debug.ide.DSLBreakpoint; @@ -278,6 +280,11 @@ public void activate(Object context, Step step) { if (mseOccurrence != null && mseOccurrence.getMse() != null && mseOccurrence.getMse().getCaller() != null) { instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse().getCaller())); } + if(step instanceof ParallelStep){ + for(Step substep: ((ParallelStep)step).getSubSteps()){ + instructionURIs.add(EcoreUtil.getURI(substep.getMseoccurrence().getMse().getCaller())); + } + } clear(context); Set oldInstructions = activatedInstructions.get(context); if (oldInstructions == null) { @@ -375,7 +382,9 @@ public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) { @Override public void aboutToExecuteStep(IExecutionEngine engine, Step stepToExecute) { - activate(engine, stepToExecute); + if(!(stepToExecute.eContainer() instanceof ParallelStep)){ + activate(engine, stepToExecute); + } } @Override From 3bd2228b17c5d6b26cf02bc075c7f3aee95b37e7 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 7 Oct 2016 00:26:43 +0200 Subject: [PATCH 030/267] remove use of some deprecated CI update sites --- java_execution/pom.xml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/java_execution/pom.xml b/java_execution/pom.xml index 9bee8ec21..1f78e8199 100644 --- a/java_execution/pom.xml +++ b/java_execution/pom.xml @@ -49,31 +49,6 @@ https://ci.inria.fr/gemoc/job/gemoc-studio_commons/lastSuccessfulBuild/artifact/commons/releng/org.gemoc.commons.repository/target/repository/ - modeldebugging_trace_commons on CI - p2 - https://ci.inria.fr/gemoc/job/framework_and_trace/lastSuccessfulBuild/artifact/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/target/repository/ - - - modeldebugging_trace_generator on CI - p2 - https://ci.inria.fr/gemoc/job/framework_and_trace/lastSuccessfulBuild/artifact/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.updatesite/target/repository/ - - - modeldebugging_framework_frameworkcommons on CI - p2 - https://ci.inria.fr/gemoc/job/framework_and_trace/lastSuccessfulBuild/artifact/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.repository/target/repository/ - - - modeldebugging_framework_xdsmlframework on CI - p2 - https://ci.inria.fr/gemoc/job/framework_and_trace/lastSuccessfulBuild/artifact/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.repository/target/repository/ - - - modeldebugging_framework_executionframework on CI - p2 - https://ci.inria.fr/gemoc/job/framework_and_trace/lastSuccessfulBuild/artifact/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.repository/target/repository/ - - modelanimation_siriusmodelanimation on CI p2 http://obeo-siriuslab-nightly.s3-website-eu-west-1.amazonaws.com/SiriusAnimator/master/repository/ From b47d5b6b58ac54d6abef9a7da270830465c25831 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 10 Oct 2016 10:27:13 +0200 Subject: [PATCH 031/267] robustness code --- .../sirius/services/AbstractGemocAnimatorServices.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index b29dc8750..33d93831a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -282,7 +282,11 @@ public void activate(Object context, Step step) { } if(step instanceof ParallelStep){ for(Step substep: ((ParallelStep)step).getSubSteps()){ - instructionURIs.add(EcoreUtil.getURI(substep.getMseoccurrence().getMse().getCaller())); + if (substep.getMseoccurrence() != null && + substep.getMseoccurrence().getMse() != null && + substep.getMseoccurrence().getMse().getCaller() != null) { + instructionURIs.add(EcoreUtil.getURI(substep.getMseoccurrence().getMse().getCaller())); + } } } clear(context); From d0b468ffd42c482fbbb1d09451e85ebf24086160 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Tue, 11 Oct 2016 10:16:59 +0200 Subject: [PATCH 032/267] Added support for (x)textual animation --- .../launcher/GemocDebugModelPresentation.java | 2 +- .../ui/launcher/GemocSourceLocator.java | 37 +++- .../ide/ui/DSLDebugModelPresentation.java | 168 +++++++++--------- .../META-INF/MANIFEST.MF | 3 +- .../ide/adapter/DSLStackFrameAdapter.java | 95 +++++----- 5 files changed, 175 insertions(+), 130 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java index a56c5bb72..17fd4f7c5 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java @@ -95,7 +95,7 @@ public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) { } } - return true; + return false; } private void showEvents(List events) { diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java index 448f12420..8f8f5b78c 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java @@ -10,14 +10,25 @@ *******************************************************************************/ package org.gemoc.execution.sequential.javaengine.ui.launcher; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.URIUtil; import org.eclipse.debug.core.model.IStackFrame; +import org.eclipse.debug.ui.ISourcePresentation; +import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IFileEditorInput; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.xtext.resource.XtextResource; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.obeo.dsl.debug.ide.DSLSourceLocator; import fr.obeo.dsl.debug.ide.adapter.DSLStackFrameAdapter; -public class GemocSourceLocator extends DSLSourceLocator { +public class GemocSourceLocator extends DSLSourceLocator implements ISourcePresentation { @Override public Object getSourceElement(IStackFrame stackFrame) { @@ -37,4 +48,28 @@ public Object getSourceElement(IStackFrame stackFrame) { } return res; } + + @Override + public IEditorInput getEditorInput(Object element) { + if (element instanceof EObject) { + EObject eObject = (EObject) element; + URI uri = eObject.eResource().getURI(); + IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true))); + IFileEditorInput input = new FileEditorInput(file); + return input; + } + return null; + } + + @Override + public String getEditorId(IEditorInput input, Object element) { + if (element instanceof EObject) { + EObject eObject = (EObject) element; + Resource r = eObject.eResource(); + if (r instanceof XtextResource) { + return ((XtextResource) r).getLanguageName(); + } + } + return null; + } } diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java index 92493d64e..cae8f19fd 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java @@ -65,15 +65,15 @@ public class DSLDebugModelPresentation implements IDebugModelPresentation, IDebu * Constructor. */ public DSLDebugModelPresentation() { - super(); - final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory( - ComposedAdapterFactory.Descriptor.Registry.INSTANCE); - - adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); - CustomDebugItemProviderAdapterFactory debugFactory = new CustomDebugItemProviderAdapterFactory(); - adapterFactory.addAdapterFactory(debugFactory); - adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); - eLabelProvider = new AdapterFactoryLabelProvider(adapterFactory); + super(); + final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory( + ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + + adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); + CustomDebugItemProviderAdapterFactory debugFactory = new CustomDebugItemProviderAdapterFactory(); + adapterFactory.addAdapterFactory(debugFactory); + adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); + eLabelProvider = new AdapterFactoryLabelProvider(adapterFactory); } /** @@ -82,7 +82,7 @@ public DSLDebugModelPresentation() { * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) */ public void addListener(ILabelProviderListener listener) { - eLabelProvider.addListener(listener); + eLabelProvider.addListener(listener); } /** @@ -91,28 +91,29 @@ public void addListener(ILabelProviderListener listener) { * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ public void dispose() { - for (Image cachedImage : imagesCache.values()) { - cachedImage.dispose(); - } - eLabelProvider.dispose(); + for (Image cachedImage : imagesCache.values()) { + cachedImage.dispose(); + } + eLabelProvider.dispose(); } /** * {@inheritDoc} * - * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) + * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, + * java.lang.String) */ public boolean isLabelProperty(Object element, String property) { - final boolean res; + final boolean res; - final Object unwrapped = unwrapp(element); - if (unwrapped instanceof Variable) { - res = isLabelProperty(((Variable)unwrapped).getValue(), property); - } else { - res = eLabelProvider.isLabelProperty(unwrapp(element), property); - } + final Object unwrapped = unwrapp(element); + if (unwrapped instanceof Variable) { + res = isLabelProperty(((Variable)unwrapped).getValue(), property); + } else { + res = eLabelProvider.isLabelProperty(unwrapp(element), property); + } - return res; + return res; } /** @@ -121,7 +122,7 @@ public boolean isLabelProperty(Object element, String property) { * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) */ public void removeListener(ILabelProviderListener listener) { - eLabelProvider.removeListener(listener); + eLabelProvider.removeListener(listener); } /** @@ -130,7 +131,7 @@ public void removeListener(ILabelProviderListener listener) { * @see org.eclipse.debug.ui.ISourcePresentation#getEditorInput(java.lang.Object) */ public IEditorInput getEditorInput(Object element) { - return EMFEditorUtils.getEditorInput(element); + return EMFEditorUtils.getEditorInput(element); } /** @@ -140,15 +141,15 @@ public IEditorInput getEditorInput(Object element) { * java.lang.Object) */ public String getEditorId(IEditorInput input, Object element) { - final String res; + final String res; - res = EMFEditorUtils.getEditorID(input, element); + res = EMFEditorUtils.getEditorID(input, element); - return res; + return res; } public void setAttribute(String attribute, Object value) { - // TODO Auto-generated method stub + // TODO Auto-generated method stub } @@ -158,29 +159,30 @@ public void setAttribute(String attribute, Object value) { * @see org.eclipse.debug.ui.IDebugModelPresentation#getImage(java.lang.Object) */ public Image getImage(final Object element) { - final Image res; - - final Object unwrapped = unwrapp(element); - if (unwrapped instanceof Variable) { - res = getImage(((Variable)unwrapped).getValue()); - } else if (element instanceof DSLBreakpoint) { - final Object image = ((DSLBreakpoint)element).getImage(); - if (image instanceof ComposedImage) { - ((ComposedImage)image).getImages().add( - DebugIdeUiPlugin.INSTANCE.getImage("full/deco16/breakpoint_enabled")); - } - final ImageDescriptor descriptor = ExtendedImageRegistry.getInstance().getImageDescriptor(image); - Image cachedImage = imagesCache.get(descriptor); - if (cachedImage == null) { - cachedImage = new Image(Display.getDefault(), descriptor.getImageData()); - imagesCache.put(descriptor, cachedImage); - } - res = cachedImage; - } else { - res = eLabelProvider.getImage(unwrapped); + final Image res; + + final Object unwrapped = unwrapp(element); + if (unwrapped instanceof Variable) { + res = getImage(((Variable)unwrapped).getValue()); + } else if (element instanceof DSLBreakpoint) { + final Object image = ((DSLBreakpoint)element).getImage(); + if (image instanceof ComposedImage) { + ((ComposedImage)image).getImages().add(DebugIdeUiPlugin.INSTANCE.getImage( + "full/deco16/breakpoint_enabled")); + } + final ImageDescriptor descriptor = ExtendedImageRegistry.getInstance().getImageDescriptor( + image); + Image cachedImage = imagesCache.get(descriptor); + if (cachedImage == null) { + cachedImage = new Image(Display.getDefault(), descriptor.getImageData()); + imagesCache.put(descriptor, cachedImage); } + res = cachedImage; + } else { + res = eLabelProvider.getImage(unwrapped); + } - return res; + return res; } /** @@ -189,22 +191,22 @@ public Image getImage(final Object element) { * @see org.eclipse.debug.ui.IDebugModelPresentation#getText(java.lang.Object) */ public String getText(Object element) { - final String res; - - final Object unwrapped = unwrapp(element); - if (unwrapped instanceof Variable) { - res = getText(((Variable)unwrapped).getValue()); - } else if (element instanceof DSLBreakpoint) { - res = ((DSLBreakpoint)element).getText(); - } else { - res = eLabelProvider.getText(unwrapped); - } + final String res; + + final Object unwrapped = unwrapp(element); + if (unwrapped instanceof Variable) { + res = getText(((Variable)unwrapped).getValue()); + } else if (element instanceof DSLBreakpoint) { + res = ((DSLBreakpoint)element).getText(); + } else { + res = eLabelProvider.getText(unwrapped); + } - return res; + return res; } public void computeDetail(IValue value, IValueDetailListener listener) { - // TODO Auto-generated method stub + // TODO Auto-generated method stub } /** @@ -212,22 +214,22 @@ public void computeDetail(IValue value, IValueDetailListener listener) { * * @param element * the {@link Object element} - * @return the {@link Adapter#getTarget() target} if the given element is an {@link Adapter}, the given - * element itself otherwise + * @return the {@link Adapter#getTarget() target} if the given element is an {@link Adapter}, the + * given element itself otherwise */ private Object unwrapp(Object element) { - final Object res; - - if (element instanceof DSLObjectVariable) { - res = ((DSLObjectVariable)element).getObject(); - } else if (element instanceof DSLObjectValue) { - res = ((DSLObjectValue)element).getValue(); - } else if (element instanceof Adapter) { - res = ((Adapter)element).getTarget(); - } else { - res = element; - } - return res; + final Object res; + + if (element instanceof DSLObjectVariable) { + res = ((DSLObjectVariable)element).getObject(); + } else if (element instanceof DSLObjectValue) { + res = ((DSLObjectValue)element).getValue(); + } else if (element instanceof Adapter) { + res = ((Adapter)element).getTarget(); + } else { + res = element; + } + return res; } /** @@ -237,12 +239,12 @@ private Object unwrapp(Object element) { * org.eclipse.debug.core.model.IStackFrame) */ public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) { - if (frame instanceof DSLStackFrameAdapter) { - final EObject instruction = ((DSLStackFrameAdapter)frame).getCurrentInstruction(); - final URI instructionUri = EcoreUtil.getURI(instruction); - EMFEditorUtils.selectInstruction(editorPart, instructionUri); - } - return true; + if (frame instanceof DSLStackFrameAdapter) { + final EObject instruction = ((DSLStackFrameAdapter)frame).getCurrentInstruction(); + final URI instructionUri = EcoreUtil.getURI(instruction); + EMFEditorUtils.selectInstruction(editorPart, instructionUri); + } + return true; } /** @@ -252,7 +254,7 @@ public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) { * org.eclipse.debug.core.model.IThread) */ public void removeAnnotations(IEditorPart editorPart, IThread thread) { - // nothing to do here + // nothing to do here } } diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF index edf20abe5..7b6083e44 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF @@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.debug.core;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.emf.edit;bundle-version="2.7.0", fr.obeo.dsl.debug.edit;bundle-version="1.0.0", - org.eclipse.emf.transaction;bundle-version="1.4.0" + org.eclipse.emf.transaction;bundle-version="1.4.0", + org.eclipse.xtext Export-Package: fr.obeo.dsl.debug.ide, fr.obeo.dsl.debug.ide.adapter, fr.obeo.dsl.debug.ide.adapter.value, diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java index 2482bbefe..eaed6b06d 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java @@ -24,6 +24,8 @@ import org.eclipse.debug.core.model.IThread; import org.eclipse.debug.core.model.IVariable; import org.eclipse.emf.ecore.EObject; +import org.eclipse.xtext.nodemodel.INode; +import org.eclipse.xtext.nodemodel.util.NodeModelUtils; /** * The {@link StackFrame} DSL debug model. @@ -44,12 +46,12 @@ public class DSLStackFrameAdapter extends AbstractDSLDebugElementAdapter impleme * the {@link DSLEclipseDebugIntegration} factory */ public DSLStackFrameAdapter(DSLEclipseDebugIntegration factory) { - super(factory); + super(factory); } @Override public boolean isAdapterForType(Object type) { - return super.isAdapterForType(type) || type == IStackFrame.class; + return super.isAdapterForType(type) || type == IStackFrame.class; } /** @@ -58,8 +60,8 @@ public boolean isAdapterForType(Object type) { * @return the {@link StackFrame} */ public StackFrame getHost() { - assert target instanceof StackFrame; - return (StackFrame)target; + assert target instanceof StackFrame; + return (StackFrame)target; } /** @@ -68,7 +70,7 @@ public StackFrame getHost() { * @see org.eclipse.debug.core.model.IStep#canStepInto() */ public boolean canStepInto() { - return getThread().canStepInto(); + return getThread().canStepInto(); } /** @@ -77,7 +79,7 @@ public boolean canStepInto() { * @see org.eclipse.debug.core.model.IStep#canStepOver() */ public boolean canStepOver() { - return getThread().canStepOver(); + return getThread().canStepOver(); } /** @@ -86,11 +88,11 @@ public boolean canStepOver() { * @see org.eclipse.debug.core.model.IStep#canStepReturn() */ public boolean canStepReturn() { - return getThread().canStepReturn(); + return getThread().canStepReturn(); } public boolean isStepping() { - return getThread().isStepping(); + return getThread().isStepping(); } /** @@ -99,7 +101,7 @@ public boolean isStepping() { * @see org.eclipse.debug.core.model.IStep#stepInto() */ public void stepInto() throws DebugException { - getThread().stepInto(); + getThread().stepInto(); } /** @@ -108,7 +110,7 @@ public void stepInto() throws DebugException { * @see org.eclipse.debug.core.model.IStep#stepOver() */ public void stepOver() throws DebugException { - getThread().stepOver(); + getThread().stepOver(); } /** @@ -117,7 +119,7 @@ public void stepOver() throws DebugException { * @see org.eclipse.debug.core.model.IStep#stepReturn() */ public void stepReturn() throws DebugException { - getThread().stepReturn(); + getThread().stepReturn(); } /** @@ -126,7 +128,7 @@ public void stepReturn() throws DebugException { * @see org.eclipse.debug.core.model.ISuspendResume#canResume() */ public boolean canResume() { - return getThread().canResume(); + return getThread().canResume(); } /** @@ -135,11 +137,11 @@ public boolean canResume() { * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() */ public boolean canSuspend() { - return getThread().canSuspend(); + return getThread().canSuspend(); } public boolean isSuspended() { - return getThread().isSuspended(); + return getThread().isSuspended(); } /** @@ -148,7 +150,7 @@ public boolean isSuspended() { * @see org.eclipse.debug.core.model.ISuspendResume#resume() */ public void resume() throws DebugException { - getThread().resume(); + getThread().resume(); } /** @@ -157,7 +159,7 @@ public void resume() throws DebugException { * @see org.eclipse.debug.core.model.ISuspendResume#suspend() */ public void suspend() throws DebugException { - getThread().suspend(); + getThread().suspend(); } /** @@ -166,11 +168,11 @@ public void suspend() throws DebugException { * @see org.eclipse.debug.core.model.ITerminate#canTerminate() */ public boolean canTerminate() { - return getThread().canTerminate(); + return getThread().canTerminate(); } public boolean isTerminated() { - return getThread().isTerminated(); + return getThread().isTerminated(); } /** @@ -179,7 +181,7 @@ public boolean isTerminated() { * @see org.eclipse.debug.core.model.ITerminate#terminate() */ public void terminate() throws DebugException { - getThread().terminate(); + getThread().terminate(); } /** @@ -188,13 +190,13 @@ public void terminate() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getThread() */ public IThread getThread() { + if (thread == null) { + thread = (IThread)factory.adapt(ThreadUtils.getThread(getHost()), IThread.class); if (thread == null) { - thread = (IThread)factory.adapt(ThreadUtils.getThread(getHost()), IThread.class); - if (thread == null) { - throw new IllegalStateException("can't addapt Thread to IThread."); - } + throw new IllegalStateException("can't addapt Thread to IThread."); } - return thread; + } + return thread; } /** @@ -203,18 +205,18 @@ public IThread getThread() { * @see org.eclipse.debug.core.model.IStackFrame#getVariables() */ public IVariable[] getVariables() throws DebugException { - final List res = new ArrayList(); - - for (Variable variable : getHost().getVariables()) { - final IVariable var = (IVariable)factory.adapt(variable, IVariable.class); - if (var != null) { - res.add(var); - } else { - throw new IllegalStateException("can't addapt Variable to IVariable."); - } + final List res = new ArrayList(); + + for (Variable variable : getHost().getVariables()) { + final IVariable var = (IVariable)factory.adapt(variable, IVariable.class); + if (var != null) { + res.add(var); + } else { + throw new IllegalStateException("can't addapt Variable to IVariable."); } + } - return res.toArray(new IVariable[res.size()]); + return res.toArray(new IVariable[res.size()]); } /** @@ -223,7 +225,7 @@ public IVariable[] getVariables() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#hasVariables() */ public boolean hasVariables() throws DebugException { - return getHost().getVariables().size() > 0; + return getHost().getVariables().size() > 0; } /** @@ -232,7 +234,12 @@ public boolean hasVariables() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber() */ public int getLineNumber() throws DebugException { - return -1; + EObject context = getContext(); + INode node = NodeModelUtils.getNode(context); + if (node != null) { + return node.getStartLine(); + } + return -1; } /** @@ -241,7 +248,7 @@ public int getLineNumber() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getCharStart() */ public int getCharStart() throws DebugException { - return -1; + return -1; } /** @@ -250,7 +257,7 @@ public int getCharStart() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd() */ public int getCharEnd() throws DebugException { - return -1; + return -1; } /** @@ -259,12 +266,12 @@ public int getCharEnd() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getName() */ public String getName() throws DebugException { - return getHost().getName(); + return getHost().getName(); } public IRegisterGroup[] getRegisterGroups() throws DebugException { - // TODO Auto-generated method stub - return null; + // TODO Auto-generated method stub + return null; } /** @@ -273,7 +280,7 @@ public IRegisterGroup[] getRegisterGroups() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups() */ public boolean hasRegisterGroups() throws DebugException { - return getHost().getRegisterGroups().size() > 0; + return getHost().getRegisterGroups().size() > 0; } /** @@ -282,7 +289,7 @@ public boolean hasRegisterGroups() throws DebugException { * @return the {@link StackFrame#getCurrentInstruction() current instruction} */ public EObject getCurrentInstruction() { - return getHost().getCurrentInstruction(); + return getHost().getCurrentInstruction(); } /** @@ -291,7 +298,7 @@ public EObject getCurrentInstruction() { * @return the {@link StackFrame#getContext() context} */ public EObject getContext() { - return getHost().getContext(); + return getHost().getContext(); } } From 90e7c29fd4eccd19f68992e5765ff8867fdfef12 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Fri, 14 Oct 2016 10:35:44 +0200 Subject: [PATCH 033/267] Introduced locator extension point to remove xtext dependencies --- .../plugin.xml | 8 ++ ...scientGenericSequentialModelDebugger.xtend | 6 +- .../ui/launcher/GemocSourceLocator.java | 1 - .../javaengine/ui/launcher/XtextLocator.java | 19 +++ .../META-INF/MANIFEST.MF | 3 +- .../plugins/fr.obeo.dsl.debug.ide/plugin.xml | 1 + .../schema/fr.obeo.dsl.debug.locator.exsd | 116 +++++++++++++++++ .../src/fr/obeo/dsl/debug/ide/Activator.java | 38 +++++- .../ide/adapter/DSLStackFrameAdapter.java | 118 ++++++++++-------- .../obeo/dsl/debug/ide/adapter/ILocator.java | 39 ++++++ 10 files changed, 288 insertions(+), 61 deletions(-) create mode 100644 java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java create mode 100644 simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/schema/fr.obeo.dsl.debug.locator.exsd create mode 100644 simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/ILocator.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/plugin.xml b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/plugin.xml index 10c026eb5..2209697d3 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/plugin.xml +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/plugin.xml @@ -331,4 +331,12 @@ sequence="M1+6"> + + + + diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend index 3c0714bbe..81874970d 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend @@ -225,9 +225,9 @@ public class OmniscientGenericSequentialModelDebugger extends GenericSequentialM val Activator activator = Activator.getDefault() activator.debuggerSupplier = [this] super.engineStarted(executionEngine) - val traceAddons = executionEngine.getAddonsTypedBy(IMultiDimensionalTraceAddon); - val traceAddon = traceAddons.iterator().next(); - traceExplorer = traceAddon.getTraceExplorer(); + val traceAddons = executionEngine.getAddonsTypedBy(IMultiDimensionalTraceAddon) + val traceAddon = traceAddons.iterator().next() + traceExplorer = traceAddon.getTraceExplorer() traceExplorer.addListener(this) } diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java index 8f8f5b78c..a8d4df961 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java @@ -13,7 +13,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.URIUtil; import org.eclipse.debug.core.model.IStackFrame; import org.eclipse.debug.ui.ISourcePresentation; import org.eclipse.emf.common.util.URI; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java new file mode 100644 index 000000000..2de38eb7a --- /dev/null +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java @@ -0,0 +1,19 @@ +package org.gemoc.execution.sequential.javaengine.ui.launcher; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.xtext.nodemodel.INode; +import org.eclipse.xtext.nodemodel.util.NodeModelUtils; + +import fr.obeo.dsl.debug.ide.adapter.ILocator; + +public class XtextLocator implements ILocator { + + @Override + public Location getLocation(EObject eObject) { + INode node = NodeModelUtils.getNode(eObject); + if (node != null) { + return new Location(Type.XTEXT_LOCATION, node.getStartLine()); + } + return new Location(Type.XTEXT_LOCATION, -1); + } +} diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF index 7b6083e44..edf20abe5 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF @@ -11,8 +11,7 @@ Require-Bundle: org.eclipse.debug.core;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.emf.edit;bundle-version="2.7.0", fr.obeo.dsl.debug.edit;bundle-version="1.0.0", - org.eclipse.emf.transaction;bundle-version="1.4.0", - org.eclipse.xtext + org.eclipse.emf.transaction;bundle-version="1.4.0" Export-Package: fr.obeo.dsl.debug.ide, fr.obeo.dsl.debug.ide.adapter, fr.obeo.dsl.debug.ide.adapter.value, diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/plugin.xml b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/plugin.xml index be88892e3..ad5edf08d 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/plugin.xml +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/plugin.xml @@ -1,6 +1,7 @@ + + + + + + + + + [Enter description of this extension point.] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [Enter the first release in which this extension point appears.] + + + + + + + + + [Enter extension point usage example here.] + + + + + + + + + [Enter API information here.] + + + + + + + + + [Enter information about supplied implementation of this extension point.] + + + + + diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/Activator.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/Activator.java index 9a0915d28..735eeccdd 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/Activator.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/Activator.java @@ -10,9 +10,17 @@ *******************************************************************************/ package fr.obeo.dsl.debug.ide; +import fr.obeo.dsl.debug.ide.adapter.ILocator; + import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; @@ -36,12 +44,38 @@ public class Activator extends Plugin { */ private static Activator plugin; + private static List locators; + /** * Constructor. */ public Activator() { } + public List retrieveLocators() { + if (locators == null) { + IExtensionRegistry reg = Platform.getExtensionRegistry(); + IExtensionPoint ep = reg.getExtensionPoint("fr.obeo.dsl.debug.locator"); + IExtension[] extensions = ep.getExtensions(); + ArrayList contributors = new ArrayList(); + for (int i = 0; i < extensions.length; i++) { + IExtension ext = extensions[i]; + IConfigurationElement[] ce = ext.getConfigurationElements(); + for (int j = 0; j < ce.length; j++) { + ILocator locator; + try { + locator = (ILocator) ce[j].createExecutableExtension("class"); + contributors.add(locator); + } catch (CoreException e) { + e.printStackTrace(); + } + } + } + locators = contributors; + } + return locators; + } + /** * {@inheritDoc} * @@ -165,12 +199,12 @@ public void error(String message, Throwable e) { Throwable t = e; if (e instanceof InvocationTargetException) { - t = ((InvocationTargetException)e).getTargetException(); + t = ((InvocationTargetException) e).getTargetException(); } IStatus status; if (t instanceof CoreException) { - status = ((CoreException)t).getStatus(); + status = ((CoreException) t).getStatus(); } else { status = new Status(IStatus.ERROR, PLUGIN_ID, message, e); } diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java index eaed6b06d..63adab23c 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java @@ -13,6 +13,7 @@ import fr.obeo.dsl.debug.StackFrame; import fr.obeo.dsl.debug.ThreadUtils; import fr.obeo.dsl.debug.Variable; +import fr.obeo.dsl.debug.ide.Activator; import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; import java.util.ArrayList; @@ -24,8 +25,6 @@ import org.eclipse.debug.core.model.IThread; import org.eclipse.debug.core.model.IVariable; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.nodemodel.INode; -import org.eclipse.xtext.nodemodel.util.NodeModelUtils; /** * The {@link StackFrame} DSL debug model. @@ -35,7 +34,8 @@ public class DSLStackFrameAdapter extends AbstractDSLDebugElementAdapter implements IStackFrame { /** - * The {@link IThread} containing this {@link IStackFrame}. Needed after popping the stack. + * The {@link IThread} containing this {@link IStackFrame}. Needed after + * popping the stack. */ private IThread thread; @@ -46,12 +46,12 @@ public class DSLStackFrameAdapter extends AbstractDSLDebugElementAdapter impleme * the {@link DSLEclipseDebugIntegration} factory */ public DSLStackFrameAdapter(DSLEclipseDebugIntegration factory) { - super(factory); + super(factory); } @Override public boolean isAdapterForType(Object type) { - return super.isAdapterForType(type) || type == IStackFrame.class; + return super.isAdapterForType(type) || type == IStackFrame.class; } /** @@ -60,8 +60,8 @@ public boolean isAdapterForType(Object type) { * @return the {@link StackFrame} */ public StackFrame getHost() { - assert target instanceof StackFrame; - return (StackFrame)target; + assert target instanceof StackFrame; + return (StackFrame) target; } /** @@ -70,7 +70,7 @@ public StackFrame getHost() { * @see org.eclipse.debug.core.model.IStep#canStepInto() */ public boolean canStepInto() { - return getThread().canStepInto(); + return getThread().canStepInto(); } /** @@ -79,7 +79,7 @@ public boolean canStepInto() { * @see org.eclipse.debug.core.model.IStep#canStepOver() */ public boolean canStepOver() { - return getThread().canStepOver(); + return getThread().canStepOver(); } /** @@ -88,11 +88,11 @@ public boolean canStepOver() { * @see org.eclipse.debug.core.model.IStep#canStepReturn() */ public boolean canStepReturn() { - return getThread().canStepReturn(); + return getThread().canStepReturn(); } public boolean isStepping() { - return getThread().isStepping(); + return getThread().isStepping(); } /** @@ -101,7 +101,7 @@ public boolean isStepping() { * @see org.eclipse.debug.core.model.IStep#stepInto() */ public void stepInto() throws DebugException { - getThread().stepInto(); + getThread().stepInto(); } /** @@ -110,7 +110,7 @@ public void stepInto() throws DebugException { * @see org.eclipse.debug.core.model.IStep#stepOver() */ public void stepOver() throws DebugException { - getThread().stepOver(); + getThread().stepOver(); } /** @@ -119,7 +119,7 @@ public void stepOver() throws DebugException { * @see org.eclipse.debug.core.model.IStep#stepReturn() */ public void stepReturn() throws DebugException { - getThread().stepReturn(); + getThread().stepReturn(); } /** @@ -128,7 +128,7 @@ public void stepReturn() throws DebugException { * @see org.eclipse.debug.core.model.ISuspendResume#canResume() */ public boolean canResume() { - return getThread().canResume(); + return getThread().canResume(); } /** @@ -137,11 +137,11 @@ public boolean canResume() { * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() */ public boolean canSuspend() { - return getThread().canSuspend(); + return getThread().canSuspend(); } public boolean isSuspended() { - return getThread().isSuspended(); + return getThread().isSuspended(); } /** @@ -150,7 +150,7 @@ public boolean isSuspended() { * @see org.eclipse.debug.core.model.ISuspendResume#resume() */ public void resume() throws DebugException { - getThread().resume(); + getThread().resume(); } /** @@ -159,7 +159,7 @@ public void resume() throws DebugException { * @see org.eclipse.debug.core.model.ISuspendResume#suspend() */ public void suspend() throws DebugException { - getThread().suspend(); + getThread().suspend(); } /** @@ -168,11 +168,11 @@ public void suspend() throws DebugException { * @see org.eclipse.debug.core.model.ITerminate#canTerminate() */ public boolean canTerminate() { - return getThread().canTerminate(); + return getThread().canTerminate(); } public boolean isTerminated() { - return getThread().isTerminated(); + return getThread().isTerminated(); } /** @@ -181,7 +181,7 @@ public boolean isTerminated() { * @see org.eclipse.debug.core.model.ITerminate#terminate() */ public void terminate() throws DebugException { - getThread().terminate(); + getThread().terminate(); } /** @@ -190,13 +190,13 @@ public void terminate() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getThread() */ public IThread getThread() { - if (thread == null) { - thread = (IThread)factory.adapt(ThreadUtils.getThread(getHost()), IThread.class); if (thread == null) { - throw new IllegalStateException("can't addapt Thread to IThread."); + thread = (IThread) factory.adapt(ThreadUtils.getThread(getHost()), IThread.class); + if (thread == null) { + throw new IllegalStateException("can't addapt Thread to IThread."); + } } - } - return thread; + return thread; } /** @@ -205,18 +205,18 @@ public IThread getThread() { * @see org.eclipse.debug.core.model.IStackFrame#getVariables() */ public IVariable[] getVariables() throws DebugException { - final List res = new ArrayList(); - - for (Variable variable : getHost().getVariables()) { - final IVariable var = (IVariable)factory.adapt(variable, IVariable.class); - if (var != null) { - res.add(var); - } else { - throw new IllegalStateException("can't addapt Variable to IVariable."); + final List res = new ArrayList(); + + for (Variable variable : getHost().getVariables()) { + final IVariable var = (IVariable) factory.adapt(variable, IVariable.class); + if (var != null) { + res.add(var); + } else { + throw new IllegalStateException("can't addapt Variable to IVariable."); + } } - } - return res.toArray(new IVariable[res.size()]); + return res.toArray(new IVariable[res.size()]); } /** @@ -225,7 +225,7 @@ public IVariable[] getVariables() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#hasVariables() */ public boolean hasVariables() throws DebugException { - return getHost().getVariables().size() > 0; + return getHost().getVariables().size() > 0; } /** @@ -234,12 +234,23 @@ public boolean hasVariables() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber() */ public int getLineNumber() throws DebugException { - EObject context = getContext(); - INode node = NodeModelUtils.getNode(context); - if (node != null) { - return node.getStartLine(); - } - return -1; + final EObject context = getContext(); + int result = -1; + for (ILocator locator : Activator.getDefault().retrieveLocators()) { + final ILocator.Location location = locator.getLocation(context); + switch (location.type) { + case XTEXT_LOCATION: + result = (Integer) location.data; + break; + default: + break; + } + if (result != -1) { + break; + } + } + + return result; } /** @@ -248,7 +259,7 @@ public int getLineNumber() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getCharStart() */ public int getCharStart() throws DebugException { - return -1; + return -1; } /** @@ -257,7 +268,7 @@ public int getCharStart() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd() */ public int getCharEnd() throws DebugException { - return -1; + return -1; } /** @@ -266,12 +277,12 @@ public int getCharEnd() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getName() */ public String getName() throws DebugException { - return getHost().getName(); + return getHost().getName(); } public IRegisterGroup[] getRegisterGroups() throws DebugException { - // TODO Auto-generated method stub - return null; + // TODO Auto-generated method stub + return null; } /** @@ -280,16 +291,17 @@ public IRegisterGroup[] getRegisterGroups() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups() */ public boolean hasRegisterGroups() throws DebugException { - return getHost().getRegisterGroups().size() > 0; + return getHost().getRegisterGroups().size() > 0; } /** * Gets the {@link StackFrame#getCurrentInstruction() current instruction}. * - * @return the {@link StackFrame#getCurrentInstruction() current instruction} + * @return the {@link StackFrame#getCurrentInstruction() current + * instruction} */ public EObject getCurrentInstruction() { - return getHost().getCurrentInstruction(); + return getHost().getCurrentInstruction(); } /** @@ -298,7 +310,7 @@ public EObject getCurrentInstruction() { * @return the {@link StackFrame#getContext() context} */ public EObject getContext() { - return getHost().getContext(); + return getHost().getContext(); } } diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/ILocator.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/ILocator.java new file mode 100644 index 000000000..2534c86e5 --- /dev/null +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/ILocator.java @@ -0,0 +1,39 @@ +package fr.obeo.dsl.debug.ide.adapter; + +import org.eclipse.emf.ecore.EObject; + +/******************************************************************************* + * Copyright (c) 2015 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 + *******************************************************************************/ + +public interface ILocator { + + enum Type { + XTEXT_LOCATION("Xtext"), SIRIUS_LOCATION("Sirius"); + + public final String typeName; + + Type(final String typeName) { + this.typeName = typeName; + } + } + + Location getLocation(EObject eObject); + + class Location { + + final Type type; + + final Object data; + + public Location(final Type type, final Object data) { + this.type = type; + this.data = data; + } + } +} From cfb7bce0215af11bd54f4b2dc4478a2221df9e92 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Wed, 19 Oct 2016 11:08:41 +0200 Subject: [PATCH 034/267] Changed the way equivalence class identifiers are computed --- .../launcher/GemocDebugModelPresentation.java | 17 +--- .../TraceExtractorGeneratorJava.xtend | 86 ++++++++++-------- .../diffviewer/logic/DiffComputer.java | 9 +- .../stategraph/logic/StateGraph.java | 91 ++++++++++--------- 4 files changed, 101 insertions(+), 102 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java index 17fd4f7c5..6e642fd91 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java @@ -36,8 +36,7 @@ public class GemocDebugModelPresentation extends DSLDebugModelPresentation { public IEditorInput getEditorInput(Object element) { final IEditorInput res; - if (element instanceof MSE - && ((MSE) element).getCaller() != null) { + if (element instanceof MSE && ((MSE) element).getCaller() != null) { res = super.getEditorInput(((MSE) element).getCaller()); } else { res = super.getEditorInput(element); @@ -50,14 +49,12 @@ public IEditorInput getEditorInput(Object element) { public String getEditorId(IEditorInput input, Object element) { final String res; - if (element instanceof MSE - && ((MSE) element).getCaller() != null) { + if (element instanceof MSE && ((MSE) element).getCaller() != null) { res = super.getEditorId(input, ((MSE) element).getCaller()); } else { res = super.getEditorId(input, element); } - return res; } @@ -66,8 +63,7 @@ public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) { if (frame instanceof DSLStackFrameAdapter) { changeCurrentStackFrame(frame); if (editorPart instanceof DialectEditor) { - EObject instruction = ((DSLStackFrameAdapter) frame) - .getCurrentInstruction(); + EObject instruction = ((DSLStackFrameAdapter) frame).getCurrentInstruction(); if (instruction instanceof Step) { final List tickedEvents = new ArrayList<>(); tickedEvents.add(((Step) instruction).getMseoccurrence().getMse()); @@ -78,7 +74,7 @@ public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) { callers.add(event.getCaller()); } } - try{ + try { SiriusEditorUtils.showInstructions((DialectEditor) editorPart, new ArrayList(callers)); } catch (Exception e) { e.printStackTrace(); @@ -103,12 +99,9 @@ private void showEvents(List events) { for (MSE event : events) { uris.add(EcoreUtil.getURI(event)); } - for (IMSEPresenter presenter : org.gemoc.executionframework.ui.Activator - .getDefault().getEventPresenters()) { + for (IMSEPresenter presenter : org.gemoc.executionframework.ui.Activator.getDefault().getEventPresenters()) { presenter.present(uris); } } - - } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend index db109037d..d71f8f21d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend @@ -95,6 +95,7 @@ class TraceExtractorGeneratorJava { private def String generateImports() { return ''' + import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -299,59 +300,66 @@ class TraceExtractorGeneratorJava { @Override public Collection> computeStateEquivalenceClasses(List states) { - final Map> statesMap = new HashMap<>(); final Map<«stateFQN», List<«valueFQN»>> stateToValues = new HashMap<>(); - final Map<«stateFQN», Integer> stateToIndex = new HashMap<>(); - // First we build the map of states, grouped by their number of dimensions - // and we associate to each state the list of its values + final List>> stateToValueIndexes = new ArrayList<>(); + final List<«stateFQN»> stateList = new ArrayList<>(); + final List<«valueFQN»> observedValues = new ArrayList<>(); + states.stream().distinct().map(e -> («stateFQN») e).forEach(s -> { - stateToIndex.put(s, stateToIndex.size()); final List<«valueFQN»> values = getAllStateValues(s); stateToValues.put(s, values); - final int size = values.size(); - List<«stateFQN»> tmp = statesMap.get(size); - if (tmp == null) { - tmp = new ArrayList<>(); - statesMap.put(size, tmp); - } - tmp.add(s); + stateList.add(s); }); - final int statesNb = stateToValues.keySet().size(); - - final List<«valueFQN»> observedValues = new ArrayList<>(); - final Map<«stateFQN», Integer> stateToComparisonValue = new HashMap<>(); - for (Entry> entry : statesMap.entrySet()) { - for («stateFQN» state : entry.getValue()) { - final List<«valueFQN»> values = stateToValues.get(state); - // Filling stateTocomparisonValue by side-effect - computeStateComparisonValue(state, values, stateToComparisonValue, observedValues, statesNb); + for («stateFQN» state : stateList) { + final List valueIndexes = new ArrayList<>(); + stateToValueIndexes.add(new SimpleEntry<>(state, valueIndexes)); + final List<«valueFQN»> values = stateToValues.get(state); + for (int i = 0; i < values.size(); i++) { + final «valueFQN» value = values.get(i); + int idx = -1; + for (int j = 0; j < observedValues.size(); j++) { + final EObject v1 = observedValues.get(j); + final EObject v2 = value; + if (compareEObjects(v1, v2).isEmpty()) { + idx = j; + break; + } + } + if (idx != -1) { + valueIndexes.add(idx); + } else { + valueIndexes.add(observedValues.size()); + observedValues.add(value); + } } } - final Map> accumulator = new HashMap<>(); + final List> distinctClasses = stateToValueIndexes.stream() + .map(p -> p.getValue()).distinct().collect(Collectors.toList()); + final Map> result = new HashMap<>(); - stateToComparisonValue.entrySet().stream().forEach(e -> { - final «stateFQN» state = e.getKey(); - final Integer n = e.getValue(); - if (n != null) { - List equivalentStates = accumulator.get(n); - if (equivalentStates == null) { - equivalentStates = new ArrayList<>(); - accumulator.put(n, equivalentStates); - } - if (equivalentStates.isEmpty()) { - equivalentStates.add(state); + stateToValueIndexes.forEach(p -> { + final «stateFQN» state = p.getKey(); + final List indexes = p.getValue(); + int v = distinctClasses.indexOf(indexes); + List equivalentStates = result.get(v); + if (equivalentStates == null) { + equivalentStates = new ArrayList<>(); + result.put(v, equivalentStates); + } + if (equivalentStates.isEmpty()) { + equivalentStates.add(state); + } else { + if (states.indexOf(state) < states.indexOf(equivalentStates.get(0))) { + equivalentStates.add(0, state); } else { - if (stateToIndex.get(state) < stateToIndex.get(equivalentStates.get(0))) { - equivalentStates.add(0, state); - } else { - equivalentStates.add(state); - } + equivalentStates.add(state); } } }); - return accumulator.values(); + + return result.values().stream().collect(Collectors.toList()); } @Override diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java index 778789121..73da7a8f7 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java @@ -435,17 +435,14 @@ private List>> computeEquivalenceClasses(final List> distinctClasses = stateToValueIndexes.stream() + .map(p -> p.getValue()).distinct().collect(Collectors.toList()); final Map>> result = new HashMap<>(); stateToValueIndexes.forEach(p -> { final List state = p.getKey(); final List indexes = p.getValue(); - int v = 0; - for (int i = 0; i < indexes.size(); i++) { - final int index = indexes.get(i); - v += index * Math.pow(valueNb, i); - } + int v = distinctClasses.indexOf(indexes); List> equivalentStates = result.get(v); if (equivalentStates == null) { equivalentStates = new ArrayList<>(); diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java index 6a035093d..22a1ce233 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java @@ -16,7 +16,7 @@ import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StepWrapper; import fr.inria.diverse.trace.gemoc.api.ITraceListener; -public class StateGraph extends DirectedGraphimplements ITraceListener { +public class StateGraph extends DirectedGraph implements ITraceListener { private ITraceExtractor traceExtractor; @@ -52,7 +52,8 @@ public void setUpdateCommand(BiConsumer command) { @Override public void update() { stateToEquivalentState.clear(); - traceExtractor.computeStateEquivalenceClasses().stream().forEach(l -> { + List> equivalenceClasses = traceExtractor.computeStateEquivalenceClasses().stream().collect(Collectors.toList()); + equivalenceClasses.forEach(l -> { EObject equivalentState = null; for (EObject state : l) { if (equivalentStates.contains(state)) { @@ -67,6 +68,7 @@ public void update() { l.remove(equivalentState); l.forEach(s -> { equivalentStates.remove(s); + // Cleaning up old vertice in case the equivalence class of the state changed. removeVertex(stateToNode.remove(s)); }); } @@ -118,59 +120,58 @@ public Edge addEdge(StateWrapper startStateWrapper, StateWrapper en final EObject endState = endStateWrapper.state; final EObject equivalentStartState = stateToEquivalentState.get(startState); final EObject equivalentEndState = stateToEquivalentState.get(endState); - if (equivalentEndState == equivalentStartState) { + if (equivalentEndState == equivalentStartState || equivalentStartState == null || equivalentEndState == null) { return null; - } else { - StateVertex startNode = null; - StateVertex endNode = null; - for (Entry entry : stateToNode.entrySet()) { - final EObject entryState = entry.getKey(); - if (startNode == null) { - if (equivalentStartState == entryState) { - startNode = entry.getValue(); - continue; - } - } - - if (endNode == null) { - if (equivalentEndState == entryState) { - endNode = entry.getValue(); - } + } + StateVertex startNode = null; + StateVertex endNode = null; + for (Entry entry : stateToNode.entrySet()) { + final EObject entryState = entry.getKey(); + if (startNode == null) { + if (equivalentStartState == entryState) { + startNode = entry.getValue(); + continue; } + } - if (startNode != null && endNode != null) { - break; + if (endNode == null) { + if (equivalentEndState == entryState) { + endNode = entry.getValue(); } } - if (startNode == null) { - startNode = addVertex(new StateVertex(traceExtractor.getStateDescription(startStateWrapper.stateIndex), - startStateWrapper.stateIndex)); - stateToNode.put(equivalentStartState, startNode); - } else { - final int startIndex = traceExtractor.getStateWrapper(equivalentStartState).stateIndex; - final String description = traceExtractor.getStateDescription(startIndex); - startNode.setTooltip(description); - startNode.setIndex(startIndex); - } - if (endNode == null) { - endNode = addVertex(new StateVertex(traceExtractor.getStateDescription(endStateWrapper.stateIndex), - endStateWrapper.stateIndex)); - stateToNode.put(equivalentEndState, endNode); - } else { - final int endIndex = traceExtractor.getStateWrapper(equivalentEndState).stateIndex; - final String description = traceExtractor.getStateDescription(endIndex); - endNode.setTooltip(description); - endNode.setIndex(endIndex); + if (startNode != null && endNode != null) { + break; } + } + + if (startNode == null) { + startNode = addVertex(new StateVertex(traceExtractor.getStateDescription(startStateWrapper.stateIndex), + startStateWrapper.stateIndex)); + stateToNode.put(equivalentStartState, startNode); + } else { + final int startIndex = traceExtractor.getStateWrapper(equivalentStartState).stateIndex; + final String description = traceExtractor.getStateDescription(startIndex); + startNode.setTooltip(description); + startNode.setIndex(startIndex); + } + if (endNode == null) { + endNode = addVertex(new StateVertex(traceExtractor.getStateDescription(endStateWrapper.stateIndex), + endStateWrapper.stateIndex)); + stateToNode.put(equivalentEndState, endNode); + } else { + final int endIndex = traceExtractor.getStateWrapper(equivalentEndState).stateIndex; + final String description = traceExtractor.getStateDescription(endIndex); + endNode.setTooltip(description); + endNode.setIndex(endIndex); + } - Edge result = getEdge(startNode, endNode); + Edge result = getEdge(startNode, endNode); - if (result == null) { - result = addEdge(startNode, endNode); - } - return result; + if (result == null) { + result = addEdge(startNode, endNode); } + return result; } public void clear() { From f0cd59f681b8ab21ff8974a4bba08cd70c5e4c6d Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Fri, 21 Oct 2016 11:13:47 +0200 Subject: [PATCH 035/267] Added variables to all stackframes --- .../ui/debug/AbstractGemocDebugger.java | 23 +++++++++++++++---- .../debug/GenericSequentialModelDebugger.java | 5 +--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java index a8f75543a..688f22989 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java @@ -10,11 +10,13 @@ *******************************************************************************/ package org.gemoc.executionframework.engine.ui.debug; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.Deque; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -252,7 +254,7 @@ private boolean mutableDataChanged(MutableField mutableData, Object value) { } abstract protected void updateStack(String threadName, EObject instruction); - + protected void updateVariables(String threadName) { List changes = modelChangeListenerAddon.getChanges(this); for (FieldChange change : changes) { @@ -302,7 +304,11 @@ protected void updateVariables(String threadName) { String frameName = "Global context : " + executedModelRoot.eClass().getName(); for (MutableField m : changed) { variable(threadName, frameName, "mutable data", m.getName(), m.getValue(), true); - // m.getMutableProperty().eContainer(); + } + for (String name : stackFrameNames) { + for (MutableField m : changed) { + variable(threadName, name, "mutable data", m.getName(), m.getValue(), true); + } } if (!nextSuspendMutableFields.isEmpty()) { @@ -357,15 +363,24 @@ private Object getValue(MutableField data, String value) { return res; } + private Deque stackFrameNames = new ArrayDeque<>(); + @Override public void pushStackFrame(String threadName, String frameName, EObject context, EObject instruction) { super.pushStackFrame(threadName, frameName, context, instruction); + stackFrameNames.push(frameName); for (MutableField m : mutableFields) { - if (m.geteObject().eContainer() == context) { +// if (m.geteObject().eContainer() == context) { variable(threadName, frameName, "mutable data", m.getName(), m.getValue(), true); - } +// } } } + + @Override + public void popStackFrame(String threadName) { + super.popStackFrame(threadName); + stackFrameNames.pop(); + } @Override public Object getVariableValue(String threadName, String stackName, String variableName, String value) { diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java index d089a508a..0fb78afc6 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java @@ -23,6 +23,7 @@ import org.eclipse.xtext.naming.QualifiedName; import org.gemoc.executionframework.engine.core.EngineStoppedException; import org.gemoc.executionframework.engine.ui.debug.AbstractGemocDebugger; +import org.gemoc.executionframework.engine.ui.debug.MutableField; import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; @@ -134,19 +135,15 @@ public boolean test(IExecutionEngine t, MSEOccurrence u) { }); } - Deque stackFrameNames = new ArrayDeque<>(); - @Override public void pushStackFrame(String threadName, String frameName, EObject context, EObject instruction) { super.pushStackFrame(threadName, frameName, context, instruction); - stackFrameNames.push(frameName); nbStackFrames++; } @Override public void popStackFrame(String threadName) { super.popStackFrame(threadName); - stackFrameNames.pop(); nbStackFrames--; } From fcd11754343af39a98bb0952b0e3ed349d2ab0ad Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Mon, 24 Oct 2016 17:38:00 +0200 Subject: [PATCH 036/267] Fixed bug in state label computation in the multidimensional timeline --- .../timeline/views/MultidimensionalTimelineRenderer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index b1a82e016..1c03c633e 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -11,6 +11,7 @@ package org.gemoc.sequential_addons.multidimensional.timeline.views; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -410,7 +411,7 @@ private HBox createValueTraceLine(int traceIndex) { private String computeStateLabel(int stateNumber) { if (stateNumber > 999) { - return (stateNumber / 1000) + "k" + ((stateNumber % 1000) / 10); + return (stateNumber / 1000) + "k" + ((stateNumber % 1000) / 100); } else { return "" + stateNumber; } From 3b8005ea5d5391c14d3e4cd9ed737d8dc357d91d Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Thu, 27 Oct 2016 10:42:36 +0200 Subject: [PATCH 037/267] documentation clarification about isCurrentInstruction and hasBeenActivated roles --- .../sirius/services/AbstractGemocAnimatorServices.java | 3 +++ .../sirius/services/AbstractGemocDebuggerServices.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index 33d93831a..36a766be7 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -441,6 +441,9 @@ public static IModelAnimator getAnimator() { * Tells if the given {@link EObject instruction} is a currently * {@link IModelAnimator#activate(LogicalStep) activated}. * + * This service works in a similar way as {@link AbstractGemocDebuggerServices isCurrentInstruction} + * but will be activated even if the engine in not paused in order to act as an animation. + * * @param instruction * the {@link EObject instruction} * @return true if the given {@link EObject instruction} is a diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java index 0eee3f6bf..cfcf1449c 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java @@ -667,6 +667,9 @@ protected Set getBreakpoints(EObject instruction) { * instruction. A debugged instruction in this context is an instruction a * debug target is suspended on. * + * This service works in a similar way as {@link AbstractGemocAnimatorServices hasBeenActivated} + * but will be activated only when the engine is paused. In addition, its content is related to the selected stack frame. + * * @param instruction * the {@link EObject instruction} * @return true if the given {@link EObject instruction} is a From 7cf7973b437d542e51e7c9383264b0df6edd8cb5 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sat, 29 Oct 2016 09:23:16 +0200 Subject: [PATCH 038/267] Move trace management code generation code in dedicated "codegen" package --- .../{ => codegen}/TraceConstructorGeneratorJava.xtend | 3 ++- .../generator/{ => codegen}/TraceExplorerGeneratorJava.xtend | 2 +- .../generator/{ => codegen}/TraceExtractorGeneratorJava.xtend | 3 ++- .../generator/{ => codegen}/TraceManagerGeneratorJava.xtend | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) rename trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/{ => codegen}/TraceConstructorGeneratorJava.xtend (99%) rename trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/{ => codegen}/TraceExplorerGeneratorJava.xtend (99%) rename trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/{ => codegen}/TraceExtractorGeneratorJava.xtend (99%) rename trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/{ => codegen}/TraceManagerGeneratorJava.xtend (99%) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend similarity index 99% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceConstructorGeneratorJava.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 05a3e4e56..04e7e343e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -1,4 +1,5 @@ -package fr.inria.diverse.trace.plugin.generator +package fr.inria.diverse.trace.plugin.generator.codegen + import ecorext.ClassExtension import ecorext.Rule diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExplorerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend similarity index 99% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExplorerGeneratorJava.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend index f4561f37e..ad6916d2a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExplorerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend @@ -1,4 +1,4 @@ -package fr.inria.diverse.trace.plugin.generator +package fr.inria.diverse.trace.plugin.generator.codegen import ecorext.ClassExtension import ecorext.Rule diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend similarity index 99% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend index d71f8f21d..cde33a797 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend @@ -1,4 +1,5 @@ -package fr.inria.diverse.trace.plugin.generator +package fr.inria.diverse.trace.plugin.generator.codegen + import ecorext.Rule import fr.inria.diverse.trace.commons.CodeGenUtil diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceManagerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend similarity index 99% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceManagerGeneratorJava.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend index 87b08092a..c1ab0975c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/TraceManagerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend @@ -1,4 +1,5 @@ -package fr.inria.diverse.trace.plugin.generator +package fr.inria.diverse.trace.plugin.generator.codegen + import ecorext.ClassExtension import ecorext.Rule From 031c2aacc51543ae9eeeebb55b9f11e85ac3831d Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sat, 29 Oct 2016 09:25:38 +0200 Subject: [PATCH 039/267] Move old trace EMF project generator in dedicated "fakewizard" package --- .../FakeEcoreImporterWizard.java | 2 +- .../FakeModelImporterDetailPage.java | 16 +++++-- .../FakeModelImporterPackagePage.java | 2 +- .../FakeWizardEMFProjectGenerator.xtend} | 46 ++++++------------- 4 files changed, 28 insertions(+), 38 deletions(-) rename trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/{ => fakewizard}/FakeEcoreImporterWizard.java (98%) rename trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/{ => fakewizard}/FakeModelImporterDetailPage.java (79%) rename trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/{ => fakewizard}/FakeModelImporterPackagePage.java (98%) rename trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/{EMFProjectGenerator.xtend => fakewizard/FakeWizardEMFProjectGenerator.xtend} (84%) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/FakeEcoreImporterWizard.java b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeEcoreImporterWizard.java similarity index 98% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/FakeEcoreImporterWizard.java rename to trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeEcoreImporterWizard.java index 0043a6112..24214546c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/FakeEcoreImporterWizard.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeEcoreImporterWizard.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator; +package fr.inria.diverse.trace.plugin.generator.fakewizard; import java.lang.reflect.InvocationTargetException; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/FakeModelImporterDetailPage.java b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterDetailPage.java similarity index 79% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/FakeModelImporterDetailPage.java rename to trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterDetailPage.java index fbd76617d..3880a4e83 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/FakeModelImporterDetailPage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterDetailPage.java @@ -8,8 +8,9 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator; +package fr.inria.diverse.trace.plugin.generator.fakewizard; +import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.importer.ModelImporter; import org.eclipse.emf.importer.ui.contribution.base.ModelImporterDetailPage; import org.eclipse.swt.widgets.Composite; @@ -19,8 +20,7 @@ public class FakeModelImporterDetailPage extends ModelImporterDetailPage { private Composite fakeParent; - public FakeModelImporterDetailPage(ModelImporter modelImporter, - String pageName) { + public FakeModelImporterDetailPage(ModelImporter modelImporter, String pageName) { super(modelImporter, pageName); } @@ -41,7 +41,13 @@ public void fakeLoad() { @Override protected void internalSetGenModelFileName(String name) { if (usingInternalSetName && showGenModel() && name != null) { - getModelImporter().setGenModelFileName(name); - } + getModelImporter().setGenModelFileName(name); + } + } + + @Override + protected void handleDiagnostic(Diagnostic diagnostic) { + // super.handleDiagnostic(diagnostic); + //handleDiagnostic(diagnostic, null, null, null); } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/FakeModelImporterPackagePage.java b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterPackagePage.java similarity index 98% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/FakeModelImporterPackagePage.java rename to trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterPackagePage.java index a302bb95c..605ce9cc8 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/FakeModelImporterPackagePage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterPackagePage.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator; +package fr.inria.diverse.trace.plugin.generator.fakewizard; import java.io.IOException; import java.util.HashSet; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/EMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend similarity index 84% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/EMFProjectGenerator.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend index c39b421d8..4e427cd33 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/EMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend @@ -1,19 +1,14 @@ -package fr.inria.diverse.trace.plugin.generator +package fr.inria.diverse.trace.plugin.generator.fakewizard -import java.util.HashSet -import java.util.List -import java.util.Set -import org.eclipse.core.resources.IProject +import fr.inria.diverse.trace.plugin.generator.AbstractEMFProjectGenerator import org.eclipse.core.resources.ResourcesPlugin import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.emf.codegen.ecore.genmodel.GenModel -import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import org.eclipse.emf.codegen.ecore.genmodel.generator.GenBaseGeneratorAdapter import org.eclipse.emf.codegen.ecore.genmodel.presentation.GeneratorUIUtil.GeneratorOperation import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil import org.eclipse.emf.common.command.BasicCommandStack import org.eclipse.emf.common.util.URI -import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.plugin.EcorePlugin import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain @@ -22,34 +17,17 @@ import org.eclipse.swt.widgets.Composite import org.eclipse.swt.widgets.Display import org.eclipse.swt.widgets.Shell import org.eclipse.ui.PlatformUI -import org.eclipse.xtend.lib.annotations.Accessors -class EMFProjectGenerator { +class FakeWizardEMFProjectGenerator extends AbstractEMFProjectGenerator { - // Inputs - private val URI ecoreURI - private val String projectName - - // Outputs - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) - var IProject project - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) - var List referencedGenPackages - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) - val Set rootPackages = new HashSet - - // Transient - private var GenModel genModel + private var Composite rootParent + private var FakeEcoreImporterWizard f new(String projectName, URI ecoreURI) { - this.projectName = projectName - this.ecoreURI = ecoreURI + super(projectName, ecoreURI) } - private var Composite rootParent - private var FakeEcoreImporterWizard f - - def void generateBaseEMFProject() { + override generateBaseEMFProject() { // Creating the project and retrieving its path project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) @@ -58,21 +36,27 @@ class EMFProjectGenerator { // TODO This is horrible: the display is locked during the fake UI handling :D Display.getDefault().syncExec( [ + // We skip the previous wizard (emf project) and we directly configure the ecore import wizard appropriately rootParent = new Shell f = new FakeEcoreImporterWizard(rootParent) f.genModelProjectPath = projectPath + // Setting up ecore URI and loading it f.fakeDetailPage.fakeSetURI(ecoreURI.toString) f.fakeDetailPage.fakeLoad + // We choose to use all referenced gen models and ann (remaining) epackages f.fakePackagePage.checkAll(ecoreURI) + // Here we do the actual projet generation f.performFinish + // Storing the genmodel genModel = f.modelImporter.genModel referencedGenPackages = f.fakePackagePage.referencedGenPackages.immutableCopy rootPackages.addAll(f.fakePackagePage.checkedEPackages) + // Finally we disband our fakes wizard and root f.dispose rootParent.dispose @@ -80,7 +64,7 @@ class EMFProjectGenerator { } - def void generateModelCode() { + override generateModelCode() { PlatformUI.workbench.activeWorkbenchWindow.run(false, true, [ m | generateModelCode(m) ]) @@ -95,7 +79,7 @@ class EMFProjectGenerator { * * Note that this code can certainly by simplified, if time is taken to find useless lines. */ - def void generateModelCode(IProgressMonitor m) { + override generateModelCode(IProgressMonitor m) { // --------- Start code from org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditor.initializeEditingDomain() // From e7cdc66c962b40e91f000c77e7f0a523b94afb42 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sat, 29 Oct 2016 09:26:12 +0200 Subject: [PATCH 040/267] Create abstract class for EMF project generators + adapt generator main class --- .../AbstractEMFProjectGenerator.xtend | 52 +++++++++++++++++++ .../GenericTracePluginGenerator.xtend | 20 ++++--- 2 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend new file mode 100644 index 000000000..ef2b85895 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend @@ -0,0 +1,52 @@ +package fr.inria.diverse.trace.plugin.generator + +import org.eclipse.emf.common.util.URI +import org.eclipse.xtend.lib.annotations.Accessors +import org.eclipse.core.resources.IProject +import java.util.List +import java.util.Set +import org.eclipse.emf.codegen.ecore.genmodel.GenPackage +import org.eclipse.emf.ecore.EPackage +import java.util.HashSet +import org.eclipse.emf.codegen.ecore.genmodel.GenModel +import org.eclipse.core.runtime.IProgressMonitor + +abstract class AbstractEMFProjectGenerator { + + // Inputs + protected val URI ecoreURI + protected val String projectName + + // Outputs + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + protected var IProject project + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + protected var List referencedGenPackages + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + protected val Set rootPackages = new HashSet + + // Transient + protected var GenModel genModel + + new(String projectName, URI ecoreURI) { + this.projectName = projectName + this.ecoreURI = ecoreURI + } + + /** + * Creates a new EMF project with the ecore file and the genmodel in the "model" folder + * also mages project, referencedGenPackages and rootPackages available. + */ + def void generateBaseEMFProject() + + /** + * Generates the code using the genmodel. + */ + def void generateModelCode() + + /** + * Generates the code using the genmodel (within a Job). + */ + def void generateModelCode(IProgressMonitor m) + +} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend index 8366f983c..31220d202 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend @@ -25,6 +25,10 @@ import org.eclipse.jdt.core.JavaCore import org.eclipse.ui.PlatformUI import org.eclipse.xtend.lib.annotations.Accessors import tracingannotations.TracingAnnotations +import fr.inria.diverse.trace.plugin.generator.codegen.TraceConstructorGeneratorJava +import fr.inria.diverse.trace.plugin.generator.codegen.TraceExplorerGeneratorJava +import fr.inria.diverse.trace.plugin.generator.codegen.TraceExtractorGeneratorJava +import fr.inria.diverse.trace.plugin.generator.fakewizard.FakeWizardEMFProjectGenerator /** * Glues the generators : trace metamodel, emf project and trace manager @@ -134,9 +138,10 @@ class GenericTracePluginGenerator { tmmResource.save(null) // Generate EMF project - val EMFProjectGenerator emfGen = new EMFProjectGenerator(pluginName, tmmResource.URI) + val FakeWizardEMFProjectGenerator emfGen = new FakeWizardEMFProjectGenerator(pluginName, tmmResource.URI) emfGen.generateBaseEMFProject - referencedGenPackages = emfGen.referencedGenPackages.map[findNestedGenpackages].flatten.toSet + val referencedGenPackagesRoots = emfGen.referencedGenPackages + referencedGenPackages = referencedGenPackagesRoots.map[findNestedGenpackages].flatten.toSet // At this point the wizard has created and reloaded a new resource with the trace metamodel // We access this new metamodel/resource thanks to emfGen.rootPackages @@ -165,20 +170,21 @@ class GenericTracePluginGenerator { ManifestUtil.addToPluginManifest(project, m, "org.eclipse.emf.compare") ManifestUtil.addToPluginManifest(project, m, "org.gemoc.executionframework.engine") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.xtext") - + if (gemoc) { ManifestUtil.addToPluginManifest(project, m, "org.gemoc.commons.eclipse") } this.traceability = tmmgenerator.traceability - + // Generate trace constructor val TraceConstructorGeneratorJava tconstructorgen = new TraceConstructorGeneratorJava(languageName, pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, abstractSyntax, partialTraceManagement) traceConstructorClassName = tconstructorgen.className - packageFragment.createCompilationUnit(traceConstructorClassName + ".java", tconstructorgen.generateCode, true, m) - + packageFragment.createCompilationUnit(traceConstructorClassName + ".java", tconstructorgen.generateCode, true, + m) + // Generate trace explorer val TraceExplorerGeneratorJava texplorergen = new TraceExplorerGeneratorJava(languageName, pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, @@ -192,7 +198,7 @@ class GenericTracePluginGenerator { abstractSyntax, partialTraceManagement) traceExtractorClassName = textractorgen.className packageFragment.createCompilationUnit(traceExtractorClassName + ".java", textractorgen.generateCode, true, m) - + } } From 87f4d430d4a78d375a86dea333b5a065a99f876f Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sat, 29 Oct 2016 09:26:33 +0200 Subject: [PATCH 041/267] Add early new implementation of EMF project generator (based on Tanja's code) --- .../clean/NewEMFProjectGenerator.xtend | 369 ++++++++++++++++++ 1 file changed, 369 insertions(+) create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend new file mode 100644 index 000000000..a1369acd7 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend @@ -0,0 +1,369 @@ +package fr.inria.diverse.trace.plugin.generator.clean + +import java.io.IOException +import java.util.Collection +import java.util.Collections +import java.util.HashSet +import java.util.List +import java.util.Map +import java.util.Set +import java.util.jar.Manifest +import org.eclipse.core.resources.IFile +import org.eclipse.core.resources.IFolder +import org.eclipse.core.resources.IProject +import org.eclipse.core.resources.ResourcesPlugin +import org.eclipse.core.runtime.CoreException +import org.eclipse.core.runtime.IPath +import org.eclipse.core.runtime.IProgressMonitor +import org.eclipse.core.runtime.Path +import org.eclipse.emf.codegen.ecore.generator.Generator +import org.eclipse.emf.codegen.ecore.genmodel.GenJDKLevel +import org.eclipse.emf.codegen.ecore.genmodel.GenModel +import org.eclipse.emf.codegen.ecore.genmodel.GenModelFactory +import org.eclipse.emf.codegen.ecore.genmodel.GenPackage +import org.eclipse.emf.codegen.ecore.genmodel.GenParameter +import org.eclipse.emf.codegen.ecore.genmodel.generator.GenBaseGeneratorAdapter +import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil +import org.eclipse.emf.codegen.util.CodeGenUtil +import org.eclipse.emf.common.util.BasicMonitor +import org.eclipse.emf.common.util.Diagnostic +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.common.util.UniqueEList +import org.eclipse.emf.ecore.EObject +import org.eclipse.emf.ecore.EPackage +import org.eclipse.emf.ecore.EParameter +import org.eclipse.emf.ecore.EStructuralFeature.Setting +import org.eclipse.emf.ecore.EcorePackage +import org.eclipse.emf.ecore.plugin.EcorePlugin +import org.eclipse.emf.ecore.resource.Resource +import org.eclipse.emf.ecore.resource.ResourceSet +import org.eclipse.emf.ecore.util.EcoreUtil +import org.eclipse.emf.ecore.util.EcoreUtil.Copier +import fr.inria.diverse.trace.plugin.generator.AbstractEMFProjectGenerator + +public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { + + public static val String MODEL_GEN_FOLDER = "model-gen"; + + protected IProgressMonitor progressMonitor; + + protected ResourceSet resourceSet; + protected IProject xmofProject; + + protected URI modelGenFolderURI; + protected String srcFolderPathString; + + new(String projectName, URI ecoreURI) { + super(projectName, ecoreURI) + } + + private def boolean generateCode(Resource xmofModelResource, IProgressMonitor progressMonitor) { + this.progressMonitor = progressMonitor; + this.resourceSet = xmofModelResource.getResourceSet(); + this.xmofProject = getXMOFProject(xmofModelResource); + + // setup model-gen folder for saving temporary models + this.modelGenFolderURI = setupModelGenFolder(); + + // setup src folder for model code generation + this.srcFolderPathString = setupSrcFolder(); + + // create temporary Ecore metamodel + // val EPackage rootEPackage = generateEcoreModel(xmofModelResource); + // check whether all referenced packages can be loaded + checkReferencedPackages(xmofModelResource); + + // create temporary Genmodel, set initialize by load to true + // val GenModel genModel = generateGenModel(rootEPackage, + // modelGenFolderURI); + val GenModel genModel = generateGenModel((xmofModelResource.getContents().get(0)) as EPackage, + modelGenFolderURI); + + // generate code + return generateCode(genModel, progressMonitor); + } + + private def IProject getXMOFProject(Resource xmofModelResource) { + val URI xmofModelURI = xmofModelResource.getURI(); + val IPath xmofModelPath = new Path(xmofModelURI.toPlatformString(true)); + val IFile xmofModelFile = ResourcesPlugin.getWorkspace().getRoot().getFile(xmofModelPath); + val IProject xmofProject = xmofModelFile.getProject(); + return xmofProject; + } + + private def URI setupModelGenFolder() { + var URI modelGenFolderURI = null; + val IFolder modelGenFolder = xmofProject.getFolder(MODEL_GEN_FOLDER); + if (!modelGenFolder.exists()) { + try { + modelGenFolder.create(true, true, null); + } catch (CoreException e) { + throw new RuntimeException("The folder \'model-gen\' could not be created.", e); + } + } + modelGenFolderURI = URI.createPlatformResourceURI(modelGenFolder.getFullPath().toString(), true); + return modelGenFolderURI; + } + + private def String setupSrcFolder() { + var String srcFolderPathString = null; + val IFolder srcFolder = xmofProject.getFolder("src"); + if (!srcFolder.exists()) { + try { + srcFolder.create(true, true, null); + } catch (CoreException e) { + throw new RuntimeException("The source folder \'src\' could not be created.", e); + } + } + srcFolderPathString = srcFolder.getFullPath().toString(); + return srcFolderPathString; + } + + protected def EPackage generateEcoreModel(Resource xmofModelResource) { + val Resource ecoreModelResource = copyXMOFModel(xmofModelResource); + val EPackage rootEPackage = ecoreModelResource.getContents().get(0) as EPackage; + // TODO importantto remove these? + // removeBehaviors(rootEPackage); + save(ecoreModelResource); + return rootEPackage; + } + + private def Resource copyXMOFModel(Resource xmofModelResource) { + val String ecoreModelFileName = xmofModelResource.getURI().trimFileExtension().appendFileExtension("ecore"). + lastSegment().toString(); + val URI ecoreModelURI = this.modelGenFolderURI.appendSegment(ecoreModelFileName); + val Resource ecoreModelResource = resourceSet.createResource(ecoreModelURI); + + val Copier copier = new Copier(); + ecoreModelResource.getContents().addAll((copier.copyAll(xmofModelResource.getContents()))); + copier.copyReferences(); + return ecoreModelResource; + } + +// private def void removeBehaviors(EPackage ePackage) { +// for (TreeIterator < EObject > eAllContents = ePackage.eAllContents(); eAllContents.hasNext();) { +// var EObject eObject = eAllContents.next(); +// if (eObject instanceof BehavioredEClass) { +// val BehavioredEClass behavioredEClass = (BehavioredEClass) +// eObject; +// behavioredEClass.getOwnedBehavior().clear(); +// } else if (eObject instanceof BehavioredEOperation) { +// val BehavioredEOperation behavioredEOperation = (BehavioredEOperation) +// eObject; +// behavioredEOperation.getMethod().clear(); +// behavioredEOperation.getEContainingClass().getEOperations().remove(behavioredEOperation); +// } else if (eObject instanceof CallBehaviorAction) { +// val CallBehaviorAction callBehaviorAction = (CallBehaviorAction) +// eObject; +// callBehaviorAction.setBehavior(null); +// } else if (eObject instanceof DecisionNode) { +// val DecisionNode decisionNode = (DecisionNode) +// eObject; +// decisionNode.setDecisionInput(null); +// } else if (eObject instanceof ReduceAction) { +// val ReduceAction reduceAction = (ReduceAction) +// eObject; +// reduceAction.setReducer(null); +// } +// } +// } + private def void checkReferencedPackages(Resource xmofModelResource) { + val Set missingPackages = new HashSet(); + val Map> externalCrossReferences = EcoreUtil.ExternalCrossReferencer.find( + xmofModelResource); + for (EObject eObject : externalCrossReferences.keySet()) { + if (eObject.eIsProxy()) { + missingPackages.add(EcoreUtil.getURI(eObject).trimFragment()); + } + } + + if (missingPackages.size() > 0) { + + val String message = "Unable to load the following referenced resource" + + (if(missingPackages.size() == 1) "" else "s") + ": " + missingPackages.toString() + + throw new RuntimeException(message); + } + } + + protected def GenModel generateGenModel(EPackage rootEPackage, URI modelGenFolderURI) { + val Resource genModelResource = createGenModel(rootEPackage); + val GenModel genModel = genModelResource.getContents().get(0) as GenModel; + setInitializeByLoad(genModel); + save(genModelResource); + return genModel; + } + + protected def Resource createGenModel(EPackage rootEPackage) { + val Resource ecoreModelResource = rootEPackage.eResource(); + val String genModelFileName = ecoreModelResource.getURI().trimFileExtension().appendFileExtension("genmodel"). + lastSegment().toString(); + val URI genModelURI = this.modelGenFolderURI.appendSegment(genModelFileName); + + val Resource genModelResource = resourceSet.createResource(genModelURI); + val GenModel genModel = GenModelFactory.eINSTANCE.createGenModel(); + genModelResource.getContents().add(genModel); + + val IFolder srcFolder = xmofProject.getFolder("src"); + genModel.setModelDirectory(srcFolder.getFullPath().toString()); + genModel.getForeignModel().add(ecoreModelResource.getURI().toString()); + genModel.setModelName(getModelName(genModelURI)); + genModel.setModelPluginID(getPluginID(genModelURI)); + + // genModel.setOperationReflection(true); + // genModel.setMinimalReflectiveMethods(true); + genModel.setRootExtendsClass("org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"); + genModel.setComplianceLevel(getComplicanceLevel()); + genModel.setImportOrganizing(true); + + genModel.initialize(Collections.singleton(rootEPackage)); + setMissingParameterTypes(genModel); + + val List missingGenPackages = computeMissingGenPackages(genModel); + genModel.getUsedGenPackages().addAll(missingGenPackages); + + return genModelResource; + } + + protected def String getModelName(URI genModelURI) { + val String genModelFileName = genModelURI.trimFileExtension().lastSegment(); + val String modelName = genModelFileName.substring(0, 1).toUpperCase() + genModelFileName.substring(1); + return modelName; + } + + protected def String getPluginID(URI uri) { + var String pluginID = ""; + val IFile manifestFile = xmofProject.getFolder("META-INF").getFile("MANIFEST.MF"); + try { + val Manifest manifest = new Manifest(manifestFile.getContents()); + var String symbolicName = manifest.getMainAttributes().getValue("Bundle-SymbolicName"); + if (symbolicName != null) { + val int index = symbolicName.indexOf(";"); + if (index > 0) { + symbolicName = symbolicName.substring(0, index); + } + pluginID = symbolicName.trim(); + } + } catch (Exception e) { + throw new RuntimeException( + "Could not find manifest file \'" + manifestFile.getFullPath().toString() + "\'.", e); + } + return pluginID; + } + + private def GenJDKLevel getComplicanceLevel() { + val String complianceLevel = CodeGenUtil.EclipseUtil.getJavaComplianceLevel(xmofProject); + if ("1.4".equals(complianceLevel)) { + return GenJDKLevel.JDK14_LITERAL; + } else if ("1.5".equals(complianceLevel)) { + return GenJDKLevel.JDK50_LITERAL; + } else if ("1.6".equals(complianceLevel)) { + return GenJDKLevel.JDK60_LITERAL; + } else if ("1.7".equals(complianceLevel)) { + return GenJDKLevel.JDK70_LITERAL; + } else { + return GenJDKLevel.JDK80_LITERAL; + } + } + + /** + * In case of missing parameter types, the types are temporarily set to + * EObject + * + * @param genModel + */ + private def void setMissingParameterTypes(GenModel genModel) { + for (genModelElement : genModel.eAllContents().toSet) { + if (genModelElement instanceof GenParameter) { + val GenParameter genParameter = genModelElement as GenParameter; + val EParameter ecoreParameter = genParameter.getEcoreParameter(); + if (ecoreParameter.getEType() == null) { + ecoreParameter.setEType(EcorePackage.eINSTANCE.getEObject()); + } + } + } + } + + protected def List computeMissingGenPackages(GenModel genModel) { + val List missingGenPackages = new UniqueEList(); + val Map genModelLocationMapTargetEnvironment = EcorePlugin. + getEPackageNsURIToGenModelLocationMap(true); + val Map genModelLocationMapEnvironment = EcorePlugin.getEPackageNsURIToGenModelLocationMap(false); + for (EPackage ePackage : genModel.getMissingPackages()) { + if (ePackage != null) { // happens for activities + var URI missingGenModelURI = genModelLocationMapEnvironment.get(ePackage.getNsURI()); + if (missingGenModelURI == null) { + missingGenModelURI = genModelLocationMapTargetEnvironment.get(ePackage.getNsURI()); + } + if (missingGenModelURI == null) { + throw new RuntimeException( + "Unable to load generator model of required package \'" + ePackage.getNsURI() + "\'."); + } + var Resource missingGenModelResource = null; + try { + missingGenModelResource = resourceSet.getResource(missingGenModelURI, true); + } catch (RuntimeException e) { + throw new RuntimeException( + "Unable to load generator model of required package \'" + ePackage.getNsURI() + "\'."); + } + val GenModel missingGenModel = missingGenModelResource.getContents().get(0) as GenModel; + missingGenPackages.addAll(missingGenModel.getGenPackages()); + } + } + return missingGenPackages; + } + + protected def void setInitializeByLoad(GenModel genModel) { + for (GenPackage genPackage : genModel.getGenPackages()) { + setInitializeByLoad(genPackage); + } + } + + private def void setInitializeByLoad(GenPackage genPackage) { + genPackage.setLoadInitialization(true); + for (GenPackage subGenPackage : genPackage.getSubGenPackages()) { + setInitializeByLoad(subGenPackage); + } + } + + protected def boolean generateCode(GenModel genModel, IProgressMonitor progressMonitor) { + var boolean success = false; + prepareGenModelForCodeGeneration(genModel); + val Generator generator = GenModelUtil.createGenerator(genModel); + val boolean canGenerate = generator.canGenerate(genModel, GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE); + if (canGenerate) { + val Diagnostic diagnostic = generator.generate(genModel, GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE, + BasicMonitor.toMonitor(progressMonitor)); + if (diagnostic.getSeverity() == Diagnostic.OK) { + success = true; + } + } + return success; + } + + protected def void prepareGenModelForCodeGeneration(GenModel genModel) { + genModel.reconcile(); + genModel.setCanGenerate(true); + } + + private def void save(Resource resource) { + try { + resource.save(Collections.EMPTY_MAP); + } catch (IOException e) { + throw new RuntimeException("Could not save resource \'" + resource.getURI() + "\'.", e); + } + } + + override generateBaseEMFProject() { + throw new UnsupportedOperationException("TODO: auto-generated method stub") + } + + override generateModelCode() { + throw new UnsupportedOperationException("TODO: auto-generated method stub") + } + + override generateModelCode(IProgressMonitor m) { + throw new UnsupportedOperationException("TODO: auto-generated method stub") + } + +} From f0a5c7816c2b2968994d47bfab50576c52199314 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sat, 29 Oct 2016 10:15:57 +0200 Subject: [PATCH 042/267] Add monitor parameter to plugin project generator api --- .../generator/AbstractEMFProjectGenerator.xtend | 11 ++++++++--- .../generator/GenericTracePluginGenerator.xtend | 2 +- .../fakewizard/FakeWizardEMFProjectGenerator.xtend | 9 ++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend index ef2b85895..2a062553c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend @@ -10,6 +10,7 @@ import org.eclipse.emf.ecore.EPackage import java.util.HashSet import org.eclipse.emf.codegen.ecore.genmodel.GenModel import org.eclipse.core.runtime.IProgressMonitor +import org.eclipse.ui.PlatformUI abstract class AbstractEMFProjectGenerator { @@ -37,12 +38,16 @@ abstract class AbstractEMFProjectGenerator { * Creates a new EMF project with the ecore file and the genmodel in the "model" folder * also mages project, referencedGenPackages and rootPackages available. */ - def void generateBaseEMFProject() + def void generateBaseEMFProject(IProgressMonitor m) /** - * Generates the code using the genmodel. + * Helper method to generate code without a job. */ - def void generateModelCode() + def void generateModelCode() { + PlatformUI.workbench.activeWorkbenchWindow.run(false, true, [ m | + generateModelCode(m) + ]) + } /** * Generates the code using the genmodel (within a Job). diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend index 31220d202..19db69e91 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend @@ -139,7 +139,7 @@ class GenericTracePluginGenerator { // Generate EMF project val FakeWizardEMFProjectGenerator emfGen = new FakeWizardEMFProjectGenerator(pluginName, tmmResource.URI) - emfGen.generateBaseEMFProject + emfGen.generateBaseEMFProject(m) val referencedGenPackagesRoots = emfGen.referencedGenPackages referencedGenPackages = referencedGenPackagesRoots.map[findNestedGenpackages].flatten.toSet diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend index 4e427cd33..8835ff88f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend @@ -16,7 +16,6 @@ import org.eclipse.emf.edit.provider.ComposedAdapterFactory import org.eclipse.swt.widgets.Composite import org.eclipse.swt.widgets.Display import org.eclipse.swt.widgets.Shell -import org.eclipse.ui.PlatformUI class FakeWizardEMFProjectGenerator extends AbstractEMFProjectGenerator { @@ -27,7 +26,7 @@ class FakeWizardEMFProjectGenerator extends AbstractEMFProjectGenerator { super(projectName, ecoreURI) } - override generateBaseEMFProject() { + override generateBaseEMFProject(IProgressMonitor m) { // Creating the project and retrieving its path project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) @@ -64,11 +63,7 @@ class FakeWizardEMFProjectGenerator extends AbstractEMFProjectGenerator { } - override generateModelCode() { - PlatformUI.workbench.activeWorkbenchWindow.run(false, true, [ m | - generateModelCode(m) - ]) - } + /** * Performs the code generation from the genmodel. From a03f2b12676f74ec7789876e5d198ac0dc27c25c Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sat, 29 Oct 2016 10:16:16 +0200 Subject: [PATCH 043/267] Add code from on the web to create plugin project --- .../generator/clean/PluginProjectHelper.xtend | 193 ++++++++++++++++++ 1 file changed, 193 insertions(+) create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend new file mode 100644 index 000000000..3fb209b6f --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend @@ -0,0 +1,193 @@ +package fr.inria.diverse.trace.plugin.generator.clean; + +import java.io.ByteArrayInputStream +import java.io.InputStream +import java.util.ArrayList +import java.util.Collections +import java.util.Iterator +import java.util.List +import java.util.Set +import org.eclipse.core.resources.ICommand +import org.eclipse.core.resources.IContainer +import org.eclipse.core.resources.IFile +import org.eclipse.core.resources.IFolder +import org.eclipse.core.resources.IProject +import org.eclipse.core.resources.IProjectDescription +import org.eclipse.core.resources.IWorkspace +import org.eclipse.core.resources.ResourcesPlugin +import org.eclipse.core.runtime.CoreException +import org.eclipse.core.runtime.IProgressMonitor +import org.eclipse.core.runtime.NullProgressMonitor +import org.eclipse.core.runtime.Path +import org.eclipse.core.runtime.SubProgressMonitor +import org.eclipse.jdt.core.IClasspathEntry +import org.eclipse.jdt.core.IJavaProject +import org.eclipse.jdt.core.JavaCore + +/** + * Adapted from http://architecturware.cvs.sourceforge.net/viewvc/architecturware/oaw_v4/core.plugin/plugin.oaw4/main/src/org/openarchitectureware/wizards/EclipseHelper.java?revision=1.13&content-type=text%2Fplain + */ +public class PluginProjectHelper { + + public static val String ISO_8859_1 = "iso-8859-1"; + + public def static IProject createPluginProject(String projectName, List srcFolders, + List referencedProjects, Set requiredBundles, List exportedPackages, + IProgressMonitor progressMonitor) { + var IProject project = null; + + progressMonitor.beginTask("", 10); + progressMonitor.subTask("Creating project " + projectName); + val IWorkspace workspace = ResourcesPlugin.getWorkspace(); + project = workspace.getRoot().getProject(projectName); + +// if (project.exists) { +// project.delete(true, true, new SubProgressMonitor(progressMonitor, 1)); +// } + + val IJavaProject javaProject = JavaCore.create(project); + val IProjectDescription projectDescription = ResourcesPlugin.getWorkspace().newProjectDescription( + projectName); + projectDescription.setLocation(null); + project.create(projectDescription, new SubProgressMonitor(progressMonitor, 1)); + val List classpathEntries = new ArrayList(); + if (referencedProjects.size() != 0) { + val IProject[] referencedProjectsArray = newArrayOfSize(referencedProjects.size()) + projectDescription.setReferencedProjects(referencedProjects.toArray(referencedProjectsArray)) + for (IProject referencedProject : referencedProjects) { + val IClasspathEntry referencedProjectClasspathEntry = JavaCore.newProjectEntry( + referencedProject.getFullPath()); + classpathEntries.add(referencedProjectClasspathEntry); + } + } + val String[] natureIdsArray = #[JavaCore.NATURE_ID, "org.eclipse.pde.PluginNature"] + + projectDescription.setNatureIds(natureIdsArray); + + val ICommand java = projectDescription.newCommand(); + java.setBuilderName(JavaCore.BUILDER_ID); + + val ICommand manifest = projectDescription.newCommand(); + manifest.setBuilderName("org.eclipse.pde.ManifestBuilder"); + + val ICommand schema = projectDescription.newCommand(); + schema.setBuilderName("org.eclipse.pde.SchemaBuilder"); + + val ICommand[] commandArray = #[java, manifest, schema] + + projectDescription.setBuildSpec(commandArray); + + project.open(new SubProgressMonitor(progressMonitor, 1)); + project.setDescription(projectDescription, new SubProgressMonitor(progressMonitor, 1)); + + Collections.reverse(srcFolders); + for (String src : srcFolders) { + val IFolder srcContainer = project.getFolder(src); + if (!srcContainer.exists()) { + srcContainer.create(false, true, new SubProgressMonitor(progressMonitor, 1)); + } + val IClasspathEntry srcClasspathEntry = JavaCore.newSourceEntry(srcContainer.getFullPath()); + classpathEntries.add(0, srcClasspathEntry); + } + + classpathEntries.add(JavaCore.newContainerEntry(new Path( + "org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"))); + classpathEntries.add(JavaCore.newContainerEntry(new Path("org.eclipse.pde.core.requiredPlugins"))); + + val IClasspathEntry[] classPathEntriesArray = newArrayOfSize(classpathEntries.size()) + + javaProject.setRawClasspath(classpathEntries.toArray(classPathEntriesArray), + new SubProgressMonitor(progressMonitor, 1)); + + javaProject.setOutputLocation(new Path("/" + projectName + "/bin"), + new SubProgressMonitor(progressMonitor, 1)); + createManifest(projectName, requiredBundles, exportedPackages, progressMonitor, project); + createBuildProps(progressMonitor, project, srcFolders); + + return project; + + } + + public static def IFile createFile(String name, IContainer container, String content, + IProgressMonitor progressMonitor) { + + val IFile file = container.getFile(new Path(name)); + assertExist(file.getParent()); + + val InputStream stream = new ByteArrayInputStream(content.getBytes(file.getCharset())); + try { + if (file.exists()) { + file.setContents(stream, true, true, progressMonitor); + } else { + file.create(stream, true, progressMonitor); + } + progressMonitor.worked(1); + return file + } finally { + stream.close(); + } + } + + private static def void createBuildProps(IProgressMonitor progressMonitor, IProject project, + List srcFolders) { + val StringBuilder bpContent = new StringBuilder("source.. = "); + for (val Iterator iterator = srcFolders.iterator(); iterator.hasNext();) { + bpContent.append(iterator.next()).append('/'); + if (iterator.hasNext()) { + bpContent.append(","); + } + } + bpContent.append("\n"); + bpContent.append("bin.includes = META-INF/,.\n"); + createFile("build.properties", project, bpContent.toString(), progressMonitor); + } + + private static def void createManifest(String projectName, Set requiredBundles, + List exportedPackages, IProgressMonitor progressMonitor, IProject project) throws CoreException { + val StringBuilder maniContent = new StringBuilder("Manifest-Version: 1.0\n"); + maniContent.append("Bundle-ManifestVersion: 2\n"); + maniContent.append("Bundle-Name: " + projectName + "\n"); + maniContent.append("Bundle-SymbolicName: " + projectName + "; singleton:=true\n"); + maniContent.append("Bundle-Version: 1.0.0\n"); + // maniContent.append("Bundle-Localization: plugin\n"); + maniContent.append("Require-Bundle: "); + for (String entry : requiredBundles) { + + maniContent.append(" " + entry + ",\n"); + } + maniContent.append(" org.openarchitectureware.dependencies\n"); + + if (exportedPackages != null && !exportedPackages.isEmpty()) { + maniContent.append("Require-Bundle: " + exportedPackages.get(0)); + val int x = exportedPackages.size() + for (var int i = 1; i < x; i++) { + maniContent.append(",\n " + exportedPackages.get(i)); + } + maniContent.append("\n"); + } + + maniContent.append("Bundle-RequiredExecutionEnvironment: J2SE-1.5\r\n"); + + val IFolder metaInf = project.getFolder("META-INF"); + metaInf.create(false, true, new SubProgressMonitor(progressMonitor, 1)); + + createFile("MANIFEST.MF", metaInf, maniContent.toString(), progressMonitor); + } + + private static def void assertExist( + IContainer c + ) { + if (!c.exists()) { + if (!c.getParent().exists()) { + assertExist(c.getParent()); + } + if (c instanceof IFolder) { + + (c as IFolder).create(false, true, new NullProgressMonitor()); + + } + } + } + + } + \ No newline at end of file From 7d89e033b35260f707c8e19614a1992c6b0a8009 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sat, 29 Oct 2016 10:16:32 +0200 Subject: [PATCH 044/267] Progress new emf project generator --- .../clean/NewEMFProjectGenerator.xtend | 93 ++++++++----------- 1 file changed, 39 insertions(+), 54 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend index a1369acd7..8a02f0bcb 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend @@ -1,5 +1,6 @@ package fr.inria.diverse.trace.plugin.generator.clean +import fr.inria.diverse.trace.plugin.generator.AbstractEMFProjectGenerator import java.io.IOException import java.util.Collection import java.util.Collections @@ -10,12 +11,8 @@ import java.util.Set import java.util.jar.Manifest import org.eclipse.core.resources.IFile import org.eclipse.core.resources.IFolder -import org.eclipse.core.resources.IProject -import org.eclipse.core.resources.ResourcesPlugin import org.eclipse.core.runtime.CoreException -import org.eclipse.core.runtime.IPath import org.eclipse.core.runtime.IProgressMonitor -import org.eclipse.core.runtime.Path import org.eclipse.emf.codegen.ecore.generator.Generator import org.eclipse.emf.codegen.ecore.genmodel.GenJDKLevel import org.eclipse.emf.codegen.ecore.genmodel.GenModel @@ -37,30 +34,39 @@ import org.eclipse.emf.ecore.EcorePackage import org.eclipse.emf.ecore.plugin.EcorePlugin import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.emf.ecore.util.EcoreUtil import org.eclipse.emf.ecore.util.EcoreUtil.Copier -import fr.inria.diverse.trace.plugin.generator.AbstractEMFProjectGenerator public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { - public static val String MODEL_GEN_FOLDER = "model-gen"; + public static val String MODEL_GEN_FOLDER = "model" + + protected IProgressMonitor progressMonitor - protected IProgressMonitor progressMonitor; + protected ResourceSet resourceSet - protected ResourceSet resourceSet; - protected IProject xmofProject; + protected URI modelGenFolderURI + protected String srcFolderPathString + + protected Resource ecoreModelResource - protected URI modelGenFolderURI; - protected String srcFolderPathString; - new(String projectName, URI ecoreURI) { super(projectName, ecoreURI) } - private def boolean generateCode(Resource xmofModelResource, IProgressMonitor progressMonitor) { - this.progressMonitor = progressMonitor; - this.resourceSet = xmofModelResource.getResourceSet(); - this.xmofProject = getXMOFProject(xmofModelResource); + override generateBaseEMFProject(IProgressMonitor m) { + + this.progressMonitor = m; + this.resourceSet = new ResourceSetImpl + + // Create new EMF project + this.project = PluginProjectHelper.createPluginProject(projectName, // Project name + #["src"], // Src folders + #[], // referenced projects + #{}, // required bundles (plugins) TODO + #[], // exported packages TODO + m) // setup model-gen folder for saving temporary models this.modelGenFolderURI = setupModelGenFolder(); @@ -68,37 +74,28 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { // setup src folder for model code generation this.srcFolderPathString = setupSrcFolder(); - // create temporary Ecore metamodel - // val EPackage rootEPackage = generateEcoreModel(xmofModelResource); - // check whether all referenced packages can be loaded - checkReferencedPackages(xmofModelResource); + // TODO copy trace ecore in folder + // TODO load copied trace ecore + this.ecoreModelResource = null - // create temporary Genmodel, set initialize by load to true - // val GenModel genModel = generateGenModel(rootEPackage, - // modelGenFolderURI); - val GenModel genModel = generateGenModel((xmofModelResource.getContents().get(0)) as EPackage, - modelGenFolderURI); + // ??? + checkReferencedPackages(ecoreModelResource); - // generate code - return generateCode(genModel, progressMonitor); + this.genModel = generateGenModel((ecoreModelResource.getContents().get(0)) as EPackage, modelGenFolderURI); } - private def IProject getXMOFProject(Resource xmofModelResource) { - val URI xmofModelURI = xmofModelResource.getURI(); - val IPath xmofModelPath = new Path(xmofModelURI.toPlatformString(true)); - val IFile xmofModelFile = ResourcesPlugin.getWorkspace().getRoot().getFile(xmofModelPath); - val IProject xmofProject = xmofModelFile.getProject(); - return xmofProject; + override generateModelCode(IProgressMonitor m) { + generateCode(progressMonitor); } private def URI setupModelGenFolder() { var URI modelGenFolderURI = null; - val IFolder modelGenFolder = xmofProject.getFolder(MODEL_GEN_FOLDER); + val IFolder modelGenFolder = project.getFolder(MODEL_GEN_FOLDER); if (!modelGenFolder.exists()) { try { modelGenFolder.create(true, true, null); } catch (CoreException e) { - throw new RuntimeException("The folder \'model-gen\' could not be created.", e); + throw new RuntimeException('''The folder '«MODEL_GEN_FOLDER»' could not be created.''', e); } } modelGenFolderURI = URI.createPlatformResourceURI(modelGenFolder.getFullPath().toString(), true); @@ -107,7 +104,7 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { private def String setupSrcFolder() { var String srcFolderPathString = null; - val IFolder srcFolder = xmofProject.getFolder("src"); + val IFolder srcFolder = project.getFolder("src"); if (!srcFolder.exists()) { try { srcFolder.create(true, true, null); @@ -122,7 +119,7 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { protected def EPackage generateEcoreModel(Resource xmofModelResource) { val Resource ecoreModelResource = copyXMOFModel(xmofModelResource); val EPackage rootEPackage = ecoreModelResource.getContents().get(0) as EPackage; - // TODO importantto remove these? + // TODO important to remove these behaviors? but we are doing non-xmod-specific code.... // removeBehaviors(rootEPackage); save(ecoreModelResource); return rootEPackage; @@ -204,7 +201,7 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { val GenModel genModel = GenModelFactory.eINSTANCE.createGenModel(); genModelResource.getContents().add(genModel); - val IFolder srcFolder = xmofProject.getFolder("src"); + val IFolder srcFolder = project.getFolder("src"); genModel.setModelDirectory(srcFolder.getFullPath().toString()); genModel.getForeignModel().add(ecoreModelResource.getURI().toString()); genModel.setModelName(getModelName(genModelURI)); @@ -233,7 +230,7 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { protected def String getPluginID(URI uri) { var String pluginID = ""; - val IFile manifestFile = xmofProject.getFolder("META-INF").getFile("MANIFEST.MF"); + val IFile manifestFile = project.getFolder("META-INF").getFile("MANIFEST.MF"); try { val Manifest manifest = new Manifest(manifestFile.getContents()); var String symbolicName = manifest.getMainAttributes().getValue("Bundle-SymbolicName"); @@ -252,7 +249,7 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { } private def GenJDKLevel getComplicanceLevel() { - val String complianceLevel = CodeGenUtil.EclipseUtil.getJavaComplianceLevel(xmofProject); + val String complianceLevel = CodeGenUtil.EclipseUtil.getJavaComplianceLevel(project); if ("1.4".equals(complianceLevel)) { return GenJDKLevel.JDK14_LITERAL; } else if ("1.5".equals(complianceLevel)) { @@ -326,7 +323,7 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { } } - protected def boolean generateCode(GenModel genModel, IProgressMonitor progressMonitor) { + protected def boolean generateCode(IProgressMonitor progressMonitor) { var boolean success = false; prepareGenModelForCodeGeneration(genModel); val Generator generator = GenModelUtil.createGenerator(genModel); @@ -353,17 +350,5 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { throw new RuntimeException("Could not save resource \'" + resource.getURI() + "\'.", e); } } - - override generateBaseEMFProject() { - throw new UnsupportedOperationException("TODO: auto-generated method stub") - } - - override generateModelCode() { - throw new UnsupportedOperationException("TODO: auto-generated method stub") - } - - override generateModelCode(IProgressMonitor m) { - throw new UnsupportedOperationException("TODO: auto-generated method stub") - } - + } From 8b585e805d3b6f8fa002aab6b9f5b518706c3808 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sat, 29 Oct 2016 10:58:41 +0200 Subject: [PATCH 045/267] Progress new trace code gen code: almost working xmof --- .../AbstractEMFProjectGenerator.xtend | 26 +++++++++------- .../GenericTracePluginGenerator.xtend | 27 ++++------------ .../clean/NewEMFProjectGenerator.xtend | 31 +++++++++++-------- .../generator/clean/PluginProjectHelper.xtend | 8 ++--- .../FakeWizardEMFProjectGenerator.xtend | 24 +++++++++++--- 5 files changed, 62 insertions(+), 54 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend index 2a062553c..89816bbfc 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend @@ -1,37 +1,41 @@ package fr.inria.diverse.trace.plugin.generator -import org.eclipse.emf.common.util.URI -import org.eclipse.xtend.lib.annotations.Accessors -import org.eclipse.core.resources.IProject -import java.util.List +import java.util.HashSet import java.util.Set +import org.eclipse.core.resources.IProject +import org.eclipse.core.runtime.IProgressMonitor +import org.eclipse.emf.codegen.ecore.genmodel.GenModel import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import org.eclipse.emf.ecore.EPackage -import java.util.HashSet -import org.eclipse.emf.codegen.ecore.genmodel.GenModel -import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.ui.PlatformUI +import org.eclipse.xtend.lib.annotations.Accessors abstract class AbstractEMFProjectGenerator { // Inputs - protected val URI ecoreURI + //protected val URI ecoreURI + protected val EPackage ecoreModel protected val String projectName // Outputs @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected var IProject project @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) - protected var List referencedGenPackages + protected val Set referencedGenPackages = new HashSet @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val Set rootPackages = new HashSet // Transient protected var GenModel genModel - new(String projectName, URI ecoreURI) { +// new(String projectName, URI ecoreURI) { +// this.projectName = projectName +// this.ecoreURI = ecoreURI +// } + + new(String projectName, EPackage ecoreModel) { this.projectName = projectName - this.ecoreURI = ecoreURI + this.ecoreModel = ecoreModel } /** diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend index 19db69e91..5c3aeaa3a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend @@ -5,18 +5,18 @@ import fr.inria.diverse.trace.commons.EclipseUtil import fr.inria.diverse.trace.commons.ManifestUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerator -import java.io.File +import fr.inria.diverse.trace.plugin.generator.clean.NewEMFProjectGenerator +import fr.inria.diverse.trace.plugin.generator.codegen.TraceConstructorGeneratorJava +import fr.inria.diverse.trace.plugin.generator.codegen.TraceExplorerGeneratorJava +import fr.inria.diverse.trace.plugin.generator.codegen.TraceExtractorGeneratorJava import java.util.HashSet import java.util.Set import org.eclipse.core.resources.IProject import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import org.eclipse.emf.common.util.URI import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EStructuralFeature -import org.eclipse.emf.ecore.resource.Resource -import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.jdt.core.IJavaProject import org.eclipse.jdt.core.IPackageFragment @@ -25,10 +25,6 @@ import org.eclipse.jdt.core.JavaCore import org.eclipse.ui.PlatformUI import org.eclipse.xtend.lib.annotations.Accessors import tracingannotations.TracingAnnotations -import fr.inria.diverse.trace.plugin.generator.codegen.TraceConstructorGeneratorJava -import fr.inria.diverse.trace.plugin.generator.codegen.TraceExplorerGeneratorJava -import fr.inria.diverse.trace.plugin.generator.codegen.TraceExtractorGeneratorJava -import fr.inria.diverse.trace.plugin.generator.fakewizard.FakeWizardEMFProjectGenerator /** * Glues the generators : trace metamodel, emf project and trace manager @@ -125,20 +121,9 @@ class GenericTracePluginGenerator { tmmgenerator.sortResult val EPackage tracemm = tmmgenerator.tracemmresult - // Serializing the tracemm temporarily - val ResourceSet rs = new ResourceSetImpl() - val File tmpFolder = File.createTempFile("diverse", "tracemmgeneration") - tmpFolder.delete - tmpFolder.mkdir - tmpFolder.deleteOnExit - val String ecoreFileName = languageName + ".ecore" - val File tmmFile = new File(tmpFolder, ecoreFileName) - val Resource tmmResource = rs.createResource(URI.createFileURI(tmmFile.absolutePath)) - tmmResource.contents.add(tracemm) - tmmResource.save(null) - // Generate EMF project - val FakeWizardEMFProjectGenerator emfGen = new FakeWizardEMFProjectGenerator(pluginName, tmmResource.URI) + //val AbstractEMFProjectGenerator emfGen = new FakeWizardEMFProjectGenerator(pluginName, tracemm) + val AbstractEMFProjectGenerator emfGen = new NewEMFProjectGenerator(pluginName, tracemm) emfGen.generateBaseEMFProject(m) val referencedGenPackagesRoots = emfGen.referencedGenPackages referencedGenPackages = referencedGenPackagesRoots.map[findNestedGenpackages].flatten.toSet diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend index 8a02f0bcb..d012bafe2 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend @@ -51,12 +51,13 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { protected Resource ecoreModelResource - new(String projectName, URI ecoreURI) { - super(projectName, ecoreURI) + new(String projectName, EPackage p) { + super(projectName, p) } override generateBaseEMFProject(IProgressMonitor m) { + // TODO fill rootPackages this.progressMonitor = m; this.resourceSet = new ResourceSetImpl @@ -74,14 +75,18 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { // setup src folder for model code generation this.srcFolderPathString = setupSrcFolder(); - // TODO copy trace ecore in folder - // TODO load copied trace ecore - this.ecoreModelResource = null + // Serialize epackage in the project + ecoreModelResource = resourceSet.createResource( + URI.createPlatformResourceURI('''«projectName»/«MODEL_GEN_FOLDER»/«ecoreModel.name».ecore''', true)) + ecoreModelResource.contents.add(ecoreModel) + ecoreModelResource.save - // ??? + // Check that all required ecore models are available checkReferencedPackages(ecoreModelResource); + // Creates the output gen model this.genModel = generateGenModel((ecoreModelResource.getContents().get(0)) as EPackage, modelGenFolderURI); + this.rootPackages.addAll(ecoreModelResource.contents.filter(EPackage).toSet) } override generateModelCode(IProgressMonitor m) { @@ -217,6 +222,8 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { setMissingParameterTypes(genModel); val List missingGenPackages = computeMissingGenPackages(genModel); + referencedGenPackages.addAll(missingGenPackages) + referencedGenPackages.addAll(genModel.genPackages) genModel.getUsedGenPackages().addAll(missingGenPackages); return genModelResource; @@ -270,13 +277,11 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { * @param genModel */ private def void setMissingParameterTypes(GenModel genModel) { - for (genModelElement : genModel.eAllContents().toSet) { - if (genModelElement instanceof GenParameter) { - val GenParameter genParameter = genModelElement as GenParameter; - val EParameter ecoreParameter = genParameter.getEcoreParameter(); - if (ecoreParameter.getEType() == null) { - ecoreParameter.setEType(EcorePackage.eINSTANCE.getEObject()); - } + for (genModelElement : genModel.eAllContents().filter(GenParameter).toSet) { + val GenParameter genParameter = genModelElement as GenParameter; + val EParameter ecoreParameter = genParameter.getEcoreParameter(); + if (ecoreParameter.getEType() == null) { + ecoreParameter.setEType(EcorePackage.eINSTANCE.getEObject()); } } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend index 3fb209b6f..089a7a479 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend @@ -44,12 +44,12 @@ public class PluginProjectHelper { // if (project.exists) { // project.delete(true, true, new SubProgressMonitor(progressMonitor, 1)); // } - val IJavaProject javaProject = JavaCore.create(project); val IProjectDescription projectDescription = ResourcesPlugin.getWorkspace().newProjectDescription( projectName); projectDescription.setLocation(null); - project.create(projectDescription, new SubProgressMonitor(progressMonitor, 1)); + if (!project.exists) + project.create(projectDescription, new SubProgressMonitor(progressMonitor, 1)); val List classpathEntries = new ArrayList(); if (referencedProjects.size() != 0) { val IProject[] referencedProjectsArray = newArrayOfSize(referencedProjects.size()) @@ -150,12 +150,12 @@ public class PluginProjectHelper { maniContent.append("Bundle-SymbolicName: " + projectName + "; singleton:=true\n"); maniContent.append("Bundle-Version: 1.0.0\n"); // maniContent.append("Bundle-Localization: plugin\n"); - maniContent.append("Require-Bundle: "); + if (!requiredBundles.empty) + maniContent.append("Require-Bundle: "); for (String entry : requiredBundles) { maniContent.append(" " + entry + ",\n"); } - maniContent.append(" org.openarchitectureware.dependencies\n"); if (exportedPackages != null && !exportedPackages.isEmpty()) { maniContent.append("Require-Bundle: " + exportedPackages.get(0)); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend index 8835ff88f..43515b00a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend @@ -1,6 +1,7 @@ package fr.inria.diverse.trace.plugin.generator.fakewizard import fr.inria.diverse.trace.plugin.generator.AbstractEMFProjectGenerator +import java.io.File import org.eclipse.core.resources.ResourcesPlugin import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.emf.codegen.ecore.genmodel.GenModel @@ -9,8 +10,10 @@ import org.eclipse.emf.codegen.ecore.genmodel.presentation.GeneratorUIUtil.Gener import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil import org.eclipse.emf.common.command.BasicCommandStack import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.plugin.EcorePlugin import org.eclipse.emf.ecore.resource.Resource +import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain import org.eclipse.emf.edit.provider.ComposedAdapterFactory import org.eclipse.swt.widgets.Composite @@ -22,12 +25,25 @@ class FakeWizardEMFProjectGenerator extends AbstractEMFProjectGenerator { private var Composite rootParent private var FakeEcoreImporterWizard f - new(String projectName, URI ecoreURI) { - super(projectName, ecoreURI) + new(String projectName, EPackage ecoreModel) { + super(projectName, ecoreModel) } override generateBaseEMFProject(IProgressMonitor m) { + // Serializing the tracemm temporarily + val ResourceSet rs = ecoreModel.eResource.resourceSet + val File tmpFolder = File.createTempFile("diverse", "tracemmgeneration") + tmpFolder.delete + tmpFolder.mkdir + tmpFolder.deleteOnExit + val String ecoreFileName = ecoreModel.name + ".ecore" + val File tmmFile = new File(tmpFolder, ecoreFileName) + val Resource newEcoreResource = rs.createResource(URI.createFileURI(tmmFile.absolutePath)) + newEcoreResource.contents.add(ecoreModel) + newEcoreResource.save(null) + val ecoreURI = newEcoreResource.URI + // Creating the project and retrieving its path project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) val projectPath = project.getFullPath(); @@ -53,7 +69,7 @@ class FakeWizardEMFProjectGenerator extends AbstractEMFProjectGenerator { // Storing the genmodel genModel = f.modelImporter.genModel - referencedGenPackages = f.fakePackagePage.referencedGenPackages.immutableCopy + referencedGenPackages.addAll(f.fakePackagePage.referencedGenPackages) rootPackages.addAll(f.fakePackagePage.checkedEPackages) // Finally we disband our fakes wizard and root @@ -63,8 +79,6 @@ class FakeWizardEMFProjectGenerator extends AbstractEMFProjectGenerator { } - - /** * Performs the code generation from the genmodel. * From fd478879d8295ed9ba926b0b8d9b8d947bf97a15 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sat, 29 Oct 2016 11:03:12 +0200 Subject: [PATCH 046/267] Rename new emf project generator --- .../plugin/generator/GenericTracePluginGenerator.xtend | 6 +++--- ...tGenerator.xtend => StandaloneEMFProjectGenerator.xtend} | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/{NewEMFProjectGenerator.xtend => StandaloneEMFProjectGenerator.xtend} (99%) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend index 5c3aeaa3a..2ccc02a03 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend @@ -5,7 +5,6 @@ import fr.inria.diverse.trace.commons.EclipseUtil import fr.inria.diverse.trace.commons.ManifestUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerator -import fr.inria.diverse.trace.plugin.generator.clean.NewEMFProjectGenerator import fr.inria.diverse.trace.plugin.generator.codegen.TraceConstructorGeneratorJava import fr.inria.diverse.trace.plugin.generator.codegen.TraceExplorerGeneratorJava import fr.inria.diverse.trace.plugin.generator.codegen.TraceExtractorGeneratorJava @@ -25,6 +24,7 @@ import org.eclipse.jdt.core.JavaCore import org.eclipse.ui.PlatformUI import org.eclipse.xtend.lib.annotations.Accessors import tracingannotations.TracingAnnotations +import fr.inria.diverse.trace.plugin.generator.clean.StandaloneEMFProjectGenerator /** * Glues the generators : trace metamodel, emf project and trace manager @@ -122,8 +122,8 @@ class GenericTracePluginGenerator { val EPackage tracemm = tmmgenerator.tracemmresult // Generate EMF project - //val AbstractEMFProjectGenerator emfGen = new FakeWizardEMFProjectGenerator(pluginName, tracemm) - val AbstractEMFProjectGenerator emfGen = new NewEMFProjectGenerator(pluginName, tracemm) + // val AbstractEMFProjectGenerator emfGen = new FakeWizardEMFProjectGenerator(pluginName, tracemm) + val AbstractEMFProjectGenerator emfGen = new StandaloneEMFProjectGenerator(pluginName, tracemm) emfGen.generateBaseEMFProject(m) val referencedGenPackagesRoots = emfGen.referencedGenPackages referencedGenPackages = referencedGenPackagesRoots.map[findNestedGenpackages].flatten.toSet diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend similarity index 99% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend index d012bafe2..29ec96029 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/NewEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend @@ -38,7 +38,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.emf.ecore.util.EcoreUtil import org.eclipse.emf.ecore.util.EcoreUtil.Copier -public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { +public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { public static val String MODEL_GEN_FOLDER = "model" @@ -57,7 +57,6 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { override generateBaseEMFProject(IProgressMonitor m) { - // TODO fill rootPackages this.progressMonitor = m; this.resourceSet = new ResourceSetImpl @@ -89,6 +88,7 @@ public class NewEMFProjectGenerator extends AbstractEMFProjectGenerator { this.rootPackages.addAll(ecoreModelResource.contents.filter(EPackage).toSet) } + override generateModelCode(IProgressMonitor m) { generateCode(progressMonitor); } From bcd61ff828d448468922b19a12f2f8056a0cd6a2 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sun, 30 Oct 2016 07:19:22 +0100 Subject: [PATCH 047/267] remove useless import gemoc animation --- .../sirius/services/AbstractGemocAnimatorServices.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index 33d93831a..5457b42b9 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -40,8 +40,6 @@ import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import org.hamcrest.core.IsInstanceOf; - import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.inria.diverse.trace.commons.model.trace.ParallelStep; import fr.inria.diverse.trace.commons.model.trace.Step; From d9302b4ab82972db936e7ecfa3e24761e972558a Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sun, 30 Oct 2016 07:20:11 +0100 Subject: [PATCH 048/267] Trace addon generaiton: back to the correct way to get the syntax URI --- .../gemoc/generator/TraceAddonGeneratorIntegration.xtend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend index 7d70600a2..df3965c6a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend @@ -53,8 +53,8 @@ class TraceAddonGeneratorIntegration { // Get syntax val ResourceSet rs = new ResourceSetImpl -// val URI mmUri = URI.createURI(selection.syntax.ecoreUri) - val URI mmUri = URI.createURI("platform:/resource/"+ root.name + "." + selection.name.toLowerCase + "/model/" + selection.name + ".ecore") + val URI mmUri = URI.createURI(selection.syntax.ecoreUri) + //val URI mmUri = URI.createURI("platform:/resource/"+ root.name + "." + selection.name.toLowerCase + "/model/" + selection.name + ".ecore") val Resource syntaxResource = EMFUtil.loadModelURI(mmUri, rs); val Set syntax = syntaxResource.getContents().filter(EPackage).toSet From 3e45914ef252fc84cc455dab4acb1ab1e6522243 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sun, 30 Oct 2016 07:20:50 +0100 Subject: [PATCH 049/267] Finished version of new standalone EMF project creator --- .../clean/StandaloneEMFProjectGenerator.xtend | 52 +------------------ 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend index 29ec96029..6c2afdcb6 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend @@ -36,7 +36,6 @@ import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.emf.ecore.util.EcoreUtil -import org.eclipse.emf.ecore.util.EcoreUtil.Copier public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { @@ -88,7 +87,6 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { this.rootPackages.addAll(ecoreModelResource.contents.filter(EPackage).toSet) } - override generateModelCode(IProgressMonitor m) { generateCode(progressMonitor); } @@ -121,54 +119,6 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { return srcFolderPathString; } - protected def EPackage generateEcoreModel(Resource xmofModelResource) { - val Resource ecoreModelResource = copyXMOFModel(xmofModelResource); - val EPackage rootEPackage = ecoreModelResource.getContents().get(0) as EPackage; - // TODO important to remove these behaviors? but we are doing non-xmod-specific code.... - // removeBehaviors(rootEPackage); - save(ecoreModelResource); - return rootEPackage; - } - - private def Resource copyXMOFModel(Resource xmofModelResource) { - val String ecoreModelFileName = xmofModelResource.getURI().trimFileExtension().appendFileExtension("ecore"). - lastSegment().toString(); - val URI ecoreModelURI = this.modelGenFolderURI.appendSegment(ecoreModelFileName); - val Resource ecoreModelResource = resourceSet.createResource(ecoreModelURI); - - val Copier copier = new Copier(); - ecoreModelResource.getContents().addAll((copier.copyAll(xmofModelResource.getContents()))); - copier.copyReferences(); - return ecoreModelResource; - } - -// private def void removeBehaviors(EPackage ePackage) { -// for (TreeIterator < EObject > eAllContents = ePackage.eAllContents(); eAllContents.hasNext();) { -// var EObject eObject = eAllContents.next(); -// if (eObject instanceof BehavioredEClass) { -// val BehavioredEClass behavioredEClass = (BehavioredEClass) -// eObject; -// behavioredEClass.getOwnedBehavior().clear(); -// } else if (eObject instanceof BehavioredEOperation) { -// val BehavioredEOperation behavioredEOperation = (BehavioredEOperation) -// eObject; -// behavioredEOperation.getMethod().clear(); -// behavioredEOperation.getEContainingClass().getEOperations().remove(behavioredEOperation); -// } else if (eObject instanceof CallBehaviorAction) { -// val CallBehaviorAction callBehaviorAction = (CallBehaviorAction) -// eObject; -// callBehaviorAction.setBehavior(null); -// } else if (eObject instanceof DecisionNode) { -// val DecisionNode decisionNode = (DecisionNode) -// eObject; -// decisionNode.setDecisionInput(null); -// } else if (eObject instanceof ReduceAction) { -// val ReduceAction reduceAction = (ReduceAction) -// eObject; -// reduceAction.setReducer(null); -// } -// } -// } private def void checkReferencedPackages(Resource xmofModelResource) { val Set missingPackages = new HashSet(); val Map> externalCrossReferences = EcoreUtil.ExternalCrossReferencer.find( @@ -322,7 +272,7 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { } private def void setInitializeByLoad(GenPackage genPackage) { - genPackage.setLoadInitialization(true); + genPackage.setLoadInitialization(false); for (GenPackage subGenPackage : genPackage.getSubGenPackages()) { setInitializeByLoad(subGenPackage); } From 4bca3a6e6f7a46ac1d1c37eafc419f21826e199a Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Sun, 30 Oct 2016 07:21:39 +0100 Subject: [PATCH 050/267] Change hack to ignore static classes in trace constructors (still not good) --- .../generator/codegen/TraceConstructorGeneratorJava.xtend | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 04e7e343e..04a91ed9f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -142,11 +142,11 @@ class TraceConstructorGeneratorJava { private static def Set findTopSuperClasses(Iterable eclasses) { val res = new HashSet for (c : eclasses) { - if (c.ESuperTypes.empty) { + // TODO ugly fix to not include AS classes in the XMOF case, to remove at some point + val filtered = c.ESuperTypes.filter[s|! ( c.name.endsWith("Configuration") && c.name.startsWith(s.name))] + if (filtered.empty) { res.add(c) - } else { - // TODO ugly fix to not include AS classes in the XMOF case, to remove at some point - val filtered = c.ESuperTypes.filter[s|! ( c.name.endsWith("Configuration") && c.name.startsWith(s.name))] + } else { val candidates = findTopSuperClasses(filtered) res.addAll(candidates) } From a10e146e3e1d7eab8edb28e79dc19246726658be Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 4 Nov 2016 10:35:01 +0100 Subject: [PATCH 051/267] added a cache in order to avoid reloading the model several tuimes in the launch configuration UI --- .../launcher/tabs/LaunchConfigurationMainTab.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index 13d3c1b4a..909e2f6e0 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -480,10 +480,18 @@ protected String getModelInitializationMethodName(){ return ""; } + /** + * caches the current model resource in order to avoid to reload it many times + * use {@link getModel()} in order to access it. + */ + private Resource currentModelResource; + private Resource getModel() { - URI modelURI = URI.createPlatformResourceURI( - _modelLocationText.getText(), true); - return PlainK3ExecutionEngine.loadModel(modelURI); + URI modelURI = URI.createPlatformResourceURI(_modelLocationText.getText(), true); + if(currentModelResource == null || !currentModelResource.getURI().equals(modelURI)){ + currentModelResource = PlainK3ExecutionEngine.loadModel(modelURI); + } + return currentModelResource; } /* (non-Javadoc) From 3194b96820efb045d30f298125db461bfe98bd9f Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 4 Nov 2016 11:39:27 +0100 Subject: [PATCH 052/267] launcher now detects the native language of the model in order to compute or not the melange query --- .../engine/commons/MelangeHelper.java | 68 +++++++++++++++++++ .../tabs/LaunchConfigurationMainTab.java | 14 +++- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java index f4ea33058..5827b9c6f 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java @@ -14,12 +14,14 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; import org.osgi.framework.Bundle; import fr.inria.diverse.k3.al.annotationprocessor.Aspect; @@ -63,6 +65,72 @@ public static List getAllLanguages(){ return languagesNames; } + /** + * @param languageId + * @return the URI of the given language or null if no such language exists in the registry + */ + public static String getLanguageURI(String languageId){ + IConfigurationElement[] melangeLanguages = Platform + .getExtensionRegistry().getConfigurationElementsFor( + "fr.inria.diverse.melange.language"); + for (IConfigurationElement lang : melangeLanguages) { + if(lang.getAttribute("id").equals(languageId)){ + return lang.getAttribute("uri"); + } + } + return null; + } + + + /** + * Note: in some situations, the same uri can be declared for several languages ! (for example using external keyword) + * this is usually a deployment issue + * @param uri + * @return the first language with the given URI or null if no such language exists in the registry + */ + public static String getLanguageNameForURI(String uri){ + IConfigurationElement[] melangeLanguages = Platform + .getExtensionRegistry().getConfigurationElementsFor( + "fr.inria.diverse.melange.language"); + for (IConfigurationElement lang : melangeLanguages) { + if(lang.getAttribute("uri").equals(uri)){ + return lang.getAttribute("id"); + } + } + return null; + } + public static List getLanguageNamesForURI(String uri){ + List languagesNames = new ArrayList(); + IConfigurationElement[] melangeLanguages = Platform + .getExtensionRegistry().getConfigurationElementsFor( + "fr.inria.diverse.melange.language"); + for (IConfigurationElement lang : melangeLanguages) { + if(lang.getAttribute("uri").equals(uri)){ + String id = lang.getAttribute("id"); + if(!languagesNames.contains(id)){ + languagesNames.add(id); + } + } + } + return languagesNames; + } + + /** + * Find in the given resource the native languages corresponding to the element at the root of the resource + * (built as a set in order to have no duplicate) + * @param res + * @return a list of all the native languages of the root elements of the resource + */ + public static List getNativeLanguagesUsedByResource(Resource res){ + LinkedHashSet usedLanguages = new LinkedHashSet(); + for(EObject eobj : res.getContents()){ + usedLanguages.addAll(getLanguageNamesForURI(eobj.eClass().eResource().getURI().toString())); + } + List languagesNames = new ArrayList(); + languagesNames.addAll(usedLanguages); + return languagesNames; + } + /** * @return Aspects defined in 'languageName' */ diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index 909e2f6e0..d128138e9 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -444,8 +444,18 @@ protected String computeMelangeQuery(){ String result = ""; String languageName = this._languageCombo.getText(); if(!this._modelLocationText.getText().isEmpty() && !languageName.isEmpty()){ - String languageMT = languageName+"MT"; // TODO find in Melange registry - result="?lang="+languageName+"&mt="+languageMT; + Resource model = getModel(); + List modelNativeLanguages = MelangeHelper.getNativeLanguagesUsedByResource(model); + if(!modelNativeLanguages.isEmpty() && !modelNativeLanguages.get(0).equals(languageName)){ + // TODO this version consider only the first language, we need to think about models containing elements coming from several languages + String languageMT = languageName+"MT"; + // find model type in Melange registry + List mts = MelangeHelper.getModelTypes(languageName); + if(!mts.isEmpty()){ + languageMT = mts.get(0); // get the first in case of several occurrences ... + } + result="?lang="+languageName+"&mt="+languageMT; + } } return result; } From f49de099ea634fcf4f52c647df62251e35e70b26 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 4 Nov 2016 12:07:33 +0100 Subject: [PATCH 053/267] fix search of language MT name in launcher --- .../engine/commons/MelangeHelper.java | 15 +++++++++++++++ .../launcher/tabs/LaunchConfigurationMainTab.java | 13 +++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java index 5827b9c6f..5d1cd995c 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java @@ -186,6 +186,21 @@ public static List getModelTypes(String language){ } return modelTypeNames; } + + /** + * Return the ModelType for 'language' or null if not found + */ + public static String getModelType(String language){ + IConfigurationElement[] melangeLanguages = Platform + .getExtensionRegistry().getConfigurationElementsFor( + "fr.inria.diverse.melange.language"); + for (IConfigurationElement lang : melangeLanguages) { + if (lang.getAttribute("id").equals(language)) { + return lang.getAttribute("modeltypeId"); + } + } + return null; + } /** * Return a class matching 'aspectName' or null if can't be loaded. diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index d128138e9..aaf332285 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -436,7 +436,7 @@ protected void updateLaunchConfigurationDialog() { } /** - * compute the melange query for loading the given model as the requested language + * compute the Melange query for loading the given model as the requested language * If the language is already the good one, the query will be empty. (ie. melange adapter is not used) * @return */ @@ -447,13 +447,10 @@ protected String computeMelangeQuery(){ Resource model = getModel(); List modelNativeLanguages = MelangeHelper.getNativeLanguagesUsedByResource(model); if(!modelNativeLanguages.isEmpty() && !modelNativeLanguages.get(0).equals(languageName)){ - // TODO this version consider only the first language, we need to think about models containing elements coming from several languages - String languageMT = languageName+"MT"; - // find model type in Melange registry - List mts = MelangeHelper.getModelTypes(languageName); - if(!mts.isEmpty()){ - languageMT = mts.get(0); // get the first in case of several occurrences ... - } + // TODO this version consider only the first native language, we need to think about models containing elements coming from several languages + String languageMT = MelangeHelper.getModelType(languageName); + if(languageMT == null){ languageMT = languageName+"MT"; } + result="?lang="+languageName+"&mt="+languageMT; } } From d19ae3831587d9d2fbc6f4f5a9924989fa370b31 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 4 Nov 2016 15:15:06 +0100 Subject: [PATCH 054/267] Fix breakpoint for downcast resource Fabien's patch --- .../META-INF/MANIFEST.MF | 3 +- .../sirius/modelloader/DebugURIHandler.java | 2 +- .../modelloader/DefaultModelLoader.java | 7 ++++ .../META-INF/MANIFEST.MF | 3 +- .../debug/GenericSequentialModelDebugger.java | 32 +++++++++++++++++-- .../ui/launcher/GemocSourceLocator.java | 23 ++++++++++++- 6 files changed, 63 insertions(+), 7 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF index dd1aede1b..3586d576e 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF @@ -20,7 +20,8 @@ Require-Bundle: org.gemoc.xdsmlframework.api, org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", org.eclipse.ui.ide;bundle-version="3.10.2", fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", - fr.inria.diverse.melange.resource;bundle-version="0.1.0" + fr.inria.diverse.melange.resource;bundle-version="0.1.0", + fr.inria.diverse.melange.adapters Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.gemoc.executionframework.extensions.sirius, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java index 5067b0b0a..d31b379aa 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java @@ -41,7 +41,7 @@ public DebugURIHandler(EList uriHandlers) { @Override public boolean canHandle(URI uri) { - return !uri.fileExtension().equals("trace"); + return uri.fileExtension() == null || !uri.fileExtension().equals("trace"); } @Override diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index 0e7a5aa84..aded91ca3 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -63,6 +63,7 @@ import org.gemoc.xdsmlframework.api.core.IExecutionContext; import org.gemoc.xdsmlframework.api.core.IModelLoader; +import fr.inria.diverse.melange.adapters.EObjectAdapter; import fr.inria.diverse.melange.resource.MelangeRegistry; import fr.inria.diverse.melange.resource.MelangeResourceImpl; import fr.obeo.dsl.debug.ide.sirius.ui.services.AbstractDSLDebuggerServices; @@ -200,6 +201,11 @@ private Session openNewSiriusSession(IExecutionContext context, if(r instanceof MelangeResourceImpl){ MelangeResourceImpl mr = (MelangeResourceImpl)r; rs.getResources().add(mr.getWrappedResource()); + + if(!r.getContents().isEmpty() && r.getContents().get(0) instanceof EObjectAdapter){ + Resource realResource = ((EObjectAdapter) r.getContents().get(0)).getAdaptee().eResource(); + rs.getResources().add(realResource); + } } // calculating aird URI @@ -612,6 +618,7 @@ public URI resolve(URI uri) { URI resolvedURI = super.resolve(uri); if (resolvedURI.scheme() != null && !resolvedURI.scheme().equals("melange") + && resolvedURI.fileExtension() != null && resolvedURI.fileExtension().equals(_fileExtension)) { // TODO find a smarter way to decide if a file should be loaded as melange or not diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index f38b508e5..03e0f969c 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -34,7 +34,8 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.gemoc.executionframework.extensions.sirius, org.gemoc.xdsmlframework.ui.utils, org.eclipse.xtext, - org.eclipse.xtend.lib + org.eclipse.xtend.lib, + fr.inria.diverse.melange.resource Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java index d089a508a..4e2f7ca19 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java @@ -19,13 +19,16 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EcorePackage; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; +import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; import org.gemoc.executionframework.engine.core.EngineStoppedException; import org.gemoc.executionframework.engine.ui.debug.AbstractGemocDebugger; import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import fr.inria.diverse.melange.resource.MelangeResourceImpl; import fr.inria.diverse.trace.commons.model.trace.MSE; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.inria.diverse.trace.commons.model.trace.Step; @@ -224,9 +227,32 @@ public boolean shouldBreak(EObject instruction) { } private boolean hasRegularBreakpointTrue(EObject o) { - return super.shouldBreak(o) - && (Boolean.valueOf((String) getBreakpointAttributes(o, GemocBreakpoint.BREAK_ON_LOGICAL_STEP)) || Boolean - .valueOf((String) getBreakpointAttributes(o, GemocBreakpoint.BREAK_ON_MSE_OCCURRENCE))); + + EObject target = o; + // Try to get the original object if 'o' comes from + // a downcast resource + if(this.engine instanceof PlainK3ExecutionEngine){ + Resource res = o.eResource(); + if(res != null) { + + MelangeResourceImpl mr = null; + for(Resource candidate : res.getResourceSet().getResources()) { + if(candidate instanceof MelangeResourceImpl) { + mr = (MelangeResourceImpl) candidate; + break; + } + } + + if(mr != null) { + String uriFragment = res.getURIFragment(o); + target = mr.getWrappedResource().getEObject(uriFragment); + } + } + } + + return super.shouldBreak(target) + && (Boolean.valueOf((String) getBreakpointAttributes(target, GemocBreakpoint.BREAK_ON_LOGICAL_STEP)) || Boolean + .valueOf((String) getBreakpointAttributes(target, GemocBreakpoint.BREAK_ON_MSE_OCCURRENCE))); } private boolean shouldBreakMSEOccurence(MSEOccurrence mseOccurrence) { diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java index a8d4df961..59c776b2e 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java @@ -23,6 +23,7 @@ import org.eclipse.ui.part.FileEditorInput; import org.eclipse.xtext.resource.XtextResource; +import fr.inria.diverse.melange.resource.MelangeResourceImpl; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.obeo.dsl.debug.ide.DSLSourceLocator; import fr.obeo.dsl.debug.ide.adapter.DSLStackFrameAdapter; @@ -51,8 +52,28 @@ public Object getSourceElement(IStackFrame stackFrame) { @Override public IEditorInput getEditorInput(Object element) { if (element instanceof EObject) { + EObject eObject = (EObject) element; - URI uri = eObject.eResource().getURI(); + EObject target = eObject; + + Resource res = eObject.eResource(); + if(res != null) { + + MelangeResourceImpl mr = null; + for(Resource candidate : res.getResourceSet().getResources()) { + if(candidate instanceof MelangeResourceImpl) { + mr = (MelangeResourceImpl) candidate; + break; + } + } + + if(mr != null) { + String uriFragment = res.getURIFragment(eObject); + target = mr.getWrappedResource().getEObject(uriFragment); + } + } + + URI uri = target.eResource().getURI(); IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true))); IFileEditorInput input = new FileEditorInput(file); return input; From 497cb81d92ba5428a886b915924e8d481a71ade1 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 4 Nov 2016 17:01:12 +0100 Subject: [PATCH 055/267] avoid ugly crash when providing object that aren't in a resourceSet (such as metaclasses from the registry) --- .../javaengine/ui/launcher/GemocSourceLocator.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java index 59c776b2e..25084be76 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java @@ -57,7 +57,7 @@ public IEditorInput getEditorInput(Object element) { EObject target = eObject; Resource res = eObject.eResource(); - if(res != null) { + if(res != null && res.getResourceSet() != null) { MelangeResourceImpl mr = null; for(Resource candidate : res.getResourceSet().getResources()) { @@ -74,9 +74,11 @@ public IEditorInput getEditorInput(Object element) { } URI uri = target.eResource().getURI(); - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true))); - IFileEditorInput input = new FileEditorInput(file); - return input; + if(uri.toPlatformString(true) != null){ + IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true))); + IFileEditorInput input = new FileEditorInput(file); + return input; + } } return null; } From dbfbccf6bad1beb8fae7b912f0a6030acf690e9d Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Tue, 15 Nov 2016 11:44:39 +0100 Subject: [PATCH 056/267] fix a problem of concurrent modification it seems that the factory of adapters is not thread safe, use a synchronized block --- .../ide/adapter/DSLStackFrameAdapter.java | 126 +++++++++--------- 1 file changed, 64 insertions(+), 62 deletions(-) diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java index 63adab23c..acbbb5d35 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java @@ -34,8 +34,7 @@ public class DSLStackFrameAdapter extends AbstractDSLDebugElementAdapter implements IStackFrame { /** - * The {@link IThread} containing this {@link IStackFrame}. Needed after - * popping the stack. + * The {@link IThread} containing this {@link IStackFrame}. Needed after popping the stack. */ private IThread thread; @@ -46,12 +45,12 @@ public class DSLStackFrameAdapter extends AbstractDSLDebugElementAdapter impleme * the {@link DSLEclipseDebugIntegration} factory */ public DSLStackFrameAdapter(DSLEclipseDebugIntegration factory) { - super(factory); + super(factory); } @Override public boolean isAdapterForType(Object type) { - return super.isAdapterForType(type) || type == IStackFrame.class; + return super.isAdapterForType(type) || type == IStackFrame.class; } /** @@ -60,8 +59,8 @@ public boolean isAdapterForType(Object type) { * @return the {@link StackFrame} */ public StackFrame getHost() { - assert target instanceof StackFrame; - return (StackFrame) target; + assert target instanceof StackFrame; + return (StackFrame)target; } /** @@ -70,7 +69,7 @@ public StackFrame getHost() { * @see org.eclipse.debug.core.model.IStep#canStepInto() */ public boolean canStepInto() { - return getThread().canStepInto(); + return getThread().canStepInto(); } /** @@ -79,7 +78,7 @@ public boolean canStepInto() { * @see org.eclipse.debug.core.model.IStep#canStepOver() */ public boolean canStepOver() { - return getThread().canStepOver(); + return getThread().canStepOver(); } /** @@ -88,11 +87,11 @@ public boolean canStepOver() { * @see org.eclipse.debug.core.model.IStep#canStepReturn() */ public boolean canStepReturn() { - return getThread().canStepReturn(); + return getThread().canStepReturn(); } public boolean isStepping() { - return getThread().isStepping(); + return getThread().isStepping(); } /** @@ -101,7 +100,7 @@ public boolean isStepping() { * @see org.eclipse.debug.core.model.IStep#stepInto() */ public void stepInto() throws DebugException { - getThread().stepInto(); + getThread().stepInto(); } /** @@ -110,7 +109,7 @@ public void stepInto() throws DebugException { * @see org.eclipse.debug.core.model.IStep#stepOver() */ public void stepOver() throws DebugException { - getThread().stepOver(); + getThread().stepOver(); } /** @@ -119,7 +118,7 @@ public void stepOver() throws DebugException { * @see org.eclipse.debug.core.model.IStep#stepReturn() */ public void stepReturn() throws DebugException { - getThread().stepReturn(); + getThread().stepReturn(); } /** @@ -128,7 +127,7 @@ public void stepReturn() throws DebugException { * @see org.eclipse.debug.core.model.ISuspendResume#canResume() */ public boolean canResume() { - return getThread().canResume(); + return getThread().canResume(); } /** @@ -137,11 +136,11 @@ public boolean canResume() { * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() */ public boolean canSuspend() { - return getThread().canSuspend(); + return getThread().canSuspend(); } public boolean isSuspended() { - return getThread().isSuspended(); + return getThread().isSuspended(); } /** @@ -150,7 +149,7 @@ public boolean isSuspended() { * @see org.eclipse.debug.core.model.ISuspendResume#resume() */ public void resume() throws DebugException { - getThread().resume(); + getThread().resume(); } /** @@ -159,7 +158,7 @@ public void resume() throws DebugException { * @see org.eclipse.debug.core.model.ISuspendResume#suspend() */ public void suspend() throws DebugException { - getThread().suspend(); + getThread().suspend(); } /** @@ -168,11 +167,11 @@ public void suspend() throws DebugException { * @see org.eclipse.debug.core.model.ITerminate#canTerminate() */ public boolean canTerminate() { - return getThread().canTerminate(); + return getThread().canTerminate(); } public boolean isTerminated() { - return getThread().isTerminated(); + return getThread().isTerminated(); } /** @@ -181,7 +180,7 @@ public boolean isTerminated() { * @see org.eclipse.debug.core.model.ITerminate#terminate() */ public void terminate() throws DebugException { - getThread().terminate(); + getThread().terminate(); } /** @@ -190,13 +189,15 @@ public void terminate() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getThread() */ public IThread getThread() { + if (thread == null) { + synchronized(factory) { + thread = (IThread)factory.adapt(ThreadUtils.getThread(getHost()), IThread.class); + } if (thread == null) { - thread = (IThread) factory.adapt(ThreadUtils.getThread(getHost()), IThread.class); - if (thread == null) { - throw new IllegalStateException("can't addapt Thread to IThread."); - } + throw new IllegalStateException("can't addapt Thread to IThread."); } - return thread; + } + return thread; } /** @@ -205,18 +206,20 @@ public IThread getThread() { * @see org.eclipse.debug.core.model.IStackFrame#getVariables() */ public IVariable[] getVariables() throws DebugException { - final List res = new ArrayList(); - - for (Variable variable : getHost().getVariables()) { - final IVariable var = (IVariable) factory.adapt(variable, IVariable.class); - if (var != null) { - res.add(var); - } else { - throw new IllegalStateException("can't addapt Variable to IVariable."); - } + final List res = new ArrayList(); + + for (Variable variable : getHost().getVariables()) { + synchronized(factory) { + final IVariable var = (IVariable)factory.adapt(variable, IVariable.class); + if (var != null) { + res.add(var); + } else { + throw new IllegalStateException("can't addapt Variable to IVariable."); + } } + } - return res.toArray(new IVariable[res.size()]); + return res.toArray(new IVariable[res.size()]); } /** @@ -225,7 +228,7 @@ public IVariable[] getVariables() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#hasVariables() */ public boolean hasVariables() throws DebugException { - return getHost().getVariables().size() > 0; + return getHost().getVariables().size() > 0; } /** @@ -234,23 +237,23 @@ public boolean hasVariables() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber() */ public int getLineNumber() throws DebugException { - final EObject context = getContext(); - int result = -1; - for (ILocator locator : Activator.getDefault().retrieveLocators()) { - final ILocator.Location location = locator.getLocation(context); - switch (location.type) { - case XTEXT_LOCATION: - result = (Integer) location.data; - break; - default: - break; - } - if (result != -1) { - break; - } + final EObject context = getContext(); + int result = -1; + for (ILocator locator : Activator.getDefault().retrieveLocators()) { + final ILocator.Location location = locator.getLocation(context); + switch (location.type) { + case XTEXT_LOCATION: + result = (Integer)location.data; + break; + default: + break; + } + if (result != -1) { + break; } + } - return result; + return result; } /** @@ -259,7 +262,7 @@ public int getLineNumber() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getCharStart() */ public int getCharStart() throws DebugException { - return -1; + return -1; } /** @@ -268,7 +271,7 @@ public int getCharStart() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd() */ public int getCharEnd() throws DebugException { - return -1; + return -1; } /** @@ -277,12 +280,12 @@ public int getCharEnd() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getName() */ public String getName() throws DebugException { - return getHost().getName(); + return getHost().getName(); } public IRegisterGroup[] getRegisterGroups() throws DebugException { - // TODO Auto-generated method stub - return null; + // TODO Auto-generated method stub + return null; } /** @@ -291,17 +294,16 @@ public IRegisterGroup[] getRegisterGroups() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups() */ public boolean hasRegisterGroups() throws DebugException { - return getHost().getRegisterGroups().size() > 0; + return getHost().getRegisterGroups().size() > 0; } /** * Gets the {@link StackFrame#getCurrentInstruction() current instruction}. * - * @return the {@link StackFrame#getCurrentInstruction() current - * instruction} + * @return the {@link StackFrame#getCurrentInstruction() current instruction} */ public EObject getCurrentInstruction() { - return getHost().getCurrentInstruction(); + return getHost().getCurrentInstruction(); } /** @@ -310,7 +312,7 @@ public EObject getCurrentInstruction() { * @return the {@link StackFrame#getContext() context} */ public EObject getContext() { - return getHost().getContext(); + return getHost().getContext(); } } From 8a65c00348580136fe0afe43bc73c339c3f378e5 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Tue, 15 Nov 2016 14:45:43 +0100 Subject: [PATCH 057/267] Reworked the way trace addons are notified of trace modifications and improved the performances of the stategraph addon --- .../BatchModelChangeListener.xtend | 234 ++++++++++++ ...scientGenericSequentialModelDebugger.xtend | 8 +- .../LaunchConfigurationDataProcessingTab.java | 2 +- .../api/IMultiDimensionalTraceAddon.java | 2 + .../trace/gemoc/api/ITraceExplorer.java | 2 +- .../trace/gemoc/api/ITraceExtractor.java | 8 +- .../trace/gemoc/api/ITraceListener.java | 13 +- .../trace/gemoc/api/ITraceNotifier.java | 2 + .../trace/gemoc/api/ITraceViewListener.java | 17 + .../trace/gemoc/api/ITraceViewNotifier.java | 26 ++ .../GenericEngineTraceAddonGenerator.xtend | 10 + .../META-INF/MANIFEST.MF | 3 +- .../gemoc/traceaddon/AbstractTraceAddon.xtend | 36 +- .../traceaddon/GenericTraceEngineAddon.java | 7 + .../traceaddon/GenericTraceExplorer.java | 92 +++-- .../traceaddon/GenericTraceExtractor.java | 68 +++- .../META-INF/MANIFEST.MF | 3 +- .../GenericTracePluginGenerator.xtend | 20 +- .../clean/StandaloneEMFProjectGenerator.xtend | 26 +- .../TraceConstructorGeneratorJava.xtend | 4 +- .../codegen/TraceExplorerGeneratorJava.xtend | 154 ++++---- .../codegen/TraceExtractorGeneratorJava.xtend | 349 ++++++++++++------ .../codegen/TraceNotifierGeneratorJava.xtend | 186 ++++++++++ .../views/TimelineDiffViewerViewPart.java | 7 +- .../diffviewer/views/TraceSectionsDialog.java | 125 ++++--- .../MultidimensionalTimelineRenderer.java | 46 ++- .../META-INF/MANIFEST.MF | 10 +- .../plugin.xml | 8 + .../stategraph/logic/StateGraph.java | 124 +++++-- .../stategraph/views/StateGraphRenderer.java | 5 +- .../stategraph/views/StateGraphViewPart.java | 2 + 31 files changed, 1233 insertions(+), 366 deletions(-) create mode 100644 framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewListener.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewNotifier.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend new file mode 100644 index 000000000..8a8eee75a --- /dev/null +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend @@ -0,0 +1,234 @@ +package org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; + +import java.util.ArrayList +import java.util.Collection +import java.util.HashMap +import java.util.HashSet +import java.util.List +import java.util.Map +import java.util.Set +import org.eclipse.emf.common.notify.Notification +import org.eclipse.emf.ecore.EObject +import org.eclipse.emf.ecore.EReference +import org.eclipse.emf.ecore.EStructuralFeature +import org.eclipse.emf.ecore.resource.Resource +import org.eclipse.emf.ecore.util.EContentAdapter + +/** + * This model listener gathers EMF notifications, and computes when asked a + * set of ModelChange objects to reflect what happened in a more abstract + * and concise way. + * + * For instance, if a field changed multiple times in between two queries to + * the model listener, a single ModelChange object will be computed to reflect that change, + * instead of a list of many EMF Notifications. + * + * A ModelChange can be a new/removed object in the model, or a change in a field. + * See associated class. + * + */ +public class BatchModelChangeListener { + + private EContentAdapter adapter; + private Map> changes = new HashMap + private Set registeredObservers = new HashSet + + public new(Set resources) { + /* + * We create an adapter that stores and sort all the notifications for each object and field. + * This avoids us to sort everything afterwards. + */ + this.adapter = new EContentAdapter() { + override void notifyChanged(Notification notification) { + super.notifyChanged(notification); + for (obs : registeredObservers) { + changes.get(obs).add(notification) + } + } + }; + resources.forEach [ r | + if (r != null) { + r.eAdapters().add(adapter); + } + ] + + } + + /** + * When an observer asks for the changes, we process all the notifications gathered for it since the last time. + */ + def List getChanges(Object addon) { + val List result = new ArrayList() + val List allNotifs = changes.get(addon); + if (registeredObservers.contains(addon)) { + changes.put( + addon, + new ArrayList() + ); + } + + // First we sort everything per object and field + val Map>> sortedNotifications = new HashMap + val Map> resourcesNotifications = new HashMap + for (Notification notification : allNotifs) { + val int eventType = notification.getEventType(); + if (eventType < Notification.EVENT_TYPE_COUNT && !notification.isTouch()) { + + if (notification.getNotifier() instanceof EObject && + notification.getFeature() instanceof EStructuralFeature) { + val EStructuralFeature feature = notification.getFeature() as EStructuralFeature; + val EObject changedObject = notification.getNotifier() as EObject; + if (!sortedNotifications.containsKey(changedObject)) { + sortedNotifications.put(changedObject, new HashMap) + } + val Map> objectsNotifications = sortedNotifications.get( + changedObject); + if (!objectsNotifications.containsKey(feature)) { + objectsNotifications.put(feature, new ArrayList) + } + val List fieldNotifications = objectsNotifications.get(feature); + fieldNotifications.add(notification); + } else if (notification.getNotifier() instanceof Resource) { + val Resource resource = notification.notifier as Resource + if (!resourcesNotifications.containsKey(resource)) + resourcesNotifications.put(resource, new ArrayList) + val resourceNotifications = resourcesNotifications.get(resource) + resourceNotifications.add(notification) + } + } + } + + val newObjects = new HashSet + val removedObjects = new HashSet + + // First we find new objects added or removed at the root of the resource + for (resource : resourcesNotifications.keySet) { + val resourceNotifications = resourcesNotifications.get(resource) + for (Notification notif : resourceNotifications) { + BatchModelChangeListener. + manageCollectionContainmentNotification(removedObjects, newObjects, notif) + } + } + + // Next we read all that and try to interpret everything as coarse grained model changes + for (object : sortedNotifications.keySet) { + val featureMap = sortedNotifications.get(object) + for (feature : featureMap.keySet) { + val notifs = featureMap.get(feature) + + // Case multiplicity 0..1: we compare the original value and the new one at the end of the step + if (!feature.isMany) { + + val previousValue = notifs.head.oldValue + val newValue = notifs.last.newValue + + // Case objects: we compare references + if (feature instanceof EReference) { + if (previousValue != newValue) { + + // Register model change + result.add(new NonCollectionFieldModelChange(object, feature)) + + // Register potentially new or removed object + if ((feature as EReference).containment) { + if (previousValue != null && previousValue instanceof EObject) + addToRemovedObjects(removedObjects, newObjects, previousValue as EObject) + if (newValue != null && newValue instanceof EObject) + addToNewObjects(removedObjects, newObjects, newValue as EObject) + } + } + } // Case data types: we compare values + else if (if (previousValue == null) { + newValue != null + } else { + !previousValue.equals(newValue) + }) { + + // Register model change + result.add(new NonCollectionFieldModelChange(object, feature)) + } + + } // Case multiplicity 0..*: we consider that there was a potential change, but maybe following + // all the adds ands remove, the collection went back to its state before the step + else { + + // Very hard to decide if a collection has changed or not based on the notifications, + // (e.g. if we remove and add the same object, the collection in fact doesn't change) + // and we don't have a direct access to the previous content of the collection to compare + // similarly to what we do in a trace manager. + // So for now we simply state a "potential change", and the trace manager will have to compute + // itself if there was a real change. + result.add(new PotentialCollectionFieldModelChange(object, feature, notifs)) + + // Yet we must still find new/removed objects + for (notif : notifs) { + + if (feature instanceof EReference && (feature as EReference).containment) { + BatchModelChangeListener. + manageCollectionContainmentNotification(removedObjects, newObjects, notif) + } + } + } + } + } + + // Finally we register the new and removed objects from the model + for (newObject : newObjects) { + result.add(0, new NewObjectModelChange(newObject)) + } + for (removedObject : removedObjects) { + result.add(0, new RemovedObjectModelChange(removedObject)) + } + + return result; + } + + def boolean registerObserver(Object observer) { + val boolean res = registeredObservers.add(observer); + if (res) { + changes.put(observer, new ArrayList()); + } + return res; + } + + def void removeObserver(Object observer) { + changes.remove(observer) + registeredObservers.remove(observer) + } + + private static def void addToNewObjects(Collection removedObjects, Collection newObjects, + EObject object) { + if (object != null) { + val hasMoved = removedObjects.remove(object) + if (!hasMoved) + newObjects.add(object) + } + } + + private static def void addToRemovedObjects(Collection removedObjects, Collection newObjects, + EObject object) { + if (object != null) { + val hasMoved = newObjects.remove(object) + if (!hasMoved) + removedObjects.add(object) + + } + } + + // TODO manage objects already contained in new objects ... ? + private static def void manageCollectionContainmentNotification(Collection removedObjects, + Collection newObjects, Notification notif) { + switch (notif.eventType) { + case Notification.ADD: + addToNewObjects(removedObjects, newObjects, notif.newValue as EObject) + case Notification.ADD_MANY: + for (add : notif.newValue as List) + addToNewObjects(removedObjects, newObjects, add) + case Notification.REMOVE: + addToRemovedObjects(removedObjects, newObjects, notif.oldValue as EObject) + case Notification.REMOVE_MANY: + for (remove : notif.oldValue as List) + addToNewObjects(removedObjects, newObjects, remove) + } + } +} diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend index 81874970d..f86946d75 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend @@ -5,7 +5,6 @@ import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence import fr.inria.diverse.trace.commons.model.trace.Step import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon import fr.inria.diverse.trace.gemoc.api.ITraceExplorer -import fr.inria.diverse.trace.gemoc.api.ITraceListener import fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor import java.util.ArrayList import java.util.List @@ -18,8 +17,9 @@ import org.eclipse.xtext.naming.QualifiedName import org.gemoc.execution.sequential.javaengine.ui.Activator import org.gemoc.executionframework.engine.core.EngineStoppedException import org.gemoc.xdsmlframework.api.core.IExecutionEngine +import fr.inria.diverse.trace.gemoc.api.ITraceViewListener -public class OmniscientGenericSequentialModelDebugger extends GenericSequentialModelDebugger implements ITraceListener { +public class OmniscientGenericSequentialModelDebugger extends GenericSequentialModelDebugger implements ITraceViewListener { private var ITraceExplorer traceExplorer @@ -228,7 +228,7 @@ public class OmniscientGenericSequentialModelDebugger extends GenericSequentialM val traceAddons = executionEngine.getAddonsTypedBy(IMultiDimensionalTraceAddon) val traceAddon = traceAddons.iterator().next() traceExplorer = traceAddon.getTraceExplorer() - traceExplorer.addListener(this) + traceExplorer.registerCommand(this, [|update]) } override void engineAboutToStop(IExecutionEngine engine) { @@ -268,5 +268,5 @@ public class OmniscientGenericSequentialModelDebugger extends GenericSequentialM // Shhh } } - } + } } diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java index 32262332e..4917fc759 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java @@ -66,7 +66,7 @@ private void createLayout(Composite parent) { groupmap.put(extension.getId(), createGroup(parent, extension.getName())); } - groupmap.put("", createGroup(parent, "")); + groupmap.put("", createGroup(parent, "Uncategorized")); for (EngineAddonSpecificationExtension extension : _components.keySet()) { Group parentGroup = groupmap.get(""); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java index c59b6c20c..453ea4a9e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java @@ -19,6 +19,8 @@ public interface IMultiDimensionalTraceAddon extends IEngineAddon { ITraceConstructor getTraceConstructor(); ITraceExtractor getTraceExtractor(); + + ITraceNotifier getTraceNotifier(); IStepFactory getFactory(); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java index 8e5c76763..87e3e6646 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java @@ -16,7 +16,7 @@ import fr.inria.diverse.trace.commons.model.trace.Step; -public interface ITraceExplorer extends ITraceNotifier, ITraceListener { +public interface ITraceExplorer extends ITraceViewNotifier, ITraceListener { /** * @return The current step diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java index 35af299bf..c5c265ca5 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java @@ -19,7 +19,7 @@ import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.Step; -public interface ITraceExtractor { +public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { /** * Tells the extractor to ignore or not the value trace located at the provided index. @@ -49,13 +49,13 @@ public interface ITraceExtractor { * @param states The list of states to process * @return The lists of states that have the same values vectors */ - Collection> computeStateEquivalenceClasses(List states); + List> computeStateEquivalenceClasses(List states); /** * Computes the lists of states that have the same values vectors, for all the states of the trace. * @return The lists of states that have the same values vectors */ - Collection> computeStateEquivalenceClasses(); + List> computeStateEquivalenceClasses(); /** * @return the launch configuration that was used to generate the trace @@ -162,7 +162,7 @@ public interface ITraceExtractor { * Updates the state of the extractor. * To be called when the trace has changed. */ - void update(); +// void update(); class ValueWrapper { diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java index b91bd6ef4..dae6f2067 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java @@ -10,8 +10,19 @@ *******************************************************************************/ package fr.inria.diverse.trace.gemoc.api; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; + public interface ITraceListener { - void update(); + void statesAdded(List states); + + void stepsStarted(List steps); + + void stepsEnded(List steps); + + void valuesAdded(List values); + void dimensionsAdded(List> dimensions); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceNotifier.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceNotifier.java index f9dbd4499..357143b70 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceNotifier.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceNotifier.java @@ -13,6 +13,8 @@ public interface ITraceNotifier { void notifyListeners(); + + void notifyListener(ITraceListener listener); void addListener(ITraceListener listener); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewListener.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewListener.java new file mode 100644 index 000000000..ebdec4fe3 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewListener.java @@ -0,0 +1,17 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package fr.inria.diverse.trace.gemoc.api; + +public interface ITraceViewListener { + + void update(); + +} diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewNotifier.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewNotifier.java new file mode 100644 index 000000000..1b0ed11d1 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewNotifier.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package fr.inria.diverse.trace.gemoc.api; + +public interface ITraceViewNotifier { + + void notifyListeners(); + + void registerCommand(ITraceViewListener listener, TraceViewCommand command); + + void removeListener(ITraceViewListener listener); + + interface TraceViewCommand { + + void execute(); + + } +} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index 8c59fe04f..17683db0c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -40,6 +40,7 @@ class GenericEngineTraceAddonGenerator { private var String traceConstructorClassName private var String traceExplorerClassName private var String traceExtractorClassName + private var String traceNotifierClassName private var String stepFactoryClassName private var TraceMMGenerationTraceability traceability private var Set genPackages @@ -88,6 +89,7 @@ class GenericEngineTraceAddonGenerator { traceConstructorClassName = GenericTracePluginGenerator.traceConstructorClassName traceExplorerClassName = GenericTracePluginGenerator.traceExplorerClassName traceExtractorClassName = GenericTracePluginGenerator.traceExtractorClassName + traceNotifierClassName = GenericTracePluginGenerator.traceNotifierClassName stepFactoryClassName = GenericTracePluginGenerator.languageName.replaceAll(" ", "").toFirstUpper + "StepFactory" traceability = GenericTracePluginGenerator.traceability genPackages = GenericTracePluginGenerator.referencedGenPackages @@ -177,11 +179,13 @@ import java.util.Map; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; import fr.inria.diverse.trace.gemoc.api.IStepFactory; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; +import fr.inria.diverse.trace.gemoc.api.ITraceNotifier; import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon; public class «className» extends AbstractTraceAddon { @@ -226,6 +230,12 @@ public class «className» extends AbstractTraceAddon { return null; } + + @Override + public ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) { + return new «traceNotifierClassName»(traceListener); + } + @Override public IStepFactory getFactory() { if (factory == null) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF index 1010acc30..5cb478088 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", org.eclipse.emf.transaction;bundle-version="1.8.0", fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", org.eclipse.xtext, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" + fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", + org.gemoc.commons.eclipse;bundle-version="0.1.0" Export-Package: fr.inria.diverse.trace.gemoc.traceaddon diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index 369068f1e..994994b79 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -29,13 +29,17 @@ import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelC import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.gemoc.xdsmlframework.api.core.IExecutionEngine +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener +import org.gemoc.commons.eclipse.emf.EMFResource -abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDimensionalTraceAddon, ITraceNotifier { +abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDimensionalTraceAddon { private IExecutionContext _executionContext private ITraceExplorer traceExplorer private ITraceExtractor traceExtractor private ITraceConstructor traceConstructor + private ITraceNotifier traceNotifier + private BatchModelChangeListener traceListener private boolean shouldSave = true private var boolean needTransaction = true @@ -52,6 +56,8 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi abstract def ITraceExplorer constructTraceExplorer(Resource modelResource, Resource traceResource, Map tracedToExe) + abstract def ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) + override getTraceExplorer() { return traceExplorer } @@ -63,14 +69,16 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi override getTraceExtractor() { return traceExtractor } + + override getTraceNotifier() { + return traceNotifier + } private val List listeners = new ArrayList - override void notifyListeners() { listeners.forEach[l|l.update] } + def void addListener(ITraceListener listener) { listeners.add(listener) } - override void addListener(ITraceListener listener) { listeners.add(listener) } - - override void removeListener(ITraceListener listener) { listeners.remove(listener) } + def void removeListener(ITraceListener listener) { listeners.remove(listener) } public def void disableTraceSaving() { shouldSave = false @@ -102,11 +110,18 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi if (step != null) { modifyTrace([ traceConstructor.addState(listenerAddon.getChanges(this)) - if (add) + if (add) { traceConstructor.addStep(step) - else + } else { traceConstructor.endStep(step) - traceExtractor.update() + } + + // Updating the trace extractor and explorer with the last changes + traceNotifier.notifyListener(traceExtractor) + traceNotifier.notifyListener(traceExplorer) + // Updating other trace listeners with the last changes + traceNotifier.notifyListeners + // Updating the state of the trace explorer traceExplorer.updateCallStack(step) ]) @@ -157,7 +172,12 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi // And we enable trace exploration by loading it in a new trace explorer traceExplorer = constructTraceExplorer(modelResource, traceResource, exeToTraced.inverse) + //------------------------------------------------------- traceExtractor = constructTraceExtractor(traceResource) + traceListener = new BatchModelChangeListener(EMFResource.getRelatedResources(traceResource)); + traceNotifier = constructTraceNotifier(traceListener) + traceNotifier.addListener(traceExtractor) + traceNotifier.addListener(traceExplorer) } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java index a5ee81391..ccb30978a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java @@ -4,6 +4,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.Step; @@ -12,6 +13,7 @@ import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; +import fr.inria.diverse.trace.gemoc.api.ITraceNotifier; public class GenericTraceEngineAddon extends AbstractTraceAddon { @@ -66,4 +68,9 @@ public ITraceExtractor constructTraceExtractor(Resource traceResource) { return null; } + @Override + public ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) { + return null; + } + } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java index 9e7c0d91c..1a0982134 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java @@ -2,7 +2,11 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import org.eclipse.emf.ecore.EObject; @@ -11,7 +15,7 @@ import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; -import fr.inria.diverse.trace.gemoc.api.ITraceListener; +import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; public class GenericTraceExplorer implements ITraceExplorer { @@ -27,7 +31,7 @@ public class GenericTraceExplorer implements ITraceExplorer { private Step stepBackOverResult; private Step stepBackOutResult; - final private List listeners = new ArrayList<>(); + private Map> listeners = new HashMap<>(); @SuppressWarnings("unchecked") private Step computeBackInto(List stepPath) { @@ -211,32 +215,6 @@ public void loadTrace(Trace> root) { traceRoot = root; } - @Override - public void notifyListeners() { - for (ITraceListener listener : listeners) { - listener.update(); - } - } - - @Override - public void addListener(ITraceListener listener) { - if (listener != null) { - listeners.add(listener); - } - } - - @Override - public void removeListener(ITraceListener listener) { - if (listener != null) { - listeners.remove(listener); - } - } - - @Override - public void update() { - notifyListeners(); - } - @Override public Step getCurrentForwardStep() { if (!callStack.isEmpty()) { @@ -391,7 +369,63 @@ public void updateCallStack(Step step) { container = container.eContainer(); } computeExplorerState(newPath); - update(); + notifyListeners(); + } + + @Override + public void notifyListeners() { + for (Map.Entry> entry : listeners.entrySet()) { + entry.getValue().forEach(c -> c.execute()); + } + } + + @Override + public void registerCommand(ITraceViewListener listener, TraceViewCommand command) { + if (listener != null) { + Set commands = listeners.get(listener); + if (commands == null) { + commands = new HashSet<>(); + listeners.put(listener, commands); + } + commands.add(command); + } + } + + @Override + public void removeListener(ITraceViewListener listener) { + if (listener != null) { + listeners.remove(listener); + } + } + + @Override + public void statesAdded(List states) { + // TODO Auto-generated method stub + + } + + @Override + public void valuesAdded(List values) { + // TODO Auto-generated method stub + + } + + @Override + public void dimensionsAdded(List> dimensions) { + // TODO Auto-generated method stub + + } + + @Override + public void stepsStarted(List steps) { + // TODO Auto-generated method stub + + } + + @Override + public void stepsEnded(List steps) { + // TODO Auto-generated method stub + } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index a162bcf9c..c09eccc2a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -1,9 +1,12 @@ package fr.inria.diverse.trace.gemoc.traceaddon; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import org.eclipse.emf.ecore.EObject; @@ -13,14 +16,12 @@ import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; +import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; public class GenericTraceExtractor implements ITraceExtractor { private Trace> traceRoot; - - @Override - public void update() { - } + private Map> listeners = new HashMap<>(); @Override public boolean compareStates(EObject e1, EObject e2, boolean respectIgnored) { @@ -111,12 +112,12 @@ public boolean isValueTraceIgnored(int trace) { } @Override - public Collection> computeStateEquivalenceClasses(List states) { + public List> computeStateEquivalenceClasses(List states) { return null; } @Override - public Collection> computeStateEquivalenceClasses() { + public List> computeStateEquivalenceClasses() { return null; } @@ -125,4 +126,57 @@ public StateWrapper getStateWrapper(EObject state) { return null; } + @Override + public void statesAdded(List states) { + // TODO Auto-generated method stub + } + + @Override + public void valuesAdded(List values) { + // TODO Auto-generated method stub + } + + @Override + public void dimensionsAdded(List> dimensions) { + // TODO Auto-generated method stub + } + + @Override + public void notifyListeners() { + for (Map.Entry> entry : listeners.entrySet()) { + entry.getValue().forEach(c -> c.execute()); + } + } + + @Override + public void registerCommand(ITraceViewListener listener, TraceViewCommand command) { + if (listener != null) { + Set commands = listeners.get(listener); + if (commands == null) { + commands = new HashSet<>(); + listeners.put(listener, commands); + } + commands.add(command); + } + } + + @Override + public void removeListener(ITraceViewListener listener) { + if (listener != null) { + listeners.remove(listener); + } + } + + @Override + public void stepsStarted(List steps) { + // TODO Auto-generated method stub + + } + + @Override + public void stepsEnded(List steps) { + // TODO Auto-generated method stub + + } + } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF index 2654f614a..848b1fd6d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF @@ -24,6 +24,7 @@ Require-Bundle: com.google.guava, fr.inria.diverse.trace.annotations;bundle-version="0.1.0", org.eclipse.emf.codegen.ecore.ui, org.eclipse.core.expressions;bundle-version="3.4.600" -Export-Package: fr.inria.diverse.trace.plugin.generator +Export-Package: fr.inria.diverse.trace.plugin.generator, + fr.inria.diverse.trace.plugin.generator.clean Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend index 2ccc02a03..068d4a87d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend @@ -5,17 +5,21 @@ import fr.inria.diverse.trace.commons.EclipseUtil import fr.inria.diverse.trace.commons.ManifestUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerator +import fr.inria.diverse.trace.plugin.generator.clean.StandaloneEMFProjectGenerator import fr.inria.diverse.trace.plugin.generator.codegen.TraceConstructorGeneratorJava import fr.inria.diverse.trace.plugin.generator.codegen.TraceExplorerGeneratorJava import fr.inria.diverse.trace.plugin.generator.codegen.TraceExtractorGeneratorJava +import fr.inria.diverse.trace.plugin.generator.codegen.TraceNotifierGeneratorJava import java.util.HashSet import java.util.Set import org.eclipse.core.resources.IProject import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EGenericType import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EStructuralFeature +import org.eclipse.emf.ecore.EcoreFactory import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.jdt.core.IJavaProject import org.eclipse.jdt.core.IPackageFragment @@ -24,7 +28,7 @@ import org.eclipse.jdt.core.JavaCore import org.eclipse.ui.PlatformUI import org.eclipse.xtend.lib.annotations.Accessors import tracingannotations.TracingAnnotations -import fr.inria.diverse.trace.plugin.generator.clean.StandaloneEMFProjectGenerator +import org.eclipse.emf.ecore.ETypeParameter /** * Glues the generators : trace metamodel, emf project and trace manager @@ -56,6 +60,8 @@ class GenericTracePluginGenerator { @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) var String traceExtractorClassName @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + var String traceNotifierClassName + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) var IPackageFragment packageFragment @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) var IProject project @@ -99,7 +105,6 @@ class GenericTracePluginGenerator { } def void generate(IProgressMonitor m) { - tracedLanguageName = abstractSyntax.name languageName = abstractSyntax.name.replaceAll(" ", "") + "Trace" @@ -122,7 +127,7 @@ class GenericTracePluginGenerator { val EPackage tracemm = tmmgenerator.tracemmresult // Generate EMF project - // val AbstractEMFProjectGenerator emfGen = new FakeWizardEMFProjectGenerator(pluginName, tracemm) +// val AbstractEMFProjectGenerator emfGen = new FakeWizardEMFProjectGenerator(pluginName, tracemm) val AbstractEMFProjectGenerator emfGen = new StandaloneEMFProjectGenerator(pluginName, tracemm) emfGen.generateBaseEMFProject(m) val referencedGenPackagesRoots = emfGen.referencedGenPackages @@ -167,8 +172,7 @@ class GenericTracePluginGenerator { pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, abstractSyntax, partialTraceManagement) traceConstructorClassName = tconstructorgen.className - packageFragment.createCompilationUnit(traceConstructorClassName + ".java", tconstructorgen.generateCode, true, - m) + packageFragment.createCompilationUnit(traceConstructorClassName + ".java", tconstructorgen.generateCode, true, m) // Generate trace explorer val TraceExplorerGeneratorJava texplorergen = new TraceExplorerGeneratorJava(languageName, @@ -184,6 +188,12 @@ class GenericTracePluginGenerator { traceExtractorClassName = textractorgen.className packageFragment.createCompilationUnit(traceExtractorClassName + ".java", textractorgen.generateCode, true, m) + // Generate trace notifier + val TraceNotifierGeneratorJava tnotifiergen = new TraceNotifierGeneratorJava(languageName, + pluginName + ".tracemanager", tmmgenerator.traceability, referencedGenPackages) + traceNotifierClassName = tnotifiergen.className + packageFragment.createCompilationUnit(traceNotifierClassName + ".java", tnotifiergen.generateCode, true, m) + } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend index 6c2afdcb6..cd4125694 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend @@ -205,20 +205,20 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { return pluginID; } - private def GenJDKLevel getComplicanceLevel() { - val String complianceLevel = CodeGenUtil.EclipseUtil.getJavaComplianceLevel(project); - if ("1.4".equals(complianceLevel)) { - return GenJDKLevel.JDK14_LITERAL; - } else if ("1.5".equals(complianceLevel)) { - return GenJDKLevel.JDK50_LITERAL; - } else if ("1.6".equals(complianceLevel)) { - return GenJDKLevel.JDK60_LITERAL; - } else if ("1.7".equals(complianceLevel)) { - return GenJDKLevel.JDK70_LITERAL; - } else { - return GenJDKLevel.JDK80_LITERAL; + private def GenJDKLevel getComplicanceLevel() { + val String complianceLevel = CodeGenUtil.EclipseUtil.getJavaComplianceLevel(project); + if ("1.4".equals(complianceLevel)) { + return GenJDKLevel.JDK14_LITERAL; + } else if ("1.5".equals(complianceLevel)) { + return GenJDKLevel.JDK50_LITERAL; + } else if ("1.6".equals(complianceLevel)) { + return GenJDKLevel.JDK60_LITERAL; + } else if ("1.7".equals(complianceLevel)) { + return GenJDKLevel.JDK70_LITERAL; + } else { + return GenJDKLevel.JDK80_LITERAL; + } } - } /** * In case of missing parameter types, the types are temporarily set to diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 04a91ed9f..17b30d2d7 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -178,7 +178,7 @@ class TraceConstructorGeneratorJava { } public def String generateCode() { - val String code = generateTraceManagerClass() + val String code = generateTraceConstructorClass() try { return CodeGenUtil.formatJavaCode(code) } catch (Throwable t) { @@ -1159,7 +1159,7 @@ private def String generateAddStateUsingListenerMethods() { ''' } - private def String generateTraceManagerClass() { + private def String generateTraceConstructorClass() { val body = ''' diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend index ad6916d2a..fb00dce82 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend @@ -73,13 +73,12 @@ class TraceExplorerGeneratorJava { } public def String generateCode() { - val String code = generateTraceManagerClass() + val String code = generateTraceExplorerClass() try { return CodeGenUtil.formatJavaCode(code) } catch (Throwable t) { return code } - } public static def String getBaseFQN(Rule r) { @@ -135,8 +134,10 @@ class TraceExplorerGeneratorJava { «ENDIF» import java.util.Collections; import java.util.HashMap; + import java.util.HashSet; import java.util.List; import java.util.Map; + import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -150,7 +151,7 @@ class TraceExplorerGeneratorJava { import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; - import fr.inria.diverse.trace.gemoc.api.ITraceListener; + import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; ''' } @@ -163,9 +164,9 @@ class TraceExplorerGeneratorJava { private int lastJumpIndex = -1; private «stateFQN» currentState = null; - final private List callStack = new ArrayList<>(); + private final List callStack = new ArrayList<>(); - final private List> valueTraces = new ArrayList<>(); + private final List> valueTraces = new ArrayList<>(); private List<«stateFQN»> statesTrace; @@ -177,12 +178,12 @@ class TraceExplorerGeneratorJava { private «specificStepFQN» stepBackOverResult; private «specificStepFQN» stepBackOutResult; - final private Map<«specificStepFQN», Integer> stepToStartingIndex = new HashMap<>(); - final private Map<«specificStepFQN», Integer> stepToEndingIndex = new HashMap<>(); + private final Map<«specificStepFQN», Integer> stepToStartingIndex = new HashMap<>(); + private final Map<«specificStepFQN», Integer> stepToEndingIndex = new HashMap<>(); - private final HashMap canBackValueCache = new HashMap<>(); + private final HashMap, «valueFQN»> backValueCache = new HashMap<>(); - final private List listeners = new ArrayList<>(); + private final Map> listeners = new HashMap<>(); ''' } @@ -219,7 +220,7 @@ class TraceExplorerGeneratorJava { return result; } - private «valueFQN» getActiveValue(List valueTrace, «stateFQN» state) { + private «valueFQN» getActiveValue(final List valueTrace, final «stateFQN» state) { «valueFQN» result = null; for («valueFQN» value : valueTrace) { if (value.getStatesNoOpposite().contains(state)) { @@ -230,49 +231,27 @@ class TraceExplorerGeneratorJava { return result; } - private int getPreviousValueIndex(final List valueTrace) { - «valueFQN» value = getActiveValue(valueTrace, currentState); - if (value != null) { - return valueTrace.indexOf(value) - 1; - } else { - int i = getCurrentStateIndex() - 1; - while (i > -1 && value == null) { - value = getActiveValue(valueTrace, statesTrace.get(i)); - i--; - } - if (value == null) { - return -1; - } else { - return valueTrace.indexOf(value) - 1; - } + private «valueFQN» getPreviousValue(final List valueTrace) { + int i = getCurrentStateIndex() - 1; + final «valueFQN» value = getActiveValue(valueTrace, statesTrace.get(i+1)); + «valueFQN» previousValue = null; + while (i > -1 && (previousValue == null || previousValue == value)) { + previousValue = getActiveValue(valueTrace, statesTrace.get(i)); + i--; } + return previousValue; } - private int getNextValueIndex(List valueTrace) { - «valueFQN» value = getActiveValue(valueTrace, currentState); - if (value != null) { - final int idx = valueTrace.indexOf(value) + 1; - if (idx < valueTrace.size()) { - return idx; - } - return -1; - } else { - int i = getCurrentStateIndex() + 1; - final int traceLength = valueTrace.size(); - while (i < traceLength && value == null) { - value = getActiveValue(valueTrace, statesTrace.get(i)); - i++; - } - if (value == null) { - return -1; - } else { - final int idx = valueTrace.indexOf(value) + 1; - if (idx < valueTrace.size()) { - return idx; - } - return -1; - } + private «valueFQN» getNextValue(final List valueTrace) { + int i = getCurrentStateIndex() + 1; + final «valueFQN» value = getActiveValue(valueTrace, statesTrace.get(i-1)); + «valueFQN» nextValue = null; + final int traceLength = valueTrace.stream().map(v -> v.getStatesNoOpposite().size()).reduce(0, (a,b) -> a+b); + while (i < traceLength && (nextValue == null || nextValue == value)) { + nextValue = getActiveValue(valueTrace, statesTrace.get(i)); + i++; } + return nextValue; } ''' } @@ -532,6 +511,7 @@ class TraceExplorerGeneratorJava { «ENDIF» } «ENDFOR» + backValueCache.clear(); } else if (eObject instanceof «valueFQN») { goTo(((«valueFQN»)eObject).getStatesNoOpposite().get(0)); } @@ -622,15 +602,7 @@ class TraceExplorerGeneratorJava { @Override public boolean canBackValue(int traceIndex) { if (traceIndex > -1 && traceIndex < valueTraces.size()) { - return canBackValueCache - .computeIfAbsent( - traceIndex, - i -> { - final List valueTrace = valueTraces - .get(traceIndex); - final int previousValueIndex = getPreviousValueIndex(valueTrace); - return previousValueIndex > -1; - }); + return backValueCache.computeIfAbsent(valueTraces.get(traceIndex), valueTrace -> getPreviousValue(valueTrace)) != null; } return false; } @@ -643,11 +615,9 @@ class TraceExplorerGeneratorJava { @Override public void backValue(int traceIndex) { if (traceIndex > -1 && traceIndex < valueTraces.size()) { - final List valueTrace = valueTraces - .get(traceIndex); - final int previousValueIndex = getPreviousValueIndex(valueTrace); - if (previousValueIndex > -1) { - jump(valueTrace.get(previousValueIndex)); + final «valueFQN» previousValue = backValueCache.get(valueTraces.get(traceIndex)); + if (previousValue != null) { + jump(previousValue); } } } @@ -655,11 +625,9 @@ class TraceExplorerGeneratorJava { @Override public void stepValue(int traceIndex) { if (traceIndex > -1 && traceIndex < valueTraces.size()) { - final List valueTrace = valueTraces - .get(traceIndex); - final int nextValueIndex = getNextValueIndex(valueTrace); - if (nextValueIndex > -1) { - jump(valueTrace.get(nextValueIndex)); + final «valueFQN» nextValue = getNextValue(valueTraces.get(traceIndex)); + if (nextValue != null) { + jump(nextValue); } } } @@ -795,33 +763,30 @@ class TraceExplorerGeneratorJava { @Override public void notifyListeners() { - for (ITraceListener listener : listeners) { - listener.update(); + for (Map.Entry> entry : listeners.entrySet()) { + entry.getValue().forEach(c -> c.execute()); } } @Override - public void addListener(ITraceListener listener) { + public void registerCommand(ITraceViewListener listener, TraceViewCommand command) { if (listener != null) { - listeners.add(listener); + Set commands = listeners.get(listener); + if (commands == null) { + commands = new HashSet<>(); + listeners.put(listener, commands); + } + commands.add(command); } } @Override - public void removeListener(ITraceListener listener) { + public void removeListener(ITraceViewListener listener) { if (listener != null) { listeners.remove(listener); } } - @Override - public void update() { - valueTraces.clear(); - valueTraces.addAll(getAllValueTraces()); - canBackValueCache.clear(); - notifyListeners(); - } - @Override public Step getCurrentForwardStep() { if (!callStack.isEmpty()) { @@ -945,15 +910,38 @@ class TraceExplorerGeneratorJava { container = container.eContainer(); } computeExplorerState(newPath); - update(); + notifyListeners(); } else { throw new IllegalArgumentException("«className» expects specific steps and cannot handle this: "+step); } } + + @Override + public void statesAdded(List state) { + } + + @Override + public void valuesAdded(List value) { + } + + @Override + public void dimensionsAdded(List> dimensions) { + valueTraces.clear(); + valueTraces.addAll(getAllValueTraces()); + notifyListeners(); + } + + @Override + public void stepsStarted(List steps) { + } + + @Override + public void stepsEnded(List steps) { + } ''' } - private def String generateTraceManagerClass() { + private def String generateTraceExplorerClass() { val body = ''' diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend index cde33a797..bc692243b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend @@ -72,7 +72,7 @@ class TraceExtractorGeneratorJava { } public def String generateCode() { - val String code = generateTraceManagerClass() + val String code = generateTraceExtractorClass() try { return CodeGenUtil.formatJavaCode(code) } catch (Throwable t) { @@ -96,15 +96,15 @@ class TraceExtractorGeneratorJava { private def String generateImports() { return ''' - import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; + import java.util.HashSet; import java.util.List; import java.util.Map; - import java.util.Map.Entry; import java.util.Optional; + import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; import java.util.regex.Pattern; @@ -112,7 +112,6 @@ class TraceExtractorGeneratorJava { import org.eclipse.emf.common.util.Monitor; import org.eclipse.emf.compare.Comparison; - import org.eclipse.emf.compare.Diff; import org.eclipse.emf.compare.EMFCompare; import org.eclipse.emf.compare.Match; import org.eclipse.emf.compare.diff.DefaultDiffEngine; @@ -138,6 +137,7 @@ class TraceExtractorGeneratorJava { import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; + import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; ''' } @@ -156,6 +156,11 @@ class TraceExtractorGeneratorJava { final private DefaultDeclarativeQualifiedNameProvider nameProvider = new DefaultDeclarativeQualifiedNameProvider(); final private Map ignoredValueTraces = new HashMap<>(); + + private final Map, List> stateEquivalenceClasses = Collections.synchronizedMap(new HashMap<>()); + private final Map, List> cachedMaskedStateEquivalenceClasses = Collections.synchronizedMap(new HashMap<>()); + + private final List<«valueFQN»> observedValues = new ArrayList<>(); ''' } @@ -163,6 +168,7 @@ class TraceExtractorGeneratorJava { return ''' public «className»() { + observedValues.add(null); configureDiffEngine(); } ''' @@ -240,9 +246,13 @@ class TraceExtractorGeneratorJava { private EMFCompare compare; - private List compareEObjects(EObject e1, EObject e2) { + private boolean compareEObjects(EObject e1, EObject e2) { if (e1 == e2) { - return Collections.emptyList(); + return true; + } + + if (e1 == null || e2 == null) { + return false; } if (!compareInitialized) { @@ -255,74 +265,18 @@ class TraceExtractorGeneratorJava { final IComparisonScope scope = new DefaultComparisonScope(e1, e2, null); final Comparison comparison = compare.compare(scope); - return comparison.getDifferences(); - } - - private void computeStateComparisonValue(final «stateFQN» state, - final List<«valueFQN»> values, - final Map<«stateFQN», Integer> stateToComparisonValue, - final List<«valueFQN»> observedValues, final int statesNb) { - Integer stateComparisonValue = stateToComparisonValue.get(state); - for (int i = 0; i < values.size(); i++) { - final «valueFQN» value = values.get(i); - int idx = -1; - for (int j = 0; j < observedValues.size(); j++) { - final «valueFQN» v1 = observedValues.get(j); - final «valueFQN» v2 = value; - if (v1.eClass() == v2.eClass() && compareEObjects(v1, v2).isEmpty()) { - idx = j; - break; - } - } - final int pow = (int) Math.pow(statesNb, i); - if (idx != -1) { - if (stateComparisonValue == null) { - stateComparisonValue = (idx + 1) * pow; - } else { - stateComparisonValue = stateComparisonValue + (idx + 1) * pow; - } - } else { - observedValues.add(value); - idx = observedValues.size(); - if (stateComparisonValue == null) { - stateComparisonValue = idx * pow; - } else { - stateComparisonValue = stateComparisonValue + idx * pow; - } - } - stateToComparisonValue.put(state, stateComparisonValue); - } + return comparison.getDifferences().isEmpty(); } - @Override - public Collection> computeStateEquivalenceClasses() { - return computeStateEquivalenceClasses(statesTrace); - } - - @Override - public Collection> computeStateEquivalenceClasses(List states) { - final Map<«stateFQN», List<«valueFQN»>> stateToValues = new HashMap<>(); - final List>> stateToValueIndexes = new ArrayList<>(); - final List<«stateFQN»> stateList = new ArrayList<>(); - final List<«valueFQN»> observedValues = new ArrayList<>(); - - states.stream().distinct().map(e -> («stateFQN») e).forEach(s -> { - final List<«valueFQN»> values = getAllStateValues(s); - stateToValues.put(s, values); - stateList.add(s); - }); - - for («stateFQN» state : stateList) { + private List computeStateComparisonList(List<«valueFQN»> values) { final List valueIndexes = new ArrayList<>(); - stateToValueIndexes.add(new SimpleEntry<>(state, valueIndexes)); - final List<«valueFQN»> values = stateToValues.get(state); for (int i = 0; i < values.size(); i++) { final «valueFQN» value = values.get(i); int idx = -1; for (int j = 0; j < observedValues.size(); j++) { final EObject v1 = observedValues.get(j); final EObject v2 = value; - if (compareEObjects(v1, v2).isEmpty()) { + if (compareEObjects(v1, v2)) { idx = j; break; } @@ -334,37 +288,95 @@ class TraceExtractorGeneratorJava { observedValues.add(value); } } + return valueIndexes; + } + + private void updateEquivalenceClasses(«stateFQN» state) { + final List<«valueFQN»> values = getAllStateValues(state, true); + final List valueIndexes = computeStateComparisonList(values); + List equivalenceClass = stateEquivalenceClasses.get(valueIndexes); + if (equivalenceClass == null) { + equivalenceClass = new ArrayList<>(); + stateEquivalenceClasses.put(valueIndexes, equivalenceClass); + } + equivalenceClass.add(state); + // If the cached masked equivalence classes have not been flushed, updated them. + final List dimensionsToMask = computeDimensionMask(); + if (!(dimensionsToMask.isEmpty() || cachedMaskedStateEquivalenceClasses.isEmpty())) { + final List maskedIndexList = applyMask(valueIndexes, dimensionsToMask); + equivalenceClass = cachedMaskedStateEquivalenceClasses.get(maskedIndexList); + if (equivalenceClass == null) { + equivalenceClass = new ArrayList<>(); + cachedMaskedStateEquivalenceClasses.put(maskedIndexList, equivalenceClass); + } + equivalenceClass.add(state); + } + } + + private void updateEquivalenceClasses(List<«stateFQN»> states) { + states.stream().distinct().forEach(s -> updateEquivalenceClasses(s)); } - final List> distinctClasses = stateToValueIndexes.stream() - .map(p -> p.getValue()).distinct().collect(Collectors.toList()); - final Map> result = new HashMap<>(); + /* + * Return the list of indexes of value traces that are ignored. + */ + private List computeDimensionMask() { + final List result = new ArrayList<>(); + for (int i = 0; i < valueTraces.size(); i++) { + if (isValueTraceIgnored(i)) { + result.add(i); + } + } + return result; + } - stateToValueIndexes.forEach(p -> { - final «stateFQN» state = p.getKey(); - final List indexes = p.getValue(); - int v = distinctClasses.indexOf(indexes); - List equivalentStates = result.get(v); - if (equivalentStates == null) { - equivalentStates = new ArrayList<>(); - result.put(v, equivalentStates); + private List applyMask(List source, List mask) { + final List result = new ArrayList<>(source); + int j = 0; + for (Integer i : mask) { + result.remove(i - j); + j++; } - if (equivalentStates.isEmpty()) { - equivalentStates.add(state); - } else { - if (states.indexOf(state) < states.indexOf(equivalentStates.get(0))) { - equivalentStates.add(0, state); - } else { - equivalentStates.add(state); - } + return result; + } + + private List> getStateEquivalenceClasses() { + final List dimensionsToMask = computeDimensionMask(); + if (dimensionsToMask.isEmpty()) { + return new ArrayList<>(stateEquivalenceClasses.values()); } - }); + if (cachedMaskedStateEquivalenceClasses.isEmpty()) { + stateEquivalenceClasses.forEach((indexList, stateList) -> { + final List maskedIndexList = applyMask(indexList, dimensionsToMask); + List equivalenceClass = cachedMaskedStateEquivalenceClasses.get(maskedIndexList); + if (equivalenceClass == null) { + equivalenceClass = new ArrayList<>(); + cachedMaskedStateEquivalenceClasses.put(maskedIndexList, equivalenceClass); + } + equivalenceClass.addAll(stateList); + }); + } + return new ArrayList<>(cachedMaskedStateEquivalenceClasses.values()); + } - return result.values().stream().collect(Collectors.toList()); - } + @Override + public List> computeStateEquivalenceClasses() { + return getStateEquivalenceClasses().stream() + .map(l -> new ArrayList<>(l)) + .collect(Collectors.toList()); + } + + @Override + public List> computeStateEquivalenceClasses(List states) { + return getStateEquivalenceClasses().stream() + .map(l -> l.stream() + .filter(s -> states.contains(s)) + .collect(Collectors.toList())) + .collect(Collectors.toList()); + } @Override - public boolean compareStates(EObject eObject1, EObject eObject2, boolean respectIgnored) { + public boolean compareStates(EObject eObject1, EObject eObject2, boolean respectIgnored) { final «stateFQN» state1; final «stateFQN» state2; @@ -387,21 +399,21 @@ class TraceExtractorGeneratorJava { return false; } - final List> result = new ArrayList<>(); + boolean result = true; for (int i = 0; i < values1.size(); i++) { if (!respectIgnored || !isValueTraceIgnored(i)) { final «valueFQN» value1 = values1.get(i); final «valueFQN» value2 = values2.get(i); if (value1 != value2) { - final List diffs = compareEObjects(value1, value2); - if (!diffs.isEmpty()) { - result.add(diffs); + result = result && compareEObjects(value1, value2); + if (!result) { + break; } } } } - return result.isEmpty(); + return result; } public boolean compareSteps(EObject eObject1, EObject eObject2) { @@ -516,31 +528,27 @@ class TraceExtractorGeneratorJava { return result; } - private List<«valueFQN»> getAllStateValues(«stateFQN» state) { - final List> traces = new ArrayList<>(); + return getAllStateValues(state, false); + } + + private List<«valueFQN»> getAllStateValues(«stateFQN» state, + boolean includeHiddenValues) { final List<«valueFQN»> result = new ArrayList<>(); - «FOR mutClass : traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name]» - «val traced = traceability.getTracedClass(mutClass)» - «val mutProps = getAllMutablePropertiesOf(mutClass).sortBy[FQN]» - «IF !mutProps.empty» - for («getJavaFQN(traced)» tracedObject : ((«getJavaFQN(traceability.traceMMExplorer.specificTraceClass)») state.eContainer()).«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))») { - «FOR p : mutProps» - «val EReference ptrace = traceability.getTraceOf(p)» - traces.add(tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)»); - «ENDFOR» - } - «ENDIF» - «ENDFOR» - for (int i = 0; i < traces.size(); i++) { - if (!isValueTraceIgnored(i)) { - final List trace = traces.get(i); + for (int i = 0; i < valueTraces.size(); i++) { + if (includeHiddenValues || !isValueTraceIgnored(i)) { + final List trace = valueTraces.get(i); + boolean notFound = true; for («valueFQN» value : trace) { if (value.getStatesNoOpposite().contains(state)) { result.add(value); + notFound = false; break; } } + if (notFound) { + result.add(null); + } } } return result; @@ -651,6 +659,7 @@ class TraceExtractorGeneratorJava { traceRoot = root; statesTrace = traceRoot.getStatesTrace(); valueTraces.addAll(getAllValueTraces()); + updateEquivalenceClasses(statesTrace); } ''' } @@ -905,25 +914,133 @@ class TraceExtractorGeneratorJava { @Override public void ignoreValueTrace(int trace, boolean ignore) { - ignoredValueTraces.put(trace, ignore); + if (trace > -1 && trace < valueTraces.size()) { + ignoredValueTraces.put(trace, ignore); + cachedMaskedStateEquivalenceClasses.clear(); + notifyListeners(); + } } @Override public boolean isValueTraceIgnored(int trace) { - Boolean result = ignoredValueTraces.get(trace); + Boolean result = null; + if (trace > -1 && trace < valueTraces.size()) { + result = ignoredValueTraces.get(trace); + } return result != null && result; } + @Override + public void statesAdded(List states) { + updateEquivalenceClasses(states.stream() + .map(e -> («stateFQN») e).collect(Collectors.toList())); + notifyListeners(); + } + + private Map>> valuesTracesMap = new HashMap<>(); + + private Map> listeners = new HashMap<>(); @Override - public void update() { - valueTraces.clear(); - valueTraces.addAll(getAllValueTraces()); + public void valuesAdded(List values) { +««« for (EObject value : values) { +««« final EReference r = value.eContainmentFeature(); +««« final EObject c = value.eContainer(); +««« List l = null; +««« Map> m = valuesTracesMap.get(c); +««« if (m == null) { +««« m = new HashMap<>(); +««« l = Collections.synchronizedList(new ArrayList<>()); +««« m.put(r, l); +««« valuesTracesMap.put(c, m); +««« } else { +««« l = m.get(r); +««« if (l == null) { +««« l = Collections.synchronizedList(new ArrayList<>()); +««« m.put(r, l); +««« } +««« } +««« l.add(value); +««« } + // Nothing to do here. + } + + @Override + public void dimensionsAdded(List> dimensions) { + if (!dimensions.isEmpty()) { + valueTraces.clear(); + cachedMaskedStateEquivalenceClasses.clear(); + valueTraces.addAll(getAllValueTraces()); + final List insertedTracesIndexes = new ArrayList<>(); + for (List valueTrace : dimensions) { + final int i = valueTraces.indexOf(valueTrace); + insertedTracesIndexes.add(i); + } + Collections.sort(insertedTracesIndexes); + final List> keys = new ArrayList<>(stateEquivalenceClasses.keySet()); + for (List key : keys) { + List states = stateEquivalenceClasses.remove(key); + for (Integer i : insertedTracesIndexes) { + key.add(i, -1); + } + stateEquivalenceClasses.put(key, states); + } + List ignoredTracesIndexes = new ArrayList<>(ignoredValueTraces.keySet()); + Collections.sort(ignoredTracesIndexes); + while (!ignoredTracesIndexes.isEmpty()) { + int i = ignoredTracesIndexes.remove(0); + if (insertedTracesIndexes.get(0) <= i) { + for (int j = ignoredTracesIndexes.size() - 1; j >= 0; j--) { + final Integer idx = ignoredTracesIndexes.get(j); + ignoredValueTraces.put(idx+1, ignoredValueTraces.remove(idx)); + } + ignoredTracesIndexes = ignoredTracesIndexes.stream().map(idx -> idx+1).collect(Collectors.toList()); + ignoredValueTraces.put(i+1, ignoredValueTraces.remove(i)); + insertedTracesIndexes.remove(0); + } + } + } + } + + @Override + public void notifyListeners() { + for (Map.Entry> entry : listeners.entrySet()) { + entry.getValue().forEach(c -> c.execute()); + } + } + + @Override + public void registerCommand(ITraceViewListener listener, TraceViewCommand command) { + if (listener != null) { + Set commands = listeners.get(listener); + if (commands == null) { + commands = new HashSet<>(); + listeners.put(listener, commands); + } + commands.add(command); + } + } + + @Override + public void removeListener(ITraceViewListener listener) { + if (listener != null) { + listeners.remove(listener); + } + } + + @Override + public void stepsStarted(List steps) { + // Nothing to do here. + } + + @Override + public void stepsEnded(List steps) { + // Nothing to do here. } ''' } - private def String generateTraceManagerClass() { + private def String generateTraceExtractorClass() { return ''' package «packageQN»; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend new file mode 100644 index 000000000..6cca7a65d --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend @@ -0,0 +1,186 @@ +package fr.inria.diverse.trace.plugin.generator.codegen + +import fr.inria.diverse.trace.commons.CodeGenUtil +import fr.inria.diverse.trace.commons.EcoreCraftingUtil +import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability +import java.util.HashSet +import java.util.Set +import org.eclipse.emf.codegen.ecore.genmodel.GenPackage +import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EClassifier +import org.eclipse.emf.ecore.EReference +import org.eclipse.emf.ecore.EStructuralFeature + +class TraceNotifierGeneratorJava { + + // Inputs + private val String className + private val String packageQN + private val TraceMMGenerationTraceability traceability + private val Set refGenPackages + + // Shortcuts + private val String stateFQN + private val String valueFQN + private val String specificStepFQN + + public def String getClassName() { + return className + } + + new(String languageName, String packageQN, TraceMMGenerationTraceability traceability, Set refGenPackages) { + this.className = languageName.replaceAll(" ", "").toFirstUpper + "Notifier" + this.packageQN = packageQN + this.traceability = traceability + this.refGenPackages = refGenPackages + + stateFQN = getJavaFQN(traceability.traceMMExplorer.stateClass) + valueFQN = getJavaFQN(traceability.traceMMExplorer.valueClass) + specificStepFQN = getJavaFQN(traceability.traceMMExplorer.specificStepClass) + } + + private def String getFQN(EStructuralFeature eFeature) { + return EcoreCraftingUtil.getBaseFQN(eFeature.EContainingClass) + "." + eFeature.name + } + + private def String getJavaFQN(EClassifier c) { + return getJavaFQN(c,false) + } + + private def String getJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { + return EcoreCraftingUtil.getJavaFQN(c,refGenPackages,enforcePrimitiveJavaClass) + } + + public def String generateCode() { + val String code = generateTraceNotifierClass() + try { + return CodeGenUtil.formatJavaCode(code) + } catch (Throwable t) { + return code + } + } + + private def Set getAllMutablePropertiesOf(EClass exeClass) { + val Set res = new HashSet + res.addAll(traceability.getMutablePropertiesOf(exeClass)) + res.addAll(exeClass.EAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); + return res + } + + private def String generateImports() { + return + ''' + import java.util.ArrayList; + import java.util.List; + + import org.eclipse.emf.ecore.EObject; + import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; + import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; + import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange; + + import fr.inria.diverse.trace.gemoc.api.ITraceListener; + import fr.inria.diverse.trace.gemoc.api.ITraceNotifier; + ''' + } + + private def String generateFields() { + return + ''' + private BatchModelChangeListener traceListener; + + private final List listeners = new ArrayList<>(); + ''' + } + + private def String generateConstructors() { + return + ''' + public «className»(BatchModelChangeListener traceListener) { + this.traceListener = traceListener; + } + ''' + } + + private def String generateMethods() { + return + ''' + @Override + public void notifyListeners() { + for (ITraceListener listener : listeners) { + notifyListener(listener); + } + } + + @Override + public void notifyListener(ITraceListener listener) { + final List changes = traceListener.getChanges(listener); + if (!changes.isEmpty()) { + final List startedSteps = new ArrayList<>(); + final List endedSteps = new ArrayList<>(); + final List newStates = new ArrayList<>(); + final List newValues = new ArrayList<>(); + final List> newDimensions = new ArrayList<>(); + changes.forEach(c -> { + if (c instanceof NewObjectModelChange) { + final EObject o = c.getChangedObject(); + if (o instanceof «valueFQN») { + newValues.add((«valueFQN») o); + } else if (o instanceof «specificStepFQN») { + startedSteps.add((«specificStepFQN») o); + } else if (o instanceof «stateFQN») { + final «stateFQN» newState = («stateFQN») o; + newStates.add(newState); + endedSteps.addAll(newState.getEndedSteps()); + «FOR mutClass : traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name]» + «val traced = traceability.getTracedClass(mutClass)» + «val mutProps = getAllMutablePropertiesOf(mutClass).sortBy[FQN]» + «IF !mutProps.empty» + } else if (o instanceof «getJavaFQN(traced)») { + «FOR p : mutProps» + «val EReference ptrace = traceability.getTraceOf(p)» + newDimensions.add(((«getJavaFQN(traced)») o).«EcoreCraftingUtil.stringGetter(ptrace)»); + «ENDFOR» + «ENDIF» + «ENDFOR» + } + } + }); + listener.valuesAdded(newValues); + listener.dimensionsAdded(newDimensions); + listener.statesAdded(newStates); + listener.stepsStarted(startedSteps); + listener.stepsEnded(endedSteps); + } + } + + @Override + public void addListener(ITraceListener listener) { + listeners.add(listener); + traceListener.registerObserver(listener); + } + + @Override + public void removeListener(ITraceListener listener) { + listeners.remove(listener); + traceListener.removeObserver(listener); + } + ''' + } + + private def String generateTraceNotifierClass() { + return + ''' + package «packageQN»; + + «generateImports» + + public class «className» implements ITraceNotifier { + + «generateFields» + «generateConstructors» + «generateMethods» + } + ''' + } + +} \ No newline at end of file diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java index b2e288520..2658355ee 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java @@ -150,7 +150,7 @@ public void run() { } } }); - + addActionToToolbar(new AbstractEngineAction(Action.AS_PUSH_BUTTON) { @Override protected void init() { @@ -171,9 +171,8 @@ public void run() { TraceSectionsDialog dialog = new TraceSectionsDialog(shell, extractor1, extractor2); dialog.open(); if (dialog.getReturnCode() == Window.OK) { - diffViewer.loadTraces(extractor1, extractor2, - dialog.getS1(), dialog.getS2(), - dialog.getE1(), dialog.getE2()); + diffViewer.loadTraces(extractor1, extractor2, dialog.getS1(), dialog.getS2(), dialog.getE1(), + dialog.getE2()); } } }); diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java index 4576cc088..67d642bee 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java @@ -7,19 +7,31 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; +import javafx.beans.property.ReadOnlyDoubleProperty; +import javafx.embed.swt.FXCanvas; +import javafx.geometry.Pos; +import javafx.scene.Group; +import javafx.scene.Scene; +import javafx.scene.control.Label; +import javafx.scene.control.OverrunStyle; +import javafx.scene.layout.Background; +import javafx.scene.layout.BackgroundFill; +import javafx.scene.layout.Pane; +import javafx.scene.layout.StackPane; +import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; +import javafx.scene.shape.Polygon; +import javafx.scene.shape.Rectangle; +import javafx.scene.shape.Shape; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; public class TraceSectionsDialog extends TitleAreaDialog { - private Text txts1; - private Text txts2; - private Text txte1; - private Text txte2; - private int s1 = -1; private int s2 = -1; private int e1 = -1; @@ -27,6 +39,9 @@ public class TraceSectionsDialog extends TitleAreaDialog { private ITraceExtractor extractor1; private ITraceExtractor extractor2; + + private static final Background TRANSPARENT_BACKGROUND = new Background( + new BackgroundFill(Color.TRANSPARENT, null, null)); public TraceSectionsDialog(Shell parentShell, ITraceExtractor extractor1, ITraceExtractor extractor2) { super(parentShell); @@ -40,60 +55,80 @@ public void create() { setTitle("Trace Sections"); setMessage("Enter starting and ending states of trace sections", IMessageProvider.INFORMATION); } + + private static final Font FONT = Font.font("Arial", FontWeight.BOLD, 11); + + private Shape createCursor() { + return new Polygon(0, 7.5, 5, 0, -5, 0); + } + + private Pane createTraceWidget(ITraceExtractor extractor, String label, ReadOnlyDoubleProperty width) { + final Pane pane = new Pane(); + pane.setBackground(TRANSPARENT_BACKGROUND); + final Rectangle rectangle = new Rectangle(0, 0, 0, 12); + rectangle.setFill(Color.LIGHTGRAY); + rectangle.widthProperty().bind(width.subtract(10)); + rectangle.setArcHeight(12); + rectangle.setArcWidth(12); + Label text = new Label(label); + text.setTextOverrun(OverrunStyle.ELLIPSIS); + text.setAlignment(Pos.CENTER); + text.setMouseTransparent(true); + text.setTextFill(Color.WHITE); + text.setFont(FONT); + text.setMaxWidth(0); + text.maxWidthProperty().bind(rectangle.widthProperty()); + StackPane layout = new StackPane(); + layout.getChildren().addAll(rectangle, text); + pane.getChildren().add(layout); + layout.setTranslateY(13); + layout.setTranslateX(5); + pane.setPrefHeight(25); + pane.setMinHeight(25); + pane.setMaxHeight(25); + + final Group group1 = new Group(); + final Label label1 = new Label(); + final Shape arrow1 = createCursor(); + final Group group2 = new Group(); + final Shape arrow2 = createCursor(); + arrow1.setTranslateX(5); + arrow1.setTranslateY(4); + arrow2.translateXProperty().bind(rectangle.widthProperty().add(5)); + arrow2.setTranslateY(4); + pane.getChildren().add(arrow1); + pane.getChildren().add(arrow2); + + return pane; + } @Override protected Control createDialogArea(Composite parent) { Composite area = (Composite) super.createDialogArea(parent); Composite container = new Composite(area, SWT.NONE); + container.setLayout(new GridLayout(1, false)); container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - GridLayout layout = new GridLayout(2, false); - container.setLayout(layout); - - txts1 = createLabelText(container, "First Trace Starting Index", extractor1); - txts2 = createLabelText(container, "Second Trace Starting Index", extractor2); - txte1 = createLabelText(container, "First Trace Ending Index", extractor1); - txte2 = createLabelText(container, "Second Trace Ending Index", extractor2); - + FXCanvas fxCanvas = new FXCanvas(container, SWT.NONE); + fxCanvas.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + VBox vBox = new VBox(); + Scene scene = new Scene(vBox); + fxCanvas.setScene(scene); + vBox.getChildren().add(createTraceWidget(extractor1, "First Trace", scene.widthProperty())); + vBox.getChildren().add(createTraceWidget(extractor2, "Second Trace", scene.widthProperty())); + return area; } - private Text createLabelText(Composite container, String title, ITraceExtractor extractor) { - Label label = new Label(container, SWT.NONE); - label.setText(title); - - GridData data = new GridData(); - data.grabExcessHorizontalSpace = true; - data.horizontalAlignment = GridData.FILL; - - Text text = new Text(container, SWT.BORDER); - text.setLayoutData(data); - text.addModifyListener(m -> { -// String currentText = ((Text) m.widget).getText(); -// try { -// int i = Integer.parseInt(currentText); -// if (!(i > -1 && i < extractor.getStatesTraceLength())) { -// this.buttonBar.setEnabled(true); -// } else { -// this.buttonBar.setEnabled(false); -// } -// } catch (NumberFormatException e) { -// this.buttonBar.setEnabled(false); -// } - }); - - return text; - } - @Override protected boolean isResizable() { return true; } private void saveInput() { - s1 = new Integer(txts1.getText()); - s2 = new Integer(txts2.getText()); - e1 = new Integer(txte1.getText()); - e2 = new Integer(txte2.getText()); +// s1 = new Integer(txts1.getText()); +// s2 = new Integer(txts2.getText()); +// e1 = new Integer(txte1.getText()); +// e2 = new Integer(txte2.getText()); } @Override diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index 1c03c633e..208f6ee8f 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -11,7 +11,6 @@ package org.gemoc.sequential_addons.multidimensional.timeline.views; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -24,11 +23,11 @@ import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; +import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StateWrapper; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StepWrapper; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.ValueWrapper; -import fr.inria.diverse.trace.gemoc.api.ITraceListener; import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; @@ -78,7 +77,7 @@ import javafx.scene.text.Font; import javafx.scene.text.FontWeight; -public class MultidimensionalTimelineRenderer extends Pane implements ITraceListener { +public class MultidimensionalTimelineRenderer extends Pane implements ITraceViewListener { private ITraceExplorer traceExplorer; private ITraceExtractor traceExtractor; @@ -368,7 +367,6 @@ private Pane setupValuePane(int line, Label titleLabel, Pane contentPane) { valueVBox.getChildren().remove(contentPane); } sortValueLines(); - traceExplorer.update(); } }); titlePane.getChildren().addAll(showValueCheckBox, titleLabel, backValue, stepValue); @@ -424,6 +422,7 @@ private void fillStateLine(HBox line, List stateWrappers, int sele final int width = DIAMETER; final int currentStateIndex = Math.max(0, currentState.intValue()); final int diff = stateWrappers.isEmpty() ? 0 : currentStateIndex - stateWrappers.get(0).stateIndex; + final List> colorGroups = stateColoration ? computeColorGroups(stateWrappers) : Collections.emptyList(); final int nbColors = colorGroups.size(); @@ -776,7 +775,7 @@ public void setTraceExplorer(ITraceExplorer traceExplorer) { } this.traceExplorer = traceExplorer; if (this.traceExplorer != null) { - this.traceExplorer.addListener(this); + this.traceExplorer.registerCommand(this, () -> update()); } update(); } @@ -787,6 +786,8 @@ public void setTraceExtractor(ITraceExtractor traceExtractor) { @Override public void update() { + // TODO divide update between trace explorer listening (for the current state) + // and trace model listening (for the view of the trace) ? if (traceExplorer != null) { nbStates.set(traceExtractor.getStatesTraceLength()); if (!scrollLock) { @@ -797,6 +798,10 @@ public void update() { } refresh(); } + + public void dimensionsAdded(List> dimensions) { + // TODO Auto-generated method stub + } public void setMenuDisplayer(Consumer> displayMenu) { this.displayMenu = displayMenu; @@ -808,17 +813,28 @@ public Supplier getLastClickedStateSupplier() { private List> computeColorGroups(List stateWrappers) { final Map eObjectToWrapper = new HashMap<>(); - final List states = stateWrappers.stream().map(w -> { - eObjectToWrapper.put(w.state, w); - return w.state; - }).collect(Collectors.toList()); - - return traceExtractor.computeStateEquivalenceClasses(states).stream() - .map(l -> l.stream().map(e -> eObjectToWrapper.get(e).stateIndex).collect(Collectors.toList())) + final List states = stateWrappers.stream() + .map(w -> { + eObjectToWrapper.put(w.state, w); + return w.state; + }) + .collect(Collectors.toList()); + return traceExtractor.computeStateEquivalenceClasses().stream() .sorted((l1, l2) -> { - final int min1 = l1.stream().min((i1, i2) -> i1 - i2).get(); - final int min2 = l2.stream().min((i1, i2) -> i1 - i2).get(); + final int min1 = l1.stream() + .map(e -> traceExtractor.getStateWrapper(e).stateIndex) + .min((i1, i2) -> i1 - i2) + .get(); + final int min2 = l2.stream() + .map(e -> traceExtractor.getStateWrapper(e).stateIndex) + .min((i1, i2) -> i1 - i2) + .get(); return min1 - min2; - }).collect(Collectors.toList()); + }) + .map(l -> l.stream() + .filter(s -> states.contains(s)) + .map(e -> eObjectToWrapper.get(e).stateIndex) + .collect(Collectors.toList())) + .collect(Collectors.toList()); } } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF index 832db5b4a..63081340e 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF @@ -1,15 +1,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Stategraph +Bundle-Name: %pluginName Bundle-SymbolicName: org.gemoc.sequential_addons.stategraph;singleton:=true Bundle-Version: 0.1.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: %providerName +Bundle-Localization: plugin Bundle-Activator: org.gemoc.sequential_addons.stategraph.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.fx.ui.workbench3, org.gemoc.executionframework.ui, org.gemoc.xdsmlframework.api, - org.eclipse.emf.ecore, + org.eclipse.emf.ecore;visibility:=reexport, fr.inria.diverse.trace.gemoc.api, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", org.eclipse.emf.ecore.xmi, @@ -19,6 +22,9 @@ Require-Bundle: org.eclipse.ui, com.google.guava;bundle-version="15.0.0", org.eclipse.elk.alg.layered;bundle-version="0.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: org.gemoc.sequential_addons.stategraph.model.stategraph, + org.gemoc.sequential_addons.stategraph.model.stategraph.impl, + org.gemoc.sequential_addons.stategraph.model.stategraph.util Import-Package: javafx.animation;version="2.0.0", javafx.application;version="2.0.0", javafx.beans;version="2.0.0", diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/plugin.xml b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/plugin.xml index 244c0f08e..89f295109 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/plugin.xml +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/plugin.xml @@ -18,4 +18,12 @@ + + + + + diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java index 22a1ce233..b9ee07ec4 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java @@ -1,6 +1,7 @@ package org.gemoc.sequential_addons.stategraph.logic; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -10,13 +11,15 @@ import org.eclipse.emf.ecore.EObject; +import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StateWrapper; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StepWrapper; import fr.inria.diverse.trace.gemoc.api.ITraceListener; +import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; -public class StateGraph extends DirectedGraph implements ITraceListener { +public class StateGraph extends DirectedGraphimplements ITraceViewListener, ITraceListener { private ITraceExtractor traceExtractor; @@ -31,7 +34,13 @@ public class StateGraph extends DirectedGraph implements ITraceList private BiConsumer renderCommand = null; public void setTraceExtractor(ITraceExtractor traceExtractor) { + if (this.traceExtractor != null) { + this.traceExtractor.removeListener(this); + } this.traceExtractor = traceExtractor; + if (this.traceExtractor != null) { + this.traceExtractor.registerCommand(this, () -> updateGraph()); + } } public void setTraceExplorer(ITraceExplorer traceExplorer) { @@ -40,19 +49,49 @@ public void setTraceExplorer(ITraceExplorer traceExplorer) { } this.traceExplorer = traceExplorer; if (this.traceExplorer != null) { - this.traceExplorer.addListener(this); + this.traceExplorer.registerCommand(this, () -> updateCurrentState()); } - update(); } public void setUpdateCommand(BiConsumer command) { renderCommand = command; } + private final List ignoredValueTraces = new ArrayList<>(); + + private void updateGraph() { + // Finding out whether the list of ignored values has changed + final List newIgnoredValueTraces = new ArrayList<>(); + for (int i = 0; i < traceExtractor.getNumberOfTraces(); i++) { + newIgnoredValueTraces.add(traceExtractor.isValueTraceIgnored(i)); + } + // If it did we have to recompute the graph + if (!newIgnoredValueTraces.equals(ignoredValueTraces)) { + ignoredValueTraces.clear(); + ignoredValueTraces.addAll(newIgnoredValueTraces); + computeStateSpace(); + render(false, null); + } + } + + private void updateCurrentState() { + StateVertex currentNode = null; + if (traceExplorer != null) { + final StateWrapper currentStateWrapper = traceExtractor + .getStateWrapper(traceExplorer.getCurrentStateIndex()); + if (currentStateWrapper != null) { + final EObject equivalentState = stateToEquivalentState.get(currentStateWrapper.state); + currentNode = stateToNode.get(equivalentState); + } + } + render(false, currentNode); + } + @Override public void update() { - stateToEquivalentState.clear(); - List> equivalenceClasses = traceExtractor.computeStateEquivalenceClasses().stream().collect(Collectors.toList()); + } + + private void updateEquivalentStates(Collection> equivalenceClasses) { equivalenceClasses.forEach(l -> { EObject equivalentState = null; for (EObject state : l) { @@ -62,13 +101,22 @@ public void update() { } } if (equivalentState == null) { + if (l.isEmpty()) { + return; + } + // The current equivalence class does not yet have + // a dedicated vertex, we thus add its first state + // to the list of equivalent states. equivalentState = l.remove(0); equivalentStates.add(equivalentState); } else { + // The current equivalence class does have a + // dedicated vertex. l.remove(equivalentState); l.forEach(s -> { equivalentStates.remove(s); - // Cleaning up old vertice in case the equivalence class of the state changed. + // Cleaning up old vertice in case the equivalence class of + // the state changed. removeVertex(stateToNode.remove(s)); }); } @@ -77,10 +125,16 @@ public void update() { stateToEquivalentState.put(otherState, equivalentState); } }); + } - final List stateWrappers = traceExtractor.getStateWrappers(0, - traceExtractor.getStatesTraceLength()); - final List stepWrappers = traceExtractor.getStepWrappers(0, traceExtractor.getStatesTraceLength()); + private void computeStateSpace() { + stateToEquivalentState.clear(); + List> equivalenceClasses = traceExtractor.computeStateEquivalenceClasses(); + updateEquivalentStates(equivalenceClasses); + + final int n = traceExtractor.getStatesTraceLength(); + final List stateWrappers = traceExtractor.getStateWrappers(0, n); + final List stepWrappers = traceExtractor.getStepWrappers(0, n); final List> addedEdges = new ArrayList<>(); while (!stepWrappers.isEmpty()) { @@ -100,19 +154,6 @@ public void update() { final List> edgesToRemove = new ArrayList<>(getEdges()); edgesToRemove.removeAll(addedEdges); edgesToRemove.forEach(e -> removeEdge(e)); - - if (renderCommand != null) { - StateVertex currentNode = null; - if (traceExplorer != null) { - final StateWrapper currentStateWrapper = traceExtractor - .getStateWrapper(traceExplorer.getCurrentStateIndex()); - if (currentStateWrapper != null) { - final EObject equivalentState = stateToEquivalentState.get(currentStateWrapper.state); - currentNode = stateToNode.get(equivalentState); - } - } - renderCommand.accept(false, currentNode); - } } public Edge addEdge(StateWrapper startStateWrapper, StateWrapper endStateWrapper, EObject step) { @@ -181,4 +222,43 @@ public void clear() { } update(); } + + private void render(boolean clear, StateVertex currentVertex) { + if (renderCommand != null) { + renderCommand.accept(clear, currentVertex); + } + } + + @Override + public void statesAdded(List states) { + List> equivalenceClasses = traceExtractor.computeStateEquivalenceClasses(); + updateEquivalentStates(equivalenceClasses); + render(false, null); + } + + @Override + public void stepsEnded(List steps) { + for (EObject step : steps) { + final StepWrapper stepWrapper = traceExtractor.getStepWrapper((Step) step); + final StateWrapper startingStateWrapper = traceExtractor.getStateWrapper(stepWrapper.startingIndex); + final StateWrapper endingStateWrapper = traceExtractor.getStateWrapper(stepWrapper.endingIndex); + addEdge(startingStateWrapper, endingStateWrapper, step); + } + render(false, null); + } + + @Override + public void stepsStarted(java.util.List steps) { + // Nothing to do here. + }; + + @Override + public void valuesAdded(List values) { + // TODO Auto-generated method stub + } + + @Override + public void dimensionsAdded(List> dimensions) { + // TODO Auto-generated method stub + } } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java index 558e24ae0..e8aab11d2 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java @@ -56,7 +56,9 @@ public void setStateGraph(final StateGraph stateGraph) { private StateVertex currentVertex = null; private void render(boolean clear, StateVertex currentVertex) { - this.currentVertex = currentVertex; + if (currentVertex != null) { + this.currentVertex = currentVertex; + } Platform.runLater(() -> { if (clear) { @@ -124,7 +126,6 @@ private void render(boolean clear, StateVertex currentVertex) { target.translateXProperty(), target.translateYProperty()); edgeToGroup.put(e, edgeGroup); edgeShapesToAdd.add(edgeGroup); - } edgesToRemove.remove(e); EdgeView reverseEdgeGroup = edgeToGroup.get(reverseEdge); diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java index e7ee8ed78..082c2ef72 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java @@ -70,7 +70,9 @@ public void engineSelectionChanged(IExecutionEngine engine) { stateGraph = new StateGraph(); stateGraph.setTraceExtractor(traceAddon.getTraceExtractor()); stateGraph.setTraceExplorer(traceAddon.getTraceExplorer()); + traceAddon.getTraceNotifier().addListener(stateGraph); renderer.setStateGraph(stateGraph); + stateGraph.update(); } } } From 02b01a0a0197c8622a2776796d13e2dcb5c1d530 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Tue, 15 Nov 2016 12:05:09 +0100 Subject: [PATCH 058/267] fix some problems of concurrent modification it seems that the factory of adapters is not thread safe, use a synchronized block --- .../ide/ui/DSLDebugModelPresentation.java | 4 + .../debug/ide/DSLEclipseDebugIntegration.java | 294 +++++++++--------- .../ide/adapter/DSLStackFrameAdapter.java | 10 +- 3 files changed, 165 insertions(+), 143 deletions(-) diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java index cae8f19fd..37bcf2c1d 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java @@ -179,7 +179,9 @@ public Image getImage(final Object element) { } res = cachedImage; } else { + synchronized(unwrapped) { res = eLabelProvider.getImage(unwrapped); + } } return res; @@ -199,7 +201,9 @@ public String getText(Object element) { } else if (element instanceof DSLBreakpoint) { res = ((DSLBreakpoint)element).getText(); } else { + synchronized(unwrapped) { res = eLabelProvider.getText(unwrapped); + } } return res; diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLEclipseDebugIntegration.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLEclipseDebugIntegration.java index 22e059ccc..30cf8a1a8 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLEclipseDebugIntegration.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLEclipseDebugIntegration.java @@ -61,8 +61,8 @@ public class DSLEclipseDebugIntegration extends DebugAdapterFactory { /** - * {@link Set} of {@link org.eclipse.emf.common.notify.AdapterFactory#isFactoryForType(Object) supported - * types}. + * {@link Set} of {@link org.eclipse.emf.common.notify.AdapterFactory#isFactoryForType(Object) + * supported types}. */ private static final Set SUPPORTED_TYPES = initSupportedTypes(); @@ -78,7 +78,8 @@ public class DSLEclipseDebugIntegration extends DebugAdapterFactory { /** * The {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous - * communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} for synchronous communication. + * communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} for synchronous + * communication. */ private final IDSLDebugEventProcessor debugger; @@ -109,66 +110,67 @@ public class DSLEclipseDebugIntegration extends DebugAdapterFactory { * @param modelUpdater * the {@link IModelUpdater} * @param debugger - * the {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous - * communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} for synchronous - * communication + * the {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for + * asynchronous communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} + * for synchronous communication */ public DSLEclipseDebugIntegration(String identifier, ILaunch launch, DebugTarget debugTarget, - IModelUpdater modelUpdater, IDSLDebugEventProcessor debugger) { - this.identifier = identifier; - this.launch = launch; - this.debugger = debugger; - - this.debugTarget = getDebugTarget(debugTarget); - this.modelUpdater = modelUpdater; - - genericLabelFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); - genericLabelFactory.addAdapterFactory(new DebugItemProviderAdapterFactory()); - genericLabelFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); - genericLabelFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); + IModelUpdater modelUpdater, IDSLDebugEventProcessor debugger) { + this.identifier = identifier; + this.launch = launch; + this.debugger = debugger; + + this.debugTarget = getDebugTarget(debugTarget); + this.modelUpdater = modelUpdater; + + genericLabelFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + genericLabelFactory.addAdapterFactory(new DebugItemProviderAdapterFactory()); + genericLabelFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); + genericLabelFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); } /** * Initializes {@link DSLEclipseDebugIntegration#SUPPORTED_TYPES}. * * @return the {@link Set} of - * {@link org.eclipse.emf.common.notify.AdapterFactory#isFactoryForType(Object) supported types}. + * {@link org.eclipse.emf.common.notify.AdapterFactory#isFactoryForType(Object) supported + * types}. */ private static Set initSupportedTypes() { - final Set res = new HashSet(); + final Set res = new HashSet(); - res.add(IThread.class); - res.add(IDebugTarget.class); - res.add(IStackFrame.class); - res.add(IVariable.class); - res.add(IBreakpoint.class); + res.add(IThread.class); + res.add(IDebugTarget.class); + res.add(IStackFrame.class); + res.add(IVariable.class); + res.add(IBreakpoint.class); - return res; + return res; } @Override public boolean isFactoryForType(Object object) { - return SUPPORTED_TYPES.contains(object) || super.isFactoryForType(object); + return SUPPORTED_TYPES.contains(object) || super.isFactoryForType(object); } @Override public Adapter createDebugTargetAdapter() { - return new DSLDebugTargetAdapter(this); + return new DSLDebugTargetAdapter(this); } @Override public Adapter createThreadAdapter() { - return new DSLThreadAdapter(this); + return new DSLThreadAdapter(this); } @Override public Adapter createStackFrameAdapter() { - return new DSLStackFrameAdapter(this); + return new DSLStackFrameAdapter(this); } @Override public Adapter createVariableAdapter() { - return new DSLVariableAdapter(this); + return new DSLVariableAdapter(this); } /** @@ -177,28 +179,30 @@ public Adapter createVariableAdapter() { * @return the launching debug session */ public ILaunch getLaunch() { - return launch; + return launch; } /** * Gets the {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous - * communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} for synchronous communication. + * communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} for synchronous + * communication. * * @return the {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous * communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} for synchronous * communication */ public IDSLDebugEventProcessor getDebugger() { - return debugger; + return debugger; } /** * Gets a generic {@link org.eclipse.emf.edit.provider.IItemLabelProvider IItemLabelProvider} factory. * - * @return a generic {@link org.eclipse.emf.edit.provider.IItemLabelProvider IItemLabelProvider} factory + * @return a generic {@link org.eclipse.emf.edit.provider.IItemLabelProvider IItemLabelProvider} + * factory */ public AdapterFactory getLabelFactory() { - return genericLabelFactory; + return genericLabelFactory; } /** @@ -207,7 +211,7 @@ public AdapterFactory getLabelFactory() { * @return the {@link DSLDebugTargetAdapter} to work with */ public DSLDebugTargetAdapter getDebugTarget() { - return debugTarget; + return debugTarget; } /** @@ -218,12 +222,14 @@ public DSLDebugTargetAdapter getDebugTarget() { * @return the {@link IDebugTarget} */ public DSLDebugTargetAdapter getDebugTarget(DebugTarget target) { + synchronized(target) { final DSLDebugTargetAdapter res = (DSLDebugTargetAdapter)adapt(target, IDebugTarget.class); if (res == null) { - throw new IllegalStateException("can't addapt DebugTarget to IDebugTarget."); + throw new IllegalStateException("can't addapt DebugTarget to IDebugTarget."); } return res; } + } /** * Gets an {@link IThread} form a {@link Thread}. @@ -233,12 +239,14 @@ public DSLDebugTargetAdapter getDebugTarget(DebugTarget target) { * @return the {@link IThread} */ public DSLThreadAdapter getThread(Thread thread) { + synchronized(thread) { final DSLThreadAdapter res = (DSLThreadAdapter)adapt(thread, IThread.class); if (res == null) { - throw new IllegalStateException("can't addapt Thread to IThread."); + throw new IllegalStateException("can't addapt Thread to IThread."); } return res; } + } /** * Gets an {@link IStackFrame} form a {@link StackFrame}. @@ -248,12 +256,14 @@ public DSLThreadAdapter getThread(Thread thread) { * @return the {@link IStackFrame} */ public DSLStackFrameAdapter getStackFrame(StackFrame frame) { + synchronized(frame) { final DSLStackFrameAdapter res = (DSLStackFrameAdapter)adapt(frame, IStackFrame.class); if (res == null) { - throw new IllegalStateException("can't addapt StackFrame to IStackFrame."); + throw new IllegalStateException("can't addapt StackFrame to IStackFrame."); } return res; } + } /** * Gets an {@link IVariable} form a {@link Variable}. @@ -263,12 +273,14 @@ public DSLStackFrameAdapter getStackFrame(StackFrame frame) { * @return the {@link IVariable} */ public DSLVariableAdapter getVariable(Variable variable) { + synchronized(variable) { final DSLVariableAdapter res = (DSLVariableAdapter)adapt(variable, IVariable.class); if (res == null) { - throw new IllegalStateException("can't addapt Variable to IVariable."); + throw new IllegalStateException("can't addapt Variable to IVariable."); } return res; } + } /** * Gets the {@link IValue} for the given {@link Object}. @@ -280,37 +292,37 @@ public DSLVariableAdapter getVariable(Variable variable) { * @return the corresponding {@link IValue} */ public IValue getValue(String referenceTypeName, Object value) { - final IValue res; - - if (value instanceof EObject) { - res = createEObjectValue(referenceTypeName, (EObject)value); - } else if (value instanceof Collection) { - res = new DSLArrayValue(this, referenceTypeName, ((Collection)value).toArray()); - } else if (value instanceof Object[]) { - res = new DSLArrayValue(this, referenceTypeName, (Object[])value); - } else if (value instanceof byte[]) { - res = createByteArrayValue(referenceTypeName, (byte[])value); - } else if (value instanceof short[]) { - res = createShortArrayValue(referenceTypeName, (short[])value); - } else if (value instanceof int[]) { - res = createIntegerArrayValue(referenceTypeName, (int[])value); - } else if (value instanceof long[]) { - res = createLongArrayValue(referenceTypeName, (long[])value); - } else if (value instanceof float[]) { - res = createFloatArrayValue(referenceTypeName, (float[])value); - } else if (value instanceof double[]) { - res = createDoubleArrayValue(referenceTypeName, (double[])value); - } else if (value instanceof char[]) { - res = createCharacterArrayValue(referenceTypeName, (char[])value); - } else if (value instanceof boolean[]) { - res = createBooleanArrayValue(referenceTypeName, (boolean[])value); - } else if (value == null) { - res = new DSLNullValue(this, referenceTypeName); - } else { - res = new DSLObjectValue(this, referenceTypeName, value); - } + final IValue res; + + if (value instanceof EObject) { + res = createEObjectValue(referenceTypeName, (EObject)value); + } else if (value instanceof Collection) { + res = new DSLArrayValue(this, referenceTypeName, ((Collection)value).toArray()); + } else if (value instanceof Object[]) { + res = new DSLArrayValue(this, referenceTypeName, (Object[])value); + } else if (value instanceof byte[]) { + res = createByteArrayValue(referenceTypeName, (byte[])value); + } else if (value instanceof short[]) { + res = createShortArrayValue(referenceTypeName, (short[])value); + } else if (value instanceof int[]) { + res = createIntegerArrayValue(referenceTypeName, (int[])value); + } else if (value instanceof long[]) { + res = createLongArrayValue(referenceTypeName, (long[])value); + } else if (value instanceof float[]) { + res = createFloatArrayValue(referenceTypeName, (float[])value); + } else if (value instanceof double[]) { + res = createDoubleArrayValue(referenceTypeName, (double[])value); + } else if (value instanceof char[]) { + res = createCharacterArrayValue(referenceTypeName, (char[])value); + } else if (value instanceof boolean[]) { + res = createBooleanArrayValue(referenceTypeName, (boolean[])value); + } else if (value == null) { + res = new DSLNullValue(this, referenceTypeName); + } else { + res = new DSLObjectValue(this, referenceTypeName, value); + } - return res; + return res; } /** @@ -323,20 +335,22 @@ public IValue getValue(String referenceTypeName, Object value) { * @return the created {@link IValue} */ private IValue createEObjectValue(String referenceTypeName, EObject value) { - final IValue res; - DSLEObjectValueAdapter valueAdapter = null; + final IValue res; + DSLEObjectValueAdapter valueAdapter = null; + synchronized(value) { for (Adapter adapter : value.eAdapters()) { - if (adapter.isAdapterForType(IValue.class)) { - valueAdapter = (DSLEObjectValueAdapter)adapter; - break; - } + if (adapter.isAdapterForType(IValue.class)) { + valueAdapter = (DSLEObjectValueAdapter)adapter; + break; + } } if (valueAdapter == null) { - valueAdapter = new DSLEObjectValueAdapter(this, referenceTypeName, value); - value.eAdapters().add(valueAdapter); + valueAdapter = new DSLEObjectValueAdapter(this, referenceTypeName, value); + value.eAdapters().add(valueAdapter); } - res = valueAdapter; - return res; + } + res = valueAdapter; + return res; } /** @@ -349,13 +363,13 @@ private IValue createEObjectValue(String referenceTypeName, EObject value) { * @return the created {@link IValue} */ private IValue createByteArrayValue(String referenceTypeName, byte[] value) { - final IValue res; - Byte[] array = new Byte[value.length]; - for (int i = 0; i < value.length; ++i) { - array[i] = Byte.valueOf(value[i]); - } - res = new DSLByteArrayValue(this, referenceTypeName, array); - return res; + final IValue res; + Byte[] array = new Byte[value.length]; + for (int i = 0; i < value.length; ++i) { + array[i] = Byte.valueOf(value[i]); + } + res = new DSLByteArrayValue(this, referenceTypeName, array); + return res; } /** @@ -368,13 +382,13 @@ private IValue createByteArrayValue(String referenceTypeName, byte[] value) { * @return the created {@link IValue} */ private IValue createShortArrayValue(String referenceTypeName, short[] value) { - final IValue res; - Short[] array = new Short[value.length]; - for (int i = 0; i < value.length; ++i) { - array[i] = Short.valueOf(value[i]); - } - res = new DSLShortArrayValue(this, referenceTypeName, array); - return res; + final IValue res; + Short[] array = new Short[value.length]; + for (int i = 0; i < value.length; ++i) { + array[i] = Short.valueOf(value[i]); + } + res = new DSLShortArrayValue(this, referenceTypeName, array); + return res; } /** @@ -387,13 +401,13 @@ private IValue createShortArrayValue(String referenceTypeName, short[] value) { * @return the created {@link IValue} */ private IValue createIntegerArrayValue(String referenceTypeName, int[] value) { - final IValue res; - Integer[] array = new Integer[value.length]; - for (int i = 0; i < value.length; ++i) { - array[i] = Integer.valueOf(value[i]); - } - res = new DSLIntArrayValue(this, referenceTypeName, array); - return res; + final IValue res; + Integer[] array = new Integer[value.length]; + for (int i = 0; i < value.length; ++i) { + array[i] = Integer.valueOf(value[i]); + } + res = new DSLIntArrayValue(this, referenceTypeName, array); + return res; } /** @@ -406,13 +420,13 @@ private IValue createIntegerArrayValue(String referenceTypeName, int[] value) { * @return the created {@link IValue} */ private IValue createLongArrayValue(String referenceTypeName, long[] value) { - final IValue res; - Long[] array = new Long[value.length]; - for (int i = 0; i < value.length; ++i) { - array[i] = Long.valueOf(value[i]); - } - res = new DSLLongArrayValue(this, referenceTypeName, array); - return res; + final IValue res; + Long[] array = new Long[value.length]; + for (int i = 0; i < value.length; ++i) { + array[i] = Long.valueOf(value[i]); + } + res = new DSLLongArrayValue(this, referenceTypeName, array); + return res; } /** @@ -425,13 +439,13 @@ private IValue createLongArrayValue(String referenceTypeName, long[] value) { * @return the created {@link IValue} */ private IValue createFloatArrayValue(String referenceTypeName, float[] value) { - final IValue res; - Float[] array = new Float[value.length]; - for (int i = 0; i < value.length; ++i) { - array[i] = Float.valueOf(value[i]); - } - res = new DSLFloatArrayValue(this, referenceTypeName, array); - return res; + final IValue res; + Float[] array = new Float[value.length]; + for (int i = 0; i < value.length; ++i) { + array[i] = Float.valueOf(value[i]); + } + res = new DSLFloatArrayValue(this, referenceTypeName, array); + return res; } /** @@ -444,13 +458,13 @@ private IValue createFloatArrayValue(String referenceTypeName, float[] value) { * @return the created {@link IValue} */ private IValue createDoubleArrayValue(String referenceTypeName, double[] value) { - final IValue res; - Double[] array = new Double[value.length]; - for (int i = 0; i < value.length; ++i) { - array[i] = Double.valueOf(value[i]); - } - res = new DSLDoubleArrayValue(this, referenceTypeName, array); - return res; + final IValue res; + Double[] array = new Double[value.length]; + for (int i = 0; i < value.length; ++i) { + array[i] = Double.valueOf(value[i]); + } + res = new DSLDoubleArrayValue(this, referenceTypeName, array); + return res; } /** @@ -463,13 +477,13 @@ private IValue createDoubleArrayValue(String referenceTypeName, double[] value) * @return the created {@link IValue} */ private IValue createCharacterArrayValue(String referenceTypeName, char[] value) { - final IValue res; - Character[] array = new Character[value.length]; - for (int i = 0; i < value.length; ++i) { - array[i] = Character.valueOf(value[i]); - } - res = new DSLCharArrayValue(this, referenceTypeName, array); - return res; + final IValue res; + Character[] array = new Character[value.length]; + for (int i = 0; i < value.length; ++i) { + array[i] = Character.valueOf(value[i]); + } + res = new DSLCharArrayValue(this, referenceTypeName, array); + return res; } /** @@ -482,13 +496,13 @@ private IValue createCharacterArrayValue(String referenceTypeName, char[] value) * @return the created {@link IValue} */ private IValue createBooleanArrayValue(String referenceTypeName, boolean[] value) { - final IValue res; - Boolean[] array = new Boolean[value.length]; - for (int i = 0; i < value.length; ++i) { - array[i] = Boolean.valueOf(value[i]); - } - res = new DSLBooleanArrayValue(this, referenceTypeName, array); - return res; + final IValue res; + Boolean[] array = new Boolean[value.length]; + for (int i = 0; i < value.length; ++i) { + array[i] = Boolean.valueOf(value[i]); + } + res = new DSLBooleanArrayValue(this, referenceTypeName, array); + return res; } /** @@ -503,7 +517,7 @@ private IValue createBooleanArrayValue(String referenceTypeName, boolean[] value * @return the {@link IVariable} */ public IVariable getVariable(String referenceTypeName, String variableName, Object value) { - return new DSLObjectVariable(this, referenceTypeName, variableName, value); + return new DSLObjectVariable(this, referenceTypeName, variableName, value); } /** @@ -512,7 +526,7 @@ public IVariable getVariable(String referenceTypeName, String variableName, Obje * @return the {@link IModelUpdater} responsible for EMF debug model updates */ public IModelUpdater getModelUpdater() { - return modelUpdater; + return modelUpdater; } /** @@ -521,7 +535,7 @@ public IModelUpdater getModelUpdater() { * @return the debug model identifier */ public String getModelIdentifier() { - return identifier; + return identifier; } } diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java index acbbb5d35..12bda6482 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java @@ -190,8 +190,12 @@ public void terminate() throws DebugException { */ public IThread getThread() { if (thread == null) { - synchronized(factory) { - thread = (IThread)factory.adapt(ThreadUtils.getThread(getHost()), IThread.class); + fr.obeo.dsl.debug.Thread hostThread = ThreadUtils.getThread(getHost()); + if (hostThread == null) { + throw new IllegalStateException("can't addapt Thread to IThread."); + } + synchronized(hostThread) { + thread = (IThread)factory.adapt(hostThread, IThread.class); } if (thread == null) { throw new IllegalStateException("can't addapt Thread to IThread."); @@ -209,7 +213,7 @@ public IVariable[] getVariables() throws DebugException { final List res = new ArrayList(); for (Variable variable : getHost().getVariables()) { - synchronized(factory) { + synchronized(variable) { final IVariable var = (IVariable)factory.adapt(variable, IVariable.class); if (var != null) { res.add(var); From 2b8cdd975f8f346e4a5036ecd526f31975f65b69 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Wed, 23 Nov 2016 14:41:50 +0100 Subject: [PATCH 059/267] Avoid crash when representation refresh fails, this allows to continue with other processing with only a warning message --- .../services/AbstractGemocAnimatorServices.java | 12 +++++++++++- .../services/AbstractGemocDebuggerServices.java | 11 ++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index c8bf59092..483fcdd19 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -17,8 +17,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -38,6 +41,7 @@ import org.gemoc.executionframework.engine.core.CommandExecution; import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices.BreakpointListener; import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.gemoc.xdsmlframework.api.Activator; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; @@ -155,7 +159,13 @@ public void refreshRepresentations( transactionalEditingDomain, new NullProgressMonitor(), representations); - CommandExecution.execute(transactionalEditingDomain, refresh); + try { + CommandExecution.execute(transactionalEditingDomain, refresh); + } catch (Exception e){ + String repString = representations.stream().map(r -> r.getName()).collect(Collectors.joining(", ")); + Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Failed to refresh Sirius representation(s)["+repString+"], we hope to be able to do it later", e)); + } + } } diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java index cfcf1449c..08eb5b512 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java @@ -16,10 +16,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import org.eclipse.core.resources.IMarkerDelta; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IBreakpointListener; import org.eclipse.debug.core.model.IBreakpoint; @@ -39,6 +42,7 @@ import org.eclipse.sirius.viewpoint.description.RepresentationDescription; import org.gemoc.executionframework.engine.core.CommandExecution; import org.gemoc.executionframework.extensions.sirius.modelloader.DefaultModelLoader; +import org.gemoc.xdsmlframework.api.Activator; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.inria.diverse.trace.commons.model.trace.ParallelStep; @@ -279,7 +283,12 @@ public void refreshRepresentations( transactionalEditingDomain, new NullProgressMonitor(), representations); - CommandExecution.execute(transactionalEditingDomain, refresh); + try { + CommandExecution.execute(transactionalEditingDomain, refresh); + } catch (Exception e){ + String repString = representations.stream().map(r -> r.getName()).collect(Collectors.joining(", ")); + Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Failed to refresh Sirius representation(s)["+repString+"], we hope to be able to do it later", e)); + } } } From 9829edc8f78b247a80cb3fa45dcbd6c709ec3a70 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Wed, 23 Nov 2016 16:53:55 +0100 Subject: [PATCH 060/267] force refresh diagram on opening this allows to force the loading of layers (and their services) and thus enabling animation if the layers were already active in edit session. --- .../sirius/modelloader/DefaultModelLoader.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index aded91ca3..40d32300a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -41,6 +41,7 @@ import org.eclipse.sirius.diagram.DSemanticDiagram; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.tools.api.command.ChangeLayerActivationCommand; +import org.eclipse.sirius.diagram.ui.business.internal.command.RefreshDiagramOnOpeningCommand; import org.eclipse.sirius.diagram.ui.tools.api.editor.DDiagramEditor; import org.eclipse.sirius.diagram.ui.tools.api.graphical.edit.palette.ToolFilter; import org.eclipse.sirius.ui.business.api.dialect.DialectEditor; @@ -188,14 +189,14 @@ private Session openNewSiriusSession(IExecutionContext context, subMonitor.newChild(1); // create and configure resource set HashMap nsURIMapping = getnsURIMapping(context); - //final ResourceSet rs = createAndConfigureResourceSet(modelURI, nsURIMapping); - final ResourceSet rs = createAndConfigureResourceSetV2(modelURI, nsURIMapping); + final ResourceSet rs = createAndConfigureResourceSet(modelURI, nsURIMapping); + //final ResourceSet rs = createAndConfigureResourceSetV2(modelURI, nsURIMapping); subMonitor.subTask("Loading model"); subMonitor.newChild(3); // load model resource and resolve all proxies Resource r = rs.getResource(modelURI, true); - EcoreUtil.resolveAll(rs); +// EcoreUtil.resolveAll(rs); // EObject root = r.getContents().get(0); // force adaptee model resource in the main ResourceSet if(r instanceof MelangeResourceImpl){ @@ -250,6 +251,9 @@ public boolean filter(DDiagram diagram, } }); } + RefreshDiagramOnOpeningCommand refresh = new RefreshDiagramOnOpeningCommand(editingDomain, diagram); + CommandExecution.execute(editingDomain, refresh); + if (editorPart instanceof DiagramEditorWithFlyOutPalette) { PaletteUtils .colapsePalette((DiagramEditorWithFlyOutPalette) editorPart); @@ -572,6 +576,7 @@ public XMLURIHandler(String queryParameters, String fileExtension) { public URI resolve(URI uri) { URI resolvedURI = super.resolve(uri); if (resolvedURI.scheme().equals("melange") + && resolvedURI.fileExtension() != null && resolvedURI.fileExtension().equals(_fileExtension) && !resolvedURI.toString().contains("?")) { String fileExtensionWithPoint = "." + _fileExtension; @@ -587,7 +592,8 @@ public URI resolve(URI uri) { return URI.createURI(newURIAsString); } - else if(resolvedURI.fileExtension().equals(_fileExtension)){ + else if( resolvedURI.fileExtension() != null + && resolvedURI.fileExtension().equals(_fileExtension)){ return resolvedURI; } return resolvedURI; From fdd922834f817a1292eb081de5a12430ce6061ea Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Thu, 24 Nov 2016 11:27:12 +0100 Subject: [PATCH 061/267] some fix and code clean up while laoding model without melange, the debug model id is now stored in the runconfiguration so we can look for it more easily --- .../engine/ui/commons/RunConfiguration.java | 13 ++- .../ui/debug/AbstractGemocDebugger.java | 4 + .../modelloader/DefaultModelLoader.java | 86 +++++--------- .../AbstractGemocDebuggerServices.java | 4 +- .../api/core/IRunConfiguration.java | 6 + .../sequential/javaengine/ui/Activator.java | 2 + ...scientGenericSequentialModelDebugger.xtend | 7 +- ...GemocSequentialToggleBreakpointAction.java | 2 +- .../javaengine/ui/launcher/Launcher.java | 7 +- .../tabs/LaunchConfigurationMainTab.java | 3 + .../ide/ui/DSLDebugModelPresentation.java | 5 +- ...bstractDSLLaunchConfigurationDelegate.java | 109 +++++++++--------- 12 files changed, 127 insertions(+), 121 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java index 30b6b8f7e..fd7110c78 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java @@ -33,6 +33,7 @@ public class RunConfiguration implements IRunConfiguration { public RunConfiguration(ILaunchConfiguration launchConfiguration) throws CoreException { _launchConfiguration = launchConfiguration; extractInformation(); + } protected void extractInformation() throws CoreException { @@ -56,6 +57,7 @@ protected void extractInformation() throws CoreException { } _breakStart = getAttribute(LAUNCH_BREAK_START, Boolean.FALSE); + _debugModelID = getAttribute(DEBUG_MODEL_ID, ".debugModel"); } protected String getAttribute(String attributeName, String defaultValue) throws CoreException { @@ -160,10 +162,19 @@ public String getModelInitializationArguments() { } private boolean _breakStart; - + + @Override public boolean getBreakStart() { return _breakStart; } + + private String _debugModelID; + + @Override + public String getDebugModelID() { + return _debugModelID; + } + } diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java index 688f22989..381af6ab7 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java @@ -440,6 +440,10 @@ private void selectLastStackframe() { () -> { final IWorkbenchPage workbenchPage = workbench.getActiveWorkbenchWindow().getActivePage(); final IViewPart view = workbenchPage.findView("org.eclipse.debug.ui.DebugView"); + if(view == null){ + Activator.warn("Cannot find view org.eclipse.debug.ui.DebugView and update the stack", null); + return; + } view.setFocus(); final ISelectionProvider selectionProvider = view.getSite().getSelectionProvider(); selectionProvider.setSelection(StructuredSelection.EMPTY); diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index 40d32300a..e029d241f 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -20,7 +20,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; @@ -71,7 +73,8 @@ public class DefaultModelLoader implements IModelLoader { - public final static String MODEL_ID = Activator.PLUGIN_ID + ".debugModel"; + //public final static String MODEL_ID = Activator.PLUGIN_ID + ".debugModel"; + public Resource loadModel(IExecutionContext context) throws RuntimeException { @@ -167,7 +170,7 @@ public void run() { } } - private Session openNewSiriusSession(IExecutionContext context, + private Session openNewSiriusSession(final IExecutionContext context, URI sessionResourceURI) throws CoreException { SubMonitor subMonitor = SubMonitor.convert(this.progressMonitor, 10); @@ -189,14 +192,14 @@ private Session openNewSiriusSession(IExecutionContext context, subMonitor.newChild(1); // create and configure resource set HashMap nsURIMapping = getnsURIMapping(context); - final ResourceSet rs = createAndConfigureResourceSet(modelURI, nsURIMapping); - //final ResourceSet rs = createAndConfigureResourceSetV2(modelURI, nsURIMapping); + //final ResourceSet rs = createAndConfigureResourceSet(modelURI, nsURIMapping); + final ResourceSet rs = createAndConfigureResourceSetV2(modelURI, nsURIMapping); subMonitor.subTask("Loading model"); subMonitor.newChild(3); // load model resource and resolve all proxies Resource r = rs.getResource(modelURI, true); -// EcoreUtil.resolveAll(rs); + EcoreUtil.resolveAll(rs); // EObject root = r.getContents().get(0); // force adaptee model resource in the main ResourceSet if(r instanceof MelangeResourceImpl){ @@ -251,8 +254,13 @@ public boolean filter(DDiagram diagram, } }); } - RefreshDiagramOnOpeningCommand refresh = new RefreshDiagramOnOpeningCommand(editingDomain, diagram); - CommandExecution.execute(editingDomain, refresh); + try{ + RefreshDiagramOnOpeningCommand refresh = new RefreshDiagramOnOpeningCommand(editingDomain, diagram); + CommandExecution.execute(editingDomain, refresh); + } catch (Exception e){ + Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + "Problem refreshing diagrams : " + diagram)); + } if (editorPart instanceof DiagramEditorWithFlyOutPalette) { PaletteUtils @@ -263,19 +271,21 @@ public boolean filter(DDiagram diagram, "Activating animator and debug layers") { @Override protected void doExecute() { + boolean hasADebugLayer = false; for (Layer l : diagram.getDescription() .getAdditionalLayers()) { String descName = diagram.getDescription() .getName(); String layerName = l.getName(); boolean mustBeActiveForDebug = AbstractDSLDebuggerServices.LISTENER - .isRepresentationToRefresh(MODEL_ID, + .isRepresentationToRefresh(context.getRunConfiguration().getDebugModelID(), descName, layerName); boolean mustBeActiveForAnimation = AbstractGemocAnimatorServices.ANIMATOR .isRepresentationToRefresh(descName, layerName); boolean mustBeActive = mustBeActiveForAnimation || mustBeActiveForDebug; + hasADebugLayer = hasADebugLayer && mustBeActiveForDebug; if (mustBeActive && !diagram.getActivatedLayers() .contains(l)) { @@ -284,6 +294,12 @@ protected void doExecute() { c.execute(); } } + if(!hasADebugLayer){ + // no debug layer defined in the odesign for debugmodelID + Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, + "No debug service defined in the odesign for the debug model id : " + + context.getRunConfiguration().getDebugModelID())); + } } }; CommandExecution.execute(editingDomain, command); @@ -320,7 +336,7 @@ private ResourceSet createAndConfigureResourceSetV2(URI modelURI, HashMap getCurrentInstructionListeners() { - return new ArrayList(); + return new ArrayList(); } /** @@ -175,7 +176,7 @@ protected List getCurrentInstructionListeners() * @return the {@link IDSLDebugger} to be {@link IDSLDebugger#start() started} */ protected abstract IDSLDebugger getDebugger(ILaunchConfiguration configuration, - DSLDebugEventDispatcher dispatcher, EObject firstInstruction, IProgressMonitor monitor); + DSLDebugEventDispatcher dispatcher, EObject firstInstruction, IProgressMonitor monitor); /** * Gets the {@link DebugTarget}'s {@link DebugTarget#getName() name}. @@ -186,7 +187,8 @@ protected abstract IDSLDebugger getDebugger(ILaunchConfiguration configuration, * the first {@link EObject instruction} * @return the {@link DebugTarget}'s {@link DebugTarget#getName() name} */ - protected abstract String getDebugTargetName(ILaunchConfiguration configuration, EObject firstInstruction); + protected abstract String getDebugTargetName(ILaunchConfiguration configuration, + EObject firstInstruction); /** * Gets the debug {@link Job}'s {@link DebugTarget#getName() name}. @@ -197,7 +199,8 @@ protected abstract IDSLDebugger getDebugger(ILaunchConfiguration configuration, * the first {@link EObject instruction} * @return the debug {@link Job}'s {@link DebugTarget#getName() name} */ - protected abstract String getDebugJobName(ILaunchConfiguration configuration, EObject firstInstruction); + protected abstract String getDebugJobName(ILaunchConfiguration configuration, + EObject firstInstruction); /** * Gets the current plug-in ID. @@ -211,6 +214,6 @@ protected abstract IDSLDebugger getDebugger(ILaunchConfiguration configuration, * * @return the debug model identifier */ - protected abstract String getModelIdentifier(); + public abstract String getModelIdentifier(); } From e59e807745b941bba677037bc0b3dc069171137d Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 28 Nov 2016 09:32:08 +0100 Subject: [PATCH 062/267] force assign Sirius session to melange resource --- .../sirius/modelloader/DefaultModelLoader.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index e029d241f..c06fe75bd 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -38,6 +38,7 @@ import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette; import org.eclipse.sirius.business.api.session.Session; import org.eclipse.sirius.business.api.session.SessionManager; +import org.eclipse.sirius.business.internal.session.SessionTransientAttachment; import org.eclipse.sirius.common.tools.api.resource.ResourceSetFactory; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DSemanticDiagram; @@ -120,6 +121,7 @@ public Resource loadModelForAnimation(IExecutionContext context) break; } } + return resource; } else { // animator not available; fall back to classic load @@ -211,6 +213,7 @@ private Session openNewSiriusSession(final IExecutionContext context, rs.getResources().add(realResource); } } + // calculating aird URI /*URI airdURI = useMelange ? URI.createURI(sessionResourceURI.toString() @@ -223,6 +226,13 @@ private Session openNewSiriusSession(final IExecutionContext context, // create and load sirius session final Session session = DebugSessionFactory.INSTANCE.createSession(rs, airdURI); + + //Specific to MelangeResource + if(r.getContents().size() > 0) { + Resource res = r.getContents().get(0).eResource(); // get the used resource + res.eAdapters().add(new SessionTransientAttachment(session)); // link the resource with Sirius session + } + //final IProgressMonitor monitor = new NullProgressMonitor(); final TransactionalEditingDomain editingDomain = session .getTransactionalEditingDomain(); @@ -259,7 +269,7 @@ public boolean filter(DDiagram diagram, CommandExecution.execute(editingDomain, refresh); } catch (Exception e){ Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, - "Problem refreshing diagrams : " + diagram)); + "Problem refreshing diagrams : " + diagram, e)); } if (editorPart instanceof DiagramEditorWithFlyOutPalette) { @@ -279,10 +289,12 @@ protected void doExecute() { String layerName = l.getName(); boolean mustBeActiveForDebug = AbstractDSLDebuggerServices.LISTENER .isRepresentationToRefresh(context.getRunConfiguration().getDebugModelID(), - descName, layerName); + descName, layerName) + || layerName.equalsIgnoreCase("Debug"); boolean mustBeActiveForAnimation = AbstractGemocAnimatorServices.ANIMATOR .isRepresentationToRefresh(descName, - layerName); + layerName) + || layerName.equalsIgnoreCase("Animation"); boolean mustBeActive = mustBeActiveForAnimation || mustBeActiveForDebug; hasADebugLayer = hasADebugLayer && mustBeActiveForDebug; From e0392d406deeecf93659468a47c9f250c3cf7917 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 28 Nov 2016 15:06:19 +0100 Subject: [PATCH 063/267] fix computation of melange query we need a simple downcast without adapter (ie. lang but no mt) --- .../ui/launcher/tabs/LaunchConfigurationMainTab.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index 22c86d552..9798749af 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -440,7 +440,7 @@ protected void updateLaunchConfigurationDialog() { /** * compute the Melange query for loading the given model as the requested language - * If the language is already the good one, the query will be empty. (ie. melange adapter is not used) + * If the language is already the good one, the query will be empty. (ie. melange downcast is not used) * @return */ protected String computeMelangeQuery(){ @@ -454,7 +454,8 @@ protected String computeMelangeQuery(){ String languageMT = MelangeHelper.getModelType(languageName); if(languageMT == null){ languageMT = languageName+"MT"; } - result="?lang="+languageName+"&mt="+languageMT; + // result="?lang="+languageName+"&mt="+languageMT; + result="?lang="+languageName; // we need a simple downcast without adapter } } return result; From d70f12930e4d239a7a335500006c267553e3cecd Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 28 Nov 2016 16:48:25 +0100 Subject: [PATCH 064/267] some code cleanup --- .../modelloader/DefaultModelLoader.java | 173 +----------------- 1 file changed, 6 insertions(+), 167 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index c06fe75bd..c076e7033 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -74,9 +74,6 @@ public class DefaultModelLoader implements IModelLoader { - //public final static String MODEL_ID = Activator.PLUGIN_ID + ".debugModel"; - - public Resource loadModel(IExecutionContext context) throws RuntimeException { Resource resource = null; @@ -195,7 +192,7 @@ private Session openNewSiriusSession(final IExecutionContext context, // create and configure resource set HashMap nsURIMapping = getnsURIMapping(context); //final ResourceSet rs = createAndConfigureResourceSet(modelURI, nsURIMapping); - final ResourceSet rs = createAndConfigureResourceSetV2(modelURI, nsURIMapping); + final ResourceSet rs = createAndConfigureResourceSet(modelURI, nsURIMapping); subMonitor.subTask("Loading model"); subMonitor.newChild(3); @@ -209,7 +206,7 @@ private Session openNewSiriusSession(final IExecutionContext context, rs.getResources().add(mr.getWrappedResource()); if(!r.getContents().isEmpty() && r.getContents().get(0) instanceof EObjectAdapter){ - Resource realResource = ((EObjectAdapter) r.getContents().get(0)).getAdaptee().eResource(); + Resource realResource = ((EObjectAdapter) r.getContents().get(0)).getAdaptee().eResource(); rs.getResources().add(realResource); } } @@ -320,8 +317,7 @@ protected void doExecute() { return session; } - private ResourceSet createAndConfigureResourceSet(URI modelURI, - HashMap nsURIMapping) { + private ResourceSet createAndConfigureResourceSet(URI modelURI, HashMap nsURIMapping) { final ResourceSet rs = ResourceSetFactory.createFactory() .createResourceSet(modelURI); final String fileExtension = modelURI.fileExtension(); @@ -333,28 +329,7 @@ private ResourceSet createAndConfigureResourceSet(URI modelURI, handler.setResourceSet(rs); rs.getLoadOptions().put(XMLResource.OPTION_URI_HANDLER, handler); - final MelangeURIConverter converter = new MelangeURIConverter(fileExtension, nsURIMapping); - //final ExtensibleURIConverterImpl converter = new ExtensibleURIConverterImpl(); - rs.setURIConverter(converter); - // fix sirius to prevent non intentional model savings - converter.getURIHandlers().add(0, new DebugURIHandler(converter.getURIHandlers())); - - return rs; - } - - private ResourceSet createAndConfigureResourceSetV2(URI modelURI, HashMap nsURIMapping) { - final ResourceSet rs = ResourceSetFactory.createFactory() - .createResourceSet(modelURI); - final String fileExtension = modelURI.fileExtension(); - // indicates which melange query should be added to the xml uri handler - // for a given extension - final XMLURIHandler handler = new XMLURIHandler(modelURI.query(), fileExtension); // use to resolve cross ref - // URI during XMI parsing - //final XtextPlatformResourceURIHandler handler = new XtextPlatformResourceURIHandler(); - handler.setResourceSet(rs); - rs.getLoadOptions().put(XMLResource.OPTION_URI_HANDLER, handler); - - final MelangeURIConverterV2 converter = new MelangeURIConverterV2(fileExtension, nsURIMapping); + final MelangeURIConverter converter = new MelangeURIConverter(nsURIMapping); //final ExtensibleURIConverterImpl converter = new ExtensibleURIConverterImpl(); rs.setURIConverter(converter); // fix sirius to prevent non intentional model savings @@ -365,8 +340,6 @@ private ResourceSet createAndConfigureResourceSetV2(URI modelURI, HashMap getnsURIMapping(IExecutionContext context) { HashMap nsURIMapping = new HashMap(); @@ -399,14 +372,11 @@ protected HashMap getnsURIMapping(IExecutionContext context) { return nsURIMapping; } - class MelangeURIConverterV2 extends ExtensibleURIConverterImpl { + class MelangeURIConverter extends ExtensibleURIConverterImpl { - private String _fileExtension; private HashMap _nsURIMapping; - public MelangeURIConverterV2(String fileExtension, - HashMap nsURIMapping) { - _fileExtension = fileExtension; + public MelangeURIConverter( HashMap nsURIMapping) { _nsURIMapping = nsURIMapping; } @@ -456,137 +426,6 @@ private String convertStreamToString(java.io.InputStream is) { } } - class MelangeURIConverter extends ExtensibleURIConverterImpl { - - private String _fileExtension; - private HashMap _nsURIMapping; - - public MelangeURIConverter(String fileExtension, - HashMap nsURIMapping) { - _fileExtension = fileExtension; - _nsURIMapping = nsURIMapping; - } - - @SuppressWarnings("resource") - @Override - public InputStream createInputStream(URI uri, Map options) - throws IOException { - InputStream result = null; - // the URI to use for model loading is not melange:/... but - // platform:/... and without the ?xx=... - URI uriToUse = uri; - boolean useSuperMethod = true; -/* - if (uri.scheme()!= null && uri.scheme().equals("melange")) { // may be null in relative path - String uriAsString = uri.toString().replace("melange:/", - "platform:/"); - if (uri.fileExtension() != null - && uri.fileExtension().equals(_fileExtension)) { - useSuperMethod = false; - uriAsString = uriAsString.substring(0, - uriAsString.indexOf('?')); - uriToUse = URI.createURI(uriAsString); - InputStream originalInputStream = null; - try { - originalInputStream = super.createInputStream(uriToUse, - options); - String originalContent = convertStreamToString(originalInputStream); - String modifiedContent = originalContent; - for (Entry entry : _nsURIMapping - .entrySet()) { - modifiedContent = modifiedContent.replace( - entry.getKey(), entry.getValue()); - } - result = new StringInputStream(modifiedContent); - } finally { - if (originalInputStream != null) { - originalInputStream.close(); - } - } - } else { - uriToUse = URI.createURI(uriAsString); - } - } -*/ - - if (uri.fileExtension() != null - && uri.fileExtension().equals(_fileExtension)) { - /* String uriAsString = uri.toString().replace("melange:/", - "platform:/");*/ - useSuperMethod = false; - /*uriAsString = uriAsString.substring(0, - uriAsString.indexOf('?'));*/ - uriToUse = uri ; //URI.createURI(uri); - InputStream originalInputStream = null; - try { - originalInputStream = super.createInputStream(uriToUse, - options); - String originalContent = convertStreamToString(originalInputStream); - String modifiedContent = originalContent; - for (Entry entry : _nsURIMapping - .entrySet()) { - modifiedContent = modifiedContent.replace( - entry.getKey(), entry.getValue()); - } - result = new StringInputStream(modifiedContent); - } finally { - if (originalInputStream != null) { - originalInputStream.close(); - } - } - } else { - - } - - if (useSuperMethod) { - result = super.createInputStream(uriToUse, options); - } - - // // making sure that uri can be modified - // if (uri.fileExtension() != null - // && uri.fileExtension().equals(_fileExtension) - // && uri.scheme().equals("melange")) - // { - // String uriAsString = uri.toString().replace("melange:/", - // "platform:/"); - // uriAsString = uriAsString.substring(0, uriAsString.indexOf('?')); - // uriToUse = URI.createURI(uriAsString); - // InputStream originalInputStream = null; - // try - // { - // originalInputStream = super.createInputStream(uriToUse, options); - // String originalContent = - // convertStreamToString(originalInputStream); - // String modifiedContent = - // originalContent.replace("http://www.gemoc.org/sample/tfsm", - // "http://tfsmextended"); - // result = new StringInputStream(modifiedContent); - // } - // finally - // { - // if (originalInputStream != null) - // { - // originalInputStream.close(); - // } - // } - // } - // else - // { - // } - return result; - } - - private String convertStreamToString(java.io.InputStream is) { - java.util.Scanner s1 = new java.util.Scanner(is); - java.util.Scanner s2 = s1.useDelimiter("\\A"); - String result = s2.hasNext() ? s2.next() : ""; - s1.close(); - s2.close(); - return result; - } - } - - /** * change scheme to melange:// for files with the given fileextension when a melange query is active * @author dvojtise From 3a09ed24f9aab8481128bb2fab770b29709cfb1c Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 2 Dec 2016 14:50:01 +0100 Subject: [PATCH 065/267] fix problem of link not shown in animation mode - some resources were loaded multiple times by sirius and thus not reusing already loaded melange resource - fix detection of layers defined in extension odesign from Fabien --- .../modelloader/DefaultModelLoader.java | 77 +++++++++++++------ 1 file changed, 53 insertions(+), 24 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index c076e7033..731e05dcd 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -13,10 +13,13 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -24,6 +27,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -36,12 +40,15 @@ import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette; +import org.eclipse.sirius.business.api.resource.ResourceDescriptor; import org.eclipse.sirius.business.api.session.Session; import org.eclipse.sirius.business.api.session.SessionManager; import org.eclipse.sirius.business.internal.session.SessionTransientAttachment; +import org.eclipse.sirius.business.internal.session.danalysis.DAnalysisSessionImpl; import org.eclipse.sirius.common.tools.api.resource.ResourceSetFactory; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DSemanticDiagram; +import org.eclipse.sirius.diagram.description.DiagramExtensionDescription; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.tools.api.command.ChangeLayerActivationCommand; import org.eclipse.sirius.diagram.ui.business.internal.command.RefreshDiagramOnOpeningCommand; @@ -53,6 +60,8 @@ import org.eclipse.sirius.ui.business.api.session.SessionUIManager; import org.eclipse.sirius.viewpoint.DRepresentation; import org.eclipse.sirius.viewpoint.DView; +import org.eclipse.sirius.viewpoint.description.RepresentationExtensionDescription; +import org.eclipse.sirius.viewpoint.description.Viewpoint; import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorSite; @@ -224,15 +233,31 @@ private Session openNewSiriusSession(final IExecutionContext context, final Session session = DebugSessionFactory.INSTANCE.createSession(rs, airdURI); + //final IProgressMonitor monitor = new NullProgressMonitor(); + final TransactionalEditingDomain editingDomain = session + .getTransactionalEditingDomain(); //Specific to MelangeResource if(r.getContents().size() > 0) { Resource res = r.getContents().get(0).eResource(); // get the used resource res.eAdapters().add(new SessionTransientAttachment(session)); // link the resource with Sirius session + RecordingCommand cmd = new RecordingCommand(editingDomain){ + @Override + protected void doExecute() { + DAnalysisSessionImpl sessionImpl = (DAnalysisSessionImpl) session; + EList srList = sessionImpl.getAnalyses().get(0).getSemanticResources(); + srList.clear(); + srList.add(new ResourceDescriptor(modelURI)); + } + }; + try{ + CommandExecution.execute(editingDomain, cmd); + } catch (Exception e){ + //TODO: error msg + } + } - //final IProgressMonitor monitor = new NullProgressMonitor(); - final TransactionalEditingDomain editingDomain = session - .getTransactionalEditingDomain(); + subMonitor.subTask("Opening Sirius session"); session.open(subMonitor.newChild(2)); // EcoreUtil.resolveAll(rs); @@ -274,40 +299,44 @@ public boolean filter(DDiagram diagram, .colapsePalette((DiagramEditorWithFlyOutPalette) editorPart); } - RecordingCommand command = new RecordingCommand(editingDomain, - "Activating animator and debug layers") { + RecordingCommand command = new RecordingCommand(editingDomain, "Activating animator and debug layers") { @Override protected void doExecute() { boolean hasADebugLayer = false; - for (Layer l : diagram.getDescription() - .getAdditionalLayers()) { - String descName = diagram.getDescription() - .getName(); + Set layers = new HashSet(); + layers.addAll(diagram.getDescription().getAdditionalLayers()); + Collection selectedVp = session.getSelectedViewpoints(true); + for (Viewpoint vp : selectedVp) { + for (RepresentationExtensionDescription extension : vp.getOwnedRepresentationExtensions()) { + if (extension instanceof DiagramExtensionDescription) { + layers.addAll(((DiagramExtensionDescription) extension).getLayers()); + } + } + } + for (Layer l : layers) { + String descName = diagram.getDescription().getName(); String layerName = l.getName(); boolean mustBeActiveForDebug = AbstractDSLDebuggerServices.LISTENER .isRepresentationToRefresh(context.getRunConfiguration().getDebugModelID(), - descName, layerName) + descName, layerName) || layerName.equalsIgnoreCase("Debug"); boolean mustBeActiveForAnimation = AbstractGemocAnimatorServices.ANIMATOR - .isRepresentationToRefresh(descName, - layerName) + .isRepresentationToRefresh(descName, layerName) || layerName.equalsIgnoreCase("Animation"); - boolean mustBeActive = mustBeActiveForAnimation - || mustBeActiveForDebug; - hasADebugLayer = hasADebugLayer && mustBeActiveForDebug; - if (mustBeActive - && !diagram.getActivatedLayers() - .contains(l)) { - ChangeLayerActivationCommand c = new ChangeLayerActivationCommand( - editingDomain, diagram, l, openEditorSubMonitor.newChild(1)); + boolean mustBeActive = mustBeActiveForAnimation || mustBeActiveForDebug; + hasADebugLayer = hasADebugLayer || mustBeActiveForDebug; + if (mustBeActive && !diagram.getActivatedLayers().contains(l)) { + ChangeLayerActivationCommand c = new ChangeLayerActivationCommand(editingDomain, + diagram, l, openEditorSubMonitor.newChild(1)); c.execute(); } } - if(!hasADebugLayer){ + if (!hasADebugLayer) { // no debug layer defined in the odesign for debugmodelID - Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, - "No debug service defined in the odesign for the debug model id : " + - context.getRunConfiguration().getDebugModelID())); + Activator.getDefault().getLog() + .log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, + "No debug service defined in the odesign for the debug model id : " + + context.getRunConfiguration().getDebugModelID())); } } }; From a8285bd7e563320a831902a3cfeac5cbaceb2e7d Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Tue, 6 Dec 2016 14:41:49 +0100 Subject: [PATCH 066/267] merging the AbstractDSLDebuggerService and AbstractGemocDebuggerServices the AbstractGemocDebuggerServices should be removed later as it cannot really help specialize the behavior of the AbstractDSLDebuggerService which is a singleton --- .../META-INF/MANIFEST.MF | 2 +- .../AbstractGemocAnimatorServices.java | 1 - .../AbstractGemocDebuggerServices.java | 679 +------------- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../services/AbstractDSLDebuggerServices.java | 862 ++++++++++-------- 6 files changed, 496 insertions(+), 1056 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF index 3586d576e..925ccca28 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.gemoc.executionframework.extensions.sirius.Activator Require-Bundle: org.gemoc.xdsmlframework.api, org.eclipse.sirius.diagram.ui;bundle-version="3.0.0", org.eclipse.sirius.common;bundle-version="1.0.1", - fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", + fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0";visibility:=reexport, org.eclipse.sirius.ecore.extender;bundle-version="2.0.3", org.eclipse.xtext, org.eclipse.debug.core;bundle-version="3.9.1", diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index 483fcdd19..a36f3a6f0 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -39,7 +39,6 @@ import org.eclipse.sirius.viewpoint.DRepresentation; import org.eclipse.sirius.viewpoint.description.RepresentationDescription; import org.gemoc.executionframework.engine.core.CommandExecution; -import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices.BreakpointListener; import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.gemoc.xdsmlframework.api.Activator; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java index 90d6af7e6..cbd592408 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java @@ -10,686 +10,9 @@ *******************************************************************************/ package org.gemoc.executionframework.extensions.sirius.services; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import org.eclipse.core.resources.IMarkerDelta; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.IBreakpointListener; -import org.eclipse.debug.core.model.IBreakpoint; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.sirius.business.api.dialect.DialectManager; -import org.eclipse.sirius.business.api.dialect.command.RefreshRepresentationsCommand; -import org.eclipse.sirius.diagram.DDiagram; -import org.eclipse.sirius.diagram.description.Layer; -import org.eclipse.sirius.ui.business.api.dialect.DialectEditor; -import org.eclipse.sirius.ui.business.api.session.IEditingSession; -import org.eclipse.sirius.ui.business.api.session.SessionUIManager; -import org.eclipse.sirius.viewpoint.DRepresentation; -import org.eclipse.sirius.viewpoint.description.RepresentationDescription; -import org.gemoc.executionframework.engine.core.CommandExecution; -import org.gemoc.executionframework.extensions.sirius.modelloader.DefaultModelLoader; -import org.gemoc.xdsmlframework.api.Activator; - -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.ide.DSLBreakpoint; -import fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; import fr.obeo.dsl.debug.ide.sirius.ui.services.AbstractDSLDebuggerServices; -public abstract class AbstractGemocDebuggerServices { - - /** - * A couple of {@link String}. - * - * @author Yvan Lussaud - */ - public static final class StringCouple { - - /** - * The first string of the couple. - */ - private final String first; - - /** - * The second string of the couple. - */ - private final String second; - - /** - * Constructor. - * - * @param first - * the first string of the couple - * @param second - * the second string of the couple - */ - public StringCouple(String first, String second) { - this.first = first; - this.second = second; - } - - /** - * Gets the first string of the couple. - * - * @return the first string of the couple - */ - public String getFirst() { - return first; - } - - /** - * Gets the second string of the couple. - * - * @return the second string of the couple - */ - public String getSecond() { - return second; - } - } - - /** - * An {@link IBreakpointListener} maintaining the breakpoints. - * - * @author Yvan Lussaud - */ - public static final class BreakpointListener implements - IBreakpointListener, IDSLCurrentInstructionListener { - - /** - * Any layer {@link Set}, means always refresh the given - * {@link DRepresentation} no matter what its layer are. It should be - * used for trees and tables since they don't have layers. - */ - private static final Set ANY_LAYER = new HashSet(); - - /** - * Mapping of the {@link RepresentationDescription#getName() - * representation identifier} to a {@link Layer#getName() layer - * identifier} or {@link BreakpointListener#ANY_LAYER any layer}. - */ - private final Map>> representationToRefresh = new HashMap>>(); - - /** - * The current {@link StackFrame}. - */ - private StackFrame currentFrame; - - public BreakpointListener() { - install(); - } - - /** - * Installs this {@link IBreakpointListener}. - */ - public void install() { - DebugPlugin.getDefault().getBreakpointManager() - .addBreakpointListener(this); - for (IBreakpoint breakpoint : DebugPlugin.getDefault() - .getBreakpointManager().getBreakpoints()) { - if (breakpoint instanceof DSLBreakpoint) { - addBreakpoint((DSLBreakpoint) breakpoint); - } - } - } - - /** - * Uninstalls this {@link IBreakpointListener}. - */ - public void uninstall() { - DebugPlugin.getDefault().getBreakpointManager() - .removeBreakpointListener(this); - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint) - */ - public void breakpointAdded(IBreakpoint breakpoint) { - if (breakpoint instanceof DSLBreakpoint) { - addBreakpoint((DSLBreakpoint) breakpoint); - final DSLBreakpoint dslBreakpoint = (DSLBreakpoint) breakpoint; - final Set instructionURIs = new HashSet(); - instructionURIs.add(dslBreakpoint.getURI()); - notifySirius(instructionURIs, - dslBreakpoint.getModelIdentifier()); - } - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, - * org.eclipse.core.resources.IMarkerDelta) - */ - public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) { - if (breakpoint instanceof DSLBreakpoint) { - removeBreakpoint((DSLBreakpoint) breakpoint); - final DSLBreakpoint dslBreakpoint = (DSLBreakpoint) breakpoint; - final Set instructionURIs = new HashSet(); - instructionURIs.add(dslBreakpoint.getURI()); - notifySirius(instructionURIs, - dslBreakpoint.getModelIdentifier()); - } - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, - * org.eclipse.core.resources.IMarkerDelta) - */ - public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) { - try { - if (breakpoint instanceof DSLBreakpoint - && delta.getAttribute(IBreakpoint.ENABLED) != null - && breakpoint.isEnabled() != ((Boolean) delta - .getAttribute(IBreakpoint.ENABLED)) - .booleanValue()) { - final DSLBreakpoint dslBreakpoint = (DSLBreakpoint) breakpoint; - final Set instructionURIs = new HashSet(); - instructionURIs.add(dslBreakpoint.getURI()); - notifySirius(instructionURIs, - dslBreakpoint.getModelIdentifier()); - } - } catch (CoreException e) { - // ignore - } - } - - /** - * Adds the given {@link DSLBreakpoint}. - * - * @param breakpoint - * the {@link DSLBreakpoint} - */ - protected void addBreakpoint(DSLBreakpoint breakpoint) { - Set brkps = BREAKPOINTS.get(breakpoint.getURI()); - if (brkps == null) { - brkps = new HashSet(); - BREAKPOINTS.put(breakpoint.getURI(), brkps); - } - brkps.add(breakpoint); - } - - /** - * Removes the given {@link DSLBreakpoint}. - * - * @param breakpoint - * the {@link DSLBreakpoint} - */ - protected void removeBreakpoint(DSLBreakpoint breakpoint) { - Set brkps = BREAKPOINTS.get(breakpoint.getURI()); - if (brkps != null) { - brkps.remove(breakpoint); - } - } - - /** - * Notifies Sirius about a change in the given {@link DSLBreakpoint}. - * - * @param instructionUri - * the {@link URI} of the instruction to refresh. - * @param debugModelID - * the debug model identifier - */ - public void notifySirius(Set instructionUris, String debugModelID) { - Map> toRefresh = representationToRefresh - .get(debugModelID); - if (toRefresh != null) { - for (IEditingSession session : SessionUIManager.INSTANCE - .getUISessions()) { - final TransactionalEditingDomain transactionalEditingDomain = session - .getSession().getTransactionalEditingDomain(); - final boolean instructionPresent = isOneInstructionPresent( - instructionUris, transactionalEditingDomain - .getResourceSet()); - if (instructionPresent) { - final List representations = getRepresentationsToRefresh( - toRefresh, session); - refreshRepresentations(transactionalEditingDomain, - representations); - } - } - } - } - - /**Refreshes given {@link DRepresentation} in the given {@link TransactionalEditingDomain}. - * @param transactionalEditingDomain the {@link TransactionalEditingDomain} - * @param representations the {@link List} of {@link DRepresentation} to refresh - */ - public void refreshRepresentations( - final TransactionalEditingDomain transactionalEditingDomain, - final List representations) { - // TODO prevent the editors from getting dirty - if (representations.size() != 0) { - final RefreshRepresentationsCommand refresh = new RefreshRepresentationsCommand( - transactionalEditingDomain, - new NullProgressMonitor(), - representations); - try { - CommandExecution.execute(transactionalEditingDomain, refresh); - } catch (Exception e){ - String repString = representations.stream().map(r -> r.getName()).collect(Collectors.joining(", ")); - Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Failed to refresh Sirius representation(s)["+repString+"], we hope to be able to do it later", e)); - } - } - } - - /**Gets the {@link List} of {@link DRepresentation} to refresh in the given {@link IEditingSession}. - * @param toRefresh the representation names and layers to refresh - * @param session the {@link IEditingSession} - * @return the {@link List} of {@link DRepresentation} to refresh in the given {@link IEditingSession} - */ - private List getRepresentationsToRefresh( - Map> toRefresh, IEditingSession session) { - final List representations = new ArrayList(); - for (DialectEditor editor : session.getEditors()) { - final DRepresentation representation = editor - .getRepresentation(); - if (representation == null) { - System.out.println("Dammit"); - } else { - final RepresentationDescription description = DialectManager.INSTANCE - .getDescription(representation); - if (description != null) { - final String representationId = description - .getName(); - final Set layerIDs = toRefresh - .get(representationId); - if (layerIDs == ANY_LAYER) { - representations.add(representation); - } else if (layerIDs != null - && representation instanceof DDiagram - && isActiveLayer((DDiagram) representation, - layerIDs)) { - representations.add(representation); - } - } - } - } - return representations; - } - - /**Tells if at least one of the given instruction {@link URI} is present in the given {@link ResourceSet}. - * @param instructionUris the {@link Set} of instructions {@link URI} - * @param resourceSet the {@link ResourceSet} - * @return true if at least one of the given instruction {@link URI} is present in the given {@link ResourceSet}, false otherwise - */ - private boolean isOneInstructionPresent(Set instructionUris, - final ResourceSet resourceSet) { - boolean instructionPresent = false; - for (URI instructionUri : instructionUris) { - if (resourceSet.getEObject(instructionUri, false) != null) { - instructionPresent = true; - break; - } - } - return instructionPresent; - } - - /** - * Tells if any of the given {@link Layer#getName() layer identifier} is - * active for the given {@link DDiagram}. - * - * @param diagram - * the {@link DDiagram} - * @param layerIDs - * the {@link Set} of {@link Layer#getName() layer - * identifiers} - * @return true if any of the given {@link Layer#getName() - * layer identifier} is active for the given {@link DDiagram}, - * false otherwise - */ - private boolean isActiveLayer(DDiagram diagram, Set layerIDs) { - boolean res = false; - - for (Layer layer : diagram.getActivatedLayers()) { - if (layerIDs.contains(layer.getName())) { - res = true; - break; - } - } - - return res; - } - - /** - * Add the given {@link RepresentationDescription#getName() - * representation identifier} for {@link DRepresentation} refresh. - * - * @param debugModelID - * the debug model identifier - * @param representationID - * the {@link RepresentationDescription#getName() - * representation identifier} - */ - public void addRepresentationToRefresh(String debugModelID, - String representationID) { - Map> toRefresh = representationToRefresh - .get(debugModelID); - if (toRefresh == null) { - toRefresh = new HashMap>(); - representationToRefresh.put(debugModelID, toRefresh); - } - toRefresh.put(representationID, ANY_LAYER); - } - - /** - * Add the given {@link RepresentationDescription#getName() - * representation identifier} and {@link Layer#getName() layer - * identifier} for {@link DRepresentation} refresh. - * - * @param debugModelID - * the debug model identifier - * @param representationID - * the {@link RepresentationDescription#getName() - * representation identifier} - * @param layerID - * the {@link Layer#getName() layer identifier} - */ - public void addRepresentationToRefresh(String debugModelID, - String representationID, String layerID) { - Map> toRefresh = representationToRefresh - .get(debugModelID); - if (toRefresh == null) { - toRefresh = new HashMap>(); - representationToRefresh.put(debugModelID, toRefresh); - } - Set layerIDs = toRefresh.get(representationID); - if (layerIDs != ANY_LAYER) { - if (layerIDs == null) { - layerIDs = new HashSet(); - toRefresh.put(representationID, layerIDs); - } - layerIDs.add(layerID); - } - } - - /** - * {@inheritDoc} - * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#currentInstructionChanged(java.lang.String, - * fr.obeo.dsl.debug.StackFrame) - */ - public void currentInstructionChanged(String debugModelID, - StackFrame frame) { - EObject currentInstruction = frame.getCurrentInstruction(); - final Set instructionURIs = new HashSet(); - - if (currentInstruction instanceof ParallelStep) { - addMseOccurenceAndCallerToInstructionsURIs(instructionURIs,((ParallelStep)currentInstruction).getMseoccurrence()); - for(Step step: ((ParallelStep)currentInstruction).getSubSteps()){ - addMseOccurenceAndCallerToInstructionsURIs(instructionURIs,step.getMseoccurrence()); - } - } else if (currentInstruction instanceof Step) { - if(!(currentInstruction.eContainer() instanceof ParallelStep)){ - // do not show internal step of parallel step, because they are already shown as a parallel - addMseOccurenceAndCallerToInstructionsURIs(instructionURIs,((Step)currentInstruction).getMseoccurrence()); - } - } else { - instructionURIs.add(EcoreUtil.getURI(currentInstruction)); - } - final Set lastInstructions = CURRENT_INSTRUCTIONS_PER_FRAME - .remove(frame); - if (lastInstructions != null) { - notifySirius(lastInstructions, debugModelID); - } - CURRENT_INSTRUCTIONS_PER_FRAME.put(frame, instructionURIs); - notifySirius(instructionURIs, debugModelID); - } - - private void addMseOccurenceAndCallerToInstructionsURIs(Set instructionURIs, MSEOccurrence mseOccurrence){ - if(mseOccurrence != null){ - instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse())); - if (mseOccurrence.getMse().getCaller() != null) { - instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse() - .getCaller())); - } - } - } - - /** - * {@inheritDoc} - * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#terminated(java.lang.String, - * fr.obeo.dsl.debug.StackFrame) - */ - public void terminated(String debugModelID, StackFrame frame) { - final Set lastInstructions = CURRENT_INSTRUCTIONS_PER_FRAME - .remove(frame); - if (lastInstructions != null) { - notifySirius(lastInstructions, debugModelID); - } - } - - /** - * Gets the current {@link StackFrame}. - * - * @return the current {@link StackFrame} - */ - protected StackFrame getCurrentFrame() { - return currentFrame; - } - - @Override - public void setCurrentFrame(String debugModelID, StackFrame frame) { - if (currentFrame != frame) { - currentFrame = frame; - Set instructionUris = CURRENT_INSTRUCTIONS_PER_FRAME - .get(getCurrentFrame()); - if (instructionUris != null) { - notifySirius(instructionUris, debugModelID); - } - } - } - - /** - * Tells if the given layer id and representation id should be refreshed while debugging the given - * debug model id. - * - * @param debugModelID - * the debug model id - * @param representationId - * the representation id - * @param layerID - * the layer id, it can be null - * @return true if the given layer id and representation id should be refreshed while - * debugging the given debug model id, false otherwise - */ - public boolean isRepresentationToRefresh(String debugModelID, String representationId, String layerID) { - final boolean res; - - final Map> representations = representationToRefresh.get(debugModelID); - if (representations != null) { - final Set layerIDs = representations.get(representationId); - res = layerIDs == ANY_LAYER || layerIDs.contains(layerID); - } else { - res = false; - } - - return res; - } - - } - - /** - * {@link Map} of {@link URI} pointing {@link DSLBreakpoint}. - */ - private static final Map> BREAKPOINTS = new HashMap>(); - - /** - * The {@link IBreakpointListener} maintaining breakpoints. - */ - public static final BreakpointListener LISTENER = new BreakpointListener(); - - /** - * Current instruction for a given {@link StackFrame}. - */ - private static final Map> CURRENT_INSTRUCTIONS_PER_FRAME = new HashMap>(); - - /** - * Constructor. - */ - public AbstractGemocDebuggerServices() { - for (StringCouple couple : getRepresentationRefreshList()) { - if (couple.getSecond() != null) { - LISTENER.addRepresentationToRefresh(getModelIdentifier(), - couple.getFirst(), couple.getSecond()); - } else { - LISTENER.addRepresentationToRefresh(getModelIdentifier(), - couple.getFirst()); - } - } - } - - /** - * Gets the {@link List} of {@link StringCouple} representing the - * {@link RepresentationDescription#getName() representation identifier} and - * the {@link Layer#getName() layer identifier} or null where - * services from this class are used. - * - * @return the {@link List} of {@link StringCouple} representing the - * {@link RepresentationDescription#getName() representation - * identifier} and the {@link Layer#getName() layer identifier} or - * null where services from this class are used - */ - protected abstract List getRepresentationRefreshList(); - - /** - * Tells if the given {@link EObject instruction} has a breakpoint. - * - * @param instruction - * the {@link EObject instruction} - * @return true if the given {@link EObject instruction} has a - * breakpoint, false otherwise - */ - public boolean hasBreakpoint(EObject instruction) { - final Set brkps = getBreakpoints(instruction); - return brkps != null && brkps.size() != 0; - } - - /** - * Tells if the given {@link EObject instruction} has an enabled breakpoint. - * - * @param instruction - * the {@link EObject instruction} - * @return true if the given {@link EObject instruction} has an - * enabled breakpoint, false otherwise - */ - public boolean hasEnabledBreakpoint(EObject instruction) { - boolean res = false; - final Set brkps = getBreakpoints(instruction); - - if (brkps != null && brkps.size() != 0) { - for (DSLBreakpoint breakpoint : brkps) { - try { - if (breakpoint.isEnabled()) { - res = true; - break; - } - } catch (CoreException e) { - // ignore - } - } - } - - return res; - } - - /** - * Tells if the given {@link EObject instruction} has an disabled - * breakpoint. - * - * @param instruction - * the {@link EObject instruction} - * @return true if the given {@link EObject instruction} has an - * disabled breakpoint, false otherwise - */ - public boolean hasDisabledBreakpoint(EObject instruction) { - boolean res = false; - final Set brkps = getBreakpoints(instruction); - - if (brkps != null && brkps.size() != 0) { - res = true; - for (DSLBreakpoint breakpoint : brkps) { - try { - if (breakpoint.isEnabled()) { - res = false; - break; - } - } catch (CoreException e) { - // ignore - } - } - } - - return res; - } - - /** - * Gets the {@link Set} of {@link DSLBreakpoint} for the - * {@link AbstractDSLDebuggerServices#getModelIdentifier() model identifier} - * . - * - * @param instruction - * the instruction to check - * @return the {@link Set} of {@link DSLBreakpoint} for the - * {@link AbstractDSLDebuggerServices#getModelIdentifier() model - * identifier} - */ - protected Set getBreakpoints(EObject instruction) { - Set res = new HashSet(); - - Set brkps = BREAKPOINTS.get(EcoreUtil - .getURI(instruction)); - if (brkps != null) { - for (DSLBreakpoint breakpoint : brkps) { - if (breakpoint.getModelIdentifier() - .equals(getModelIdentifier())) { - res.add(breakpoint); - } - } - } - - return res; - } - - /** - * Tells if the given {@link EObject instruction} is a currently debugged - * instruction. A debugged instruction in this context is an instruction a - * debug target is suspended on. - * - * This service works in a similar way as {@link AbstractGemocAnimatorServices hasBeenActivated} - * but will be activated only when the engine is paused. In addition, its content is related to the selected stack frame. - * - * @param instruction - * the {@link EObject instruction} - * @return true if the given {@link EObject instruction} is a - * currently debugged instruction, false otherwise - */ - public boolean isCurrentInstruction(EObject instruction) { - final Set instructions = CURRENT_INSTRUCTIONS_PER_FRAME - .get(LISTENER.getCurrentFrame()); - return instructions != null - && instructions.contains(EcoreUtil.getURI(instruction)); - } +public abstract class AbstractGemocDebuggerServices extends AbstractDSLDebuggerServices{ /** * Gets the debug model identifier. diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.classpath b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.classpath index 64c5e31b7..eca7bdba8 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.classpath +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF index 968c769e2..36fbdb6f6 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.obeo.dsl.debug.ide.sirius.ui;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %providerName Require-Bundle: org.eclipse.debug.ui;bundle-version="3.7.0", org.eclipse.ui;bundle-version="3.7.0", @@ -18,7 +18,9 @@ Require-Bundle: org.eclipse.debug.ui;bundle-version="3.7.0", org.eclipse.sirius.diagram;bundle-version="2.0.0", org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0", org.eclipse.sirius.diagram.ui, - com.google.guava;bundle-version="15.0.0" + com.google.guava;bundle-version="15.0.0", + org.eclipse.equinox.registry, + fr.inria.diverse.trace.commons.model Bundle-ActivationPolicy: lazy Bundle-Activator: fr.obeo.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin$Implementation Export-Package: fr.obeo.dsl.debug.ide.sirius.ui, diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java index 3d8d08efd..a4610efb3 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java @@ -10,9 +10,13 @@ *******************************************************************************/ package fr.obeo.dsl.debug.ide.sirius.ui.services; +import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import fr.inria.diverse.trace.commons.model.trace.ParallelStep; +import fr.inria.diverse.trace.commons.model.trace.Step; import fr.obeo.dsl.debug.StackFrame; import fr.obeo.dsl.debug.ide.DSLBreakpoint; import fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; +import fr.obeo.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin; import java.util.ArrayList; import java.util.HashMap; @@ -20,10 +24,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import org.eclipse.core.resources.IMarkerDelta; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IBreakpointListener; import org.eclipse.debug.core.model.IBreakpoint; @@ -56,46 +63,46 @@ public abstract class AbstractDSLDebuggerServices { */ public static final class StringCouple { - /** - * The first string of the couple. - */ - private final String first; + /** + * The first string of the couple. + */ + private final String first; - /** - * The second string of the couple. - */ - private final String second; + /** + * The second string of the couple. + */ + private final String second; - /** - * Constructor. - * - * @param first - * the first string of the couple - * @param second - * the second string of the couple - */ - public StringCouple(String first, String second) { - this.first = first; - this.second = second; - } + /** + * Constructor. + * + * @param first + * the first string of the couple + * @param second + * the second string of the couple + */ + public StringCouple(String first, String second) { + this.first = first; + this.second = second; + } - /** - * Gets the first string of the couple. - * - * @return the first string of the couple - */ - public String getFirst() { - return first; - } + /** + * Gets the first string of the couple. + * + * @return the first string of the couple + */ + public String getFirst() { + return first; + } - /** - * Gets the second string of the couple. - * - * @return the second string of the couple - */ - public String getSecond() { - return second; - } + /** + * Gets the second string of the couple. + * + * @return the second string of the couple + */ + public String getSecond() { + return second; + } } /** @@ -105,309 +112,414 @@ public String getSecond() { */ public static final class BreakpointListener implements IBreakpointListener, IDSLCurrentInstructionListener { - /** - * Any layer {@link Set}, means always refresh the given {@link DRepresentation} no matter what its - * layer are. It should be used for trees and tables since they don't have layers. - */ - private static final Set ANY_LAYER = new HashSet(); - - /** - * Mapping of the {@link RepresentationDescription#getName() representation identifier} to a - * {@link Layer#getName() layer identifier} or {@link BreakpointListener#ANY_LAYER any layer}. - */ - private final Map>> representationToRefresh = new HashMap>>(); - - /** - * The current {@link StackFrame}. - */ - private StackFrame currentFrame; - - /** - * Installs this {@link IBreakpointListener}. - */ - public void install() { - DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this); - for (IBreakpoint breakpoint : DebugPlugin.getDefault().getBreakpointManager().getBreakpoints()) { - if (breakpoint instanceof DSLBreakpoint) { - addBreakpoint((DSLBreakpoint)breakpoint); - } - } + /** + * Any layer {@link Set}, means always refresh the given {@link DRepresentation} no matter what its + * layer are. It should be used for trees and tables since they don't have layers. + */ + private static final Set ANY_LAYER = new HashSet(); + + /** + * Mapping of the {@link RepresentationDescription#getName() representation identifier} to a + * {@link Layer#getName() layer identifier} or {@link BreakpointListener#ANY_LAYER any layer}. + */ + private final Map>> representationToRefresh = new HashMap>>(); + + /** + * The current {@link StackFrame}. + */ + private StackFrame currentFrame; + + public BreakpointListener() { + install(); + } + + /** + * Installs this {@link IBreakpointListener}. + */ + public void install() { + DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this); + for (IBreakpoint breakpoint : DebugPlugin.getDefault().getBreakpointManager() + .getBreakpoints()) { + if (breakpoint instanceof DSLBreakpoint) { + addBreakpoint((DSLBreakpoint)breakpoint); + } } + } - /** - * Uninstalls this {@link IBreakpointListener}. - */ - public void uninstall() { - DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this); + /** + * Uninstalls this {@link IBreakpointListener}. + */ + public void uninstall() { + DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint) + */ + public void breakpointAdded(IBreakpoint breakpoint) { + if (breakpoint instanceof DSLBreakpoint) { + addBreakpoint((DSLBreakpoint)breakpoint); + final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; + final Set instructionURIs = new HashSet(); + instructionURIs.add(dslBreakpoint.getURI()); + notifySirius(instructionURIs, dslBreakpoint.getModelIdentifier()); } + } - /** - * {@inheritDoc} - * - * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint) - */ - public void breakpointAdded(IBreakpoint breakpoint) { - if (breakpoint instanceof DSLBreakpoint) { - addBreakpoint((DSLBreakpoint)breakpoint); - final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; - notifySirius(dslBreakpoint.getURI(), dslBreakpoint.getModelIdentifier()); - } + /** + * {@inheritDoc} + * + * @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, + * org.eclipse.core.resources.IMarkerDelta) + */ + public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) { + if (breakpoint instanceof DSLBreakpoint) { + removeBreakpoint((DSLBreakpoint)breakpoint); + final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; + final Set instructionURIs = new HashSet(); + instructionURIs.add(dslBreakpoint.getURI()); + notifySirius(instructionURIs, dslBreakpoint.getModelIdentifier()); } + } - /** - * {@inheritDoc} - * - * @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, - * org.eclipse.core.resources.IMarkerDelta) - */ - public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) { - if (breakpoint instanceof DSLBreakpoint) { - removeBreakpoint((DSLBreakpoint)breakpoint); - final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; - notifySirius(dslBreakpoint.getURI(), dslBreakpoint.getModelIdentifier()); - } + /** + * {@inheritDoc} + * + * @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, + * org.eclipse.core.resources.IMarkerDelta) + */ + public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) { + try { + if (breakpoint instanceof DSLBreakpoint && delta.getAttribute(IBreakpoint.ENABLED) != null + && breakpoint.isEnabled() != ((Boolean)delta.getAttribute(IBreakpoint.ENABLED)) + .booleanValue()) { + final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; + final Set instructionURIs = new HashSet(); + instructionURIs.add(dslBreakpoint.getURI()); + notifySirius(instructionURIs, dslBreakpoint.getModelIdentifier()); } + } catch (CoreException e) { + // ignore + } + } - /** - * {@inheritDoc} - * - * @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, - * org.eclipse.core.resources.IMarkerDelta) - */ - public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) { - try { - if (breakpoint instanceof DSLBreakpoint - && delta.getAttribute(IBreakpoint.ENABLED) != null - && breakpoint.isEnabled() != ((Boolean)delta.getAttribute(IBreakpoint.ENABLED)) - .booleanValue()) { - final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; - notifySirius(dslBreakpoint.getURI(), dslBreakpoint.getModelIdentifier()); - } - } catch (CoreException e) { - // ignore - } + /** + * Adds the given {@link DSLBreakpoint}. + * + * @param breakpoint + * the {@link DSLBreakpoint} + */ + protected void addBreakpoint(DSLBreakpoint breakpoint) { + Set brkps = BREAKPOINTS.get(breakpoint.getURI()); + if (brkps == null) { + brkps = new HashSet(); + BREAKPOINTS.put(breakpoint.getURI(), brkps); } + brkps.add(breakpoint); + } - /** - * Adds the given {@link DSLBreakpoint}. - * - * @param breakpoint - * the {@link DSLBreakpoint} - */ - protected void addBreakpoint(DSLBreakpoint breakpoint) { - Set brkps = BREAKPOINTS.get(breakpoint.getURI()); - if (brkps == null) { - brkps = new HashSet(); - BREAKPOINTS.put(breakpoint.getURI(), brkps); - } - brkps.add(breakpoint); - } - - /** - * Removes the given {@link DSLBreakpoint}. - * - * @param breakpoint - * the {@link DSLBreakpoint} - */ - protected void removeBreakpoint(DSLBreakpoint breakpoint) { - Set brkps = BREAKPOINTS.get(breakpoint.getURI()); - if (brkps != null) { - brkps.remove(breakpoint); - } + /** + * Removes the given {@link DSLBreakpoint}. + * + * @param breakpoint + * the {@link DSLBreakpoint} + */ + protected void removeBreakpoint(DSLBreakpoint breakpoint) { + Set brkps = BREAKPOINTS.get(breakpoint.getURI()); + if (brkps != null) { + brkps.remove(breakpoint); } + } - /** - * Notifies Sirius about a change in the given {@link DSLBreakpoint}. - * - * @param instructionUri - * the {@link URI} of the instruction to refresh. - * @param debugModelID - * the debug model identifier - */ - public void notifySirius(URI instructionUri, String debugModelID) { - Map> toRefresh = representationToRefresh.get(debugModelID); - if (toRefresh != null) { - for (IEditingSession session : SessionUIManager.INSTANCE.getUISessions()) { - final TransactionalEditingDomain transactionalEditingDomain = session.getSession() - .getTransactionalEditingDomain(); - final ResourceSet resourceSet = transactionalEditingDomain.getResourceSet(); - for (DialectEditor editor : session.getEditors()) { - EObject instruction = resourceSet.getEObject(instructionUri, false); - if (instruction != null) { - final DRepresentation representation = editor.getRepresentation(); - final List representations = new ArrayList(); - final RepresentationDescription description = DialectManager.INSTANCE - .getDescription(representation); - final String representationId = description.getName(); - final Set layerIDs = toRefresh.get(representationId); - if (layerIDs == ANY_LAYER) { - representations.add(representation); - } else if (layerIDs != null && representation instanceof DDiagram - && isActiveLayer((DDiagram)representation, layerIDs)) { - representations.add(representation); - } - // TODO prevent the editors from getting dirty - if (representations.size() != 0) { - final RefreshRepresentationsCommand refresh = new RefreshRepresentationsCommand( - transactionalEditingDomain, new NullProgressMonitor(), - representations); - transactionalEditingDomain.getCommandStack().execute(refresh); - } - } - } - } + /** + * Notifies Sirius about a change in the given {@link DSLBreakpoint}. + * + * @param instructionUri + * the {@link URI} of the instruction to refresh. + * @param debugModelID + * the debug model identifier + */ + public void notifySirius(Set instructionUris, String debugModelID) { + Map> toRefresh = representationToRefresh.get(debugModelID); + if (toRefresh != null) { + for (IEditingSession session : SessionUIManager.INSTANCE.getUISessions()) { + final TransactionalEditingDomain transactionalEditingDomain = session.getSession() + .getTransactionalEditingDomain(); + final boolean instructionPresent = isOneInstructionPresent(instructionUris, + transactionalEditingDomain.getResourceSet()); + if (instructionPresent) { + final List representations = getRepresentationsToRefresh(toRefresh, + session); + refreshRepresentations(transactionalEditingDomain, representations); } } + } + } - /** - * Tells if any of the given {@link Layer#getName() layer identifier} is active for the given - * {@link DDiagram}. - * - * @param diagram - * the {@link DDiagram} - * @param layerIDs - * the {@link Set} of {@link Layer#getName() layer identifiers} - * @return true if any of the given {@link Layer#getName() layer identifier} is active - * for the given {@link DDiagram}, false otherwise - */ - private boolean isActiveLayer(DDiagram diagram, Set layerIDs) { - boolean res = false; - - for (Layer layer : diagram.getActivatedLayers()) { - if (layerIDs.contains(layer.getName())) { - res = true; - break; - } - } + /** + * Refreshes given {@link DRepresentation} in the given {@link TransactionalEditingDomain}. + * + * @param transactionalEditingDomain + * the {@link TransactionalEditingDomain} + * @param representations + * the {@link List} of {@link DRepresentation} to refresh + */ + public void refreshRepresentations(final TransactionalEditingDomain transactionalEditingDomain, + final List representations) { + // TODO prevent the editors from getting dirty + if (representations.size() != 0) { + final RefreshRepresentationsCommand refresh = new RefreshRepresentationsCommand( + transactionalEditingDomain, new NullProgressMonitor(), representations); + + try { + transactionalEditingDomain.getCommandStack().execute(refresh); + } catch (Exception e) { + String repString = representations.stream().map(r -> r.getName()).collect(Collectors + .joining(", ")); + DebugSiriusIdeUiPlugin.getPlugin().getLog().log(new Status(IStatus.WARNING, + DebugSiriusIdeUiPlugin.ID, "Failed to refresh Sirius representation(s)[" + + repString + "], we hope to be able to do it later", e)); + } + } + } - return res; - } - - /** - * Add the given {@link RepresentationDescription#getName() representation identifier} for - * {@link DRepresentation} refresh. - * - * @param debugModelID - * the debug model identifier - * @param representationID - * the {@link RepresentationDescription#getName() representation identifier} - */ - public void addRepresentationToRefresh(String debugModelID, String representationID) { - Map> toRefresh = representationToRefresh.get(debugModelID); - if (toRefresh == null) { - toRefresh = new HashMap>(); - representationToRefresh.put(debugModelID, toRefresh); - } - toRefresh.put(representationID, ANY_LAYER); - } - - /** - * Add the given {@link RepresentationDescription#getName() representation identifier} and - * {@link Layer#getName() layer identifier} for {@link DRepresentation} refresh. - * - * @param debugModelID - * the debug model identifier - * @param representationID - * the {@link RepresentationDescription#getName() representation identifier} - * @param layerID - * the {@link Layer#getName() layer identifier} - */ - public void addRepresentationToRefresh(String debugModelID, String representationID, String layerID) { - Map> toRefresh = representationToRefresh.get(debugModelID); - if (toRefresh == null) { - toRefresh = new HashMap>(); - representationToRefresh.put(debugModelID, toRefresh); + /** + * Gets the {@link List} of {@link DRepresentation} to refresh in the given {@link IEditingSession}. + * + * @param toRefresh + * the representation names and layers to refresh + * @param session + * the {@link IEditingSession} + * @return the {@link List} of {@link DRepresentation} to refresh in the given {@link IEditingSession} + */ + private List getRepresentationsToRefresh(Map> toRefresh, + IEditingSession session) { + final List representations = new ArrayList(); + for (DialectEditor editor : session.getEditors()) { + final DRepresentation representation = editor.getRepresentation(); + if (representation == null) { + System.out.println("Dammit"); + } else { + final RepresentationDescription description = DialectManager.INSTANCE.getDescription( + representation); + if (description != null) { + final String representationId = description.getName(); + final Set layerIDs = toRefresh.get(representationId); + if (layerIDs == ANY_LAYER) { + representations.add(representation); + } else if (layerIDs != null && representation instanceof DDiagram && isActiveLayer( + (DDiagram)representation, layerIDs)) { + representations.add(representation); } - Set layerIDs = toRefresh.get(representationID); - if (layerIDs != ANY_LAYER) { - if (layerIDs == null) { - layerIDs = new HashSet(); - toRefresh.put(representationID, layerIDs); - } - layerIDs.add(layerID); } } + } + return representations; + } - /** - * {@inheritDoc} - * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#currentInstructionChanged(String, - * fr.obeo.dsl.debug.StackFrame)) - */ - public void currentInstructionChanged(String debugModelID, StackFrame frame) { - final URI instructionURI = EcoreUtil.getURI(frame.getCurrentInstruction()); - final URI lastInstruction = CURRENT_INSTRUCTIONS_PER_FRAME.remove(frame); - if (lastInstruction != null) { - notifySirius(lastInstruction, debugModelID); - } - CURRENT_INSTRUCTIONS_PER_FRAME.put(frame, instructionURI); - notifySirius(instructionURI, debugModelID); - } - - /** - * {@inheritDoc} - * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#terminated(java.lang.String, - * fr.obeo.dsl.debug.StackFrame) - */ - public void terminated(String debugModelID, StackFrame frame) { - final URI lastInstruction = CURRENT_INSTRUCTIONS_PER_FRAME.remove(frame); - if (lastInstruction != null) { - notifySirius(lastInstruction, debugModelID); - } + /** + * Tells if at least one of the given instruction {@link URI} is present in the given + * {@link ResourceSet}. + * + * @param instructionUris + * the {@link Set} of instructions {@link URI} + * @param resourceSet + * the {@link ResourceSet} + * @return true if at least one of the given instruction {@link URI} is present in the + * given {@link ResourceSet}, false otherwise + */ + private static boolean isOneInstructionPresent(Set instructionUris, + final ResourceSet resourceSet) { + boolean instructionPresent = false; + for (URI instructionUri : instructionUris) { + if (resourceSet.getEObject(instructionUri, false) != null) { + instructionPresent = true; + break; + } } + return instructionPresent; + } - /** - * Gets the current {@link StackFrame}. - * - * @return the current {@link StackFrame} - */ - public StackFrame getCurrentFrame() { - return currentFrame; - } - - /** - * {@inheritDoc} - * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#setCurrentFrame(java.lang.String, - * fr.obeo.dsl.debug.StackFrame) - */ - public void setCurrentFrame(String debugModelID, StackFrame frame) { - if (currentFrame != frame) { - currentFrame = frame; - final URI instructionUri = CURRENT_INSTRUCTIONS_PER_FRAME.get(getCurrentFrame()); - if (instructionUri != null) { - notifySirius(instructionUri, debugModelID); - } - } + /** + * Tells if any of the given {@link Layer#getName() layer identifier} is active for the given + * {@link DDiagram}. + * + * @param diagram + * the {@link DDiagram} + * @param layerIDs + * the {@link Set} of {@link Layer#getName() layer identifiers} + * @return true if any of the given {@link Layer#getName() layer identifier} is active + * for the given {@link DDiagram}, false otherwise + */ + private boolean isActiveLayer(DDiagram diagram, Set layerIDs) { + boolean res = false; + + for (Layer layer : diagram.getActivatedLayers()) { + if (layerIDs.contains(layer.getName())) { + res = true; + break; + } } - /** - * Tells if the given layer id and representation id should be refreshed while debugging the given - * debug model id. - * - * @param debugModelID - * the debug model id - * @param representationId - * the representation id - * @param layerID - * the layer id, it can be null - * @return true if the given layer id and representation id should be refreshed while - * debugging the given debug model id, false otherwise - */ - public boolean isRepresentationToRefresh(String debugModelID, String representationId, String layerID) { - final boolean res; - - final Map> representations = representationToRefresh.get(debugModelID); - if (representations != null) { - final Set layerIDs = representations.get(representationId); - res = layerIDs == ANY_LAYER || layerIDs.contains(layerID); - } else { - res = false; - } + return res; + } + + /** + * Add the given {@link RepresentationDescription#getName() representation identifier} for + * {@link DRepresentation} refresh. + * + * @param debugModelID + * the debug model identifier + * @param representationID + * the {@link RepresentationDescription#getName() representation identifier} + */ + public void addRepresentationToRefresh(String debugModelID, String representationID) { + Map> toRefresh = representationToRefresh.get(debugModelID); + if (toRefresh == null) { + toRefresh = new HashMap>(); + representationToRefresh.put(debugModelID, toRefresh); + } + toRefresh.put(representationID, ANY_LAYER); + } + + /** + * Add the given {@link RepresentationDescription#getName() representation identifier} and + * {@link Layer#getName() layer identifier} for {@link DRepresentation} refresh. + * + * @param debugModelID + * the debug model identifier + * @param representationID + * the {@link RepresentationDescription#getName() representation identifier} + * @param layerID + * the {@link Layer#getName() layer identifier} + */ + public void addRepresentationToRefresh(String debugModelID, String representationID, String layerID) { + Map> toRefresh = representationToRefresh.get(debugModelID); + if (toRefresh == null) { + toRefresh = new HashMap>(); + representationToRefresh.put(debugModelID, toRefresh); + } + Set layerIDs = toRefresh.get(representationID); + if (layerIDs != ANY_LAYER) { + if (layerIDs == null) { + layerIDs = new HashSet(); + toRefresh.put(representationID, layerIDs); + } + layerIDs.add(layerID); + } + } + + /** + * {@inheritDoc} + * + * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#currentInstructionChanged(String, + * fr.obeo.dsl.debug.StackFrame)) + */ + public void currentInstructionChanged(String debugModelID, StackFrame frame) { + EObject currentInstruction = frame.getCurrentInstruction(); + final Set instructionURIs = new HashSet(); + + if (currentInstruction instanceof ParallelStep) { + addMseOccurenceAndCallerToInstructionsURIs(instructionURIs, + ((ParallelStep)currentInstruction).getMseoccurrence()); + for (Step step : ((ParallelStep)currentInstruction).getSubSteps()) { + addMseOccurenceAndCallerToInstructionsURIs(instructionURIs, step.getMseoccurrence()); + } + } else if (currentInstruction instanceof Step) { + if (!(currentInstruction.eContainer() instanceof ParallelStep)) { + // do not show internal step of parallel step, because they are already shown as a + // parallel + addMseOccurenceAndCallerToInstructionsURIs(instructionURIs, ((Step)currentInstruction) + .getMseoccurrence()); + } + } else { + instructionURIs.add(EcoreUtil.getURI(currentInstruction)); + } + final Set lastInstructions = CURRENT_INSTRUCTIONS_PER_FRAME.remove(frame); + if (lastInstructions != null) { + notifySirius(lastInstructions, debugModelID); + } + CURRENT_INSTRUCTIONS_PER_FRAME.put(frame, instructionURIs); + notifySirius(instructionURIs, debugModelID); + } - return res; + private void addMseOccurenceAndCallerToInstructionsURIs(Set instructionURIs, + MSEOccurrence mseOccurrence) { + if (mseOccurrence != null) { + instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse())); + if (mseOccurrence.getMse().getCaller() != null) { + instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse().getCaller())); + } } + } + + /** + * {@inheritDoc} + * + * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#terminated(java.lang.String, + * fr.obeo.dsl.debug.StackFrame) + */ + public void terminated(String debugModelID, StackFrame frame) { + final Set lastInstructions = CURRENT_INSTRUCTIONS_PER_FRAME.remove(frame); + if (lastInstructions != null) { + notifySirius(lastInstructions, debugModelID); + } + } + + /** + * Gets the current {@link StackFrame}. + * + * @return the current {@link StackFrame} + */ + public StackFrame getCurrentFrame() { + return currentFrame; + } + + /** + * {@inheritDoc} + * + * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#setCurrentFrame(java.lang.String, + * fr.obeo.dsl.debug.StackFrame) + */ + public void setCurrentFrame(String debugModelID, StackFrame frame) { + if (currentFrame != frame) { + currentFrame = frame; + Set instructionUris = CURRENT_INSTRUCTIONS_PER_FRAME.get(getCurrentFrame()); + if (instructionUris != null) { + notifySirius(instructionUris, debugModelID); + } + } + } + + /** + * Tells if the given layer id and representation id should be refreshed while debugging the given + * debug model id. + * + * @param debugModelID + * the debug model id + * @param representationId + * the representation id + * @param layerID + * the layer id, it can be null + * @return true if the given layer id and representation id should be refreshed while + * debugging the given debug model id, false otherwise + */ + public boolean isRepresentationToRefresh(String debugModelID, String representationId, + String layerID) { + final boolean res; + + final Map> representations = representationToRefresh.get(debugModelID); + if (representations != null) { + final Set layerIDs = representations.get(representationId); + res = layerIDs == ANY_LAYER || (layerIDs != null && layerIDs.contains(layerID)); + } else { + res = false; + } + + return res; + } } @@ -422,33 +534,35 @@ public boolean isRepresentationToRefresh(String debugModelID, String representat private static final Map> BREAKPOINTS = new HashMap>(); /** - * Current instruction for a given {@link StackFrame}. + * Current instruction for a given {@link StackFrame}. Note : in concurrent mode, a ParallelStep may + * be represented by several URI (so we use a set) */ - private static final Map CURRENT_INSTRUCTIONS_PER_FRAME = new HashMap(); + private static final Map> CURRENT_INSTRUCTIONS_PER_FRAME = new HashMap>(); /** * Constructor. */ public AbstractDSLDebuggerServices() { - for (StringCouple couple : getRepresentationRefreshList()) { - if (couple.getSecond() != null) { - LISTENER.addRepresentationToRefresh(getModelIdentifier(), couple.getFirst(), couple - .getSecond()); - } else { - LISTENER.addRepresentationToRefresh(getModelIdentifier(), couple.getFirst()); - } + for (StringCouple couple : getRepresentationRefreshList()) { + if (couple.getSecond() != null) { + LISTENER.addRepresentationToRefresh(getModelIdentifier(), couple.getFirst(), couple + .getSecond()); + } else { + LISTENER.addRepresentationToRefresh(getModelIdentifier(), couple.getFirst()); } } + } /** * Gets the {@link List} of {@link StringCouple} representing the - * {@link RepresentationDescription#getName() representation identifier} and the {@link Layer#getName() - * layer identifier} or null where services from this class are used. + * {@link RepresentationDescription#getName() representation identifier} and the + * {@link Layer#getName() layer identifier} or null where services from this class are + * used. * * @return the {@link List} of {@link StringCouple} representing the * {@link RepresentationDescription#getName() representation identifier} and the - * {@link Layer#getName() layer identifier} or null where services from this class - * are used + * {@link Layer#getName() layer identifier} or null where services from this + * class are used */ protected abstract List getRepresentationRefreshList(); @@ -457,12 +571,12 @@ public AbstractDSLDebuggerServices() { * * @param instruction * the {@link EObject instruction} - * @return true if the given {@link EObject instruction} has a breakpoint, false - * otherwise + * @return true if the given {@link EObject instruction} has a breakpoint, + * false otherwise */ public boolean hasBreakpoint(EObject instruction) { - final Set brkps = getBreakpoints(instruction); - return brkps != null && brkps.size() != 0; + final Set brkps = getBreakpoints(instruction); + return brkps != null && brkps.size() != 0; } /** @@ -474,23 +588,23 @@ public boolean hasBreakpoint(EObject instruction) { * false otherwise */ public boolean hasEnabledBreakpoint(EObject instruction) { - boolean res = false; - final Set brkps = getBreakpoints(instruction); - - if (brkps != null && brkps.size() != 0) { - for (DSLBreakpoint breakpoint : brkps) { - try { - if (breakpoint.isEnabled()) { - res = true; - break; - } - } catch (CoreException e) { - // ignore - } + boolean res = false; + final Set brkps = getBreakpoints(instruction); + + if (brkps != null && brkps.size() != 0) { + for (DSLBreakpoint breakpoint : brkps) { + try { + if (breakpoint.isEnabled()) { + res = true; + break; } + } catch (CoreException e) { + // ignore } + } + } - return res; + return res; } /** @@ -502,24 +616,24 @@ public boolean hasEnabledBreakpoint(EObject instruction) { * false otherwise */ public boolean hasDisabledBreakpoint(EObject instruction) { - boolean res = false; - final Set brkps = getBreakpoints(instruction); - - if (brkps != null && brkps.size() != 0) { - res = true; - for (DSLBreakpoint breakpoint : brkps) { - try { - if (breakpoint.isEnabled()) { - res = false; - break; - } - } catch (CoreException e) { - // ignore - } + boolean res = false; + final Set brkps = getBreakpoints(instruction); + + if (brkps != null && brkps.size() != 0) { + res = true; + for (DSLBreakpoint breakpoint : brkps) { + try { + if (breakpoint.isEnabled()) { + res = false; + break; } + } catch (CoreException e) { + // ignore + } } + } - return res; + return res; } /** @@ -532,32 +646,34 @@ public boolean hasDisabledBreakpoint(EObject instruction) { * {@link AbstractDSLDebuggerServices#getModelIdentifier() model identifier} */ protected Set getBreakpoints(EObject instruction) { - Set res = new HashSet(); + Set res = new HashSet(); - Set brkps = BREAKPOINTS.get(EcoreUtil.getURI(instruction)); - if (brkps != null) { - for (DSLBreakpoint breakpoint : brkps) { - if (breakpoint.getModelIdentifier().equals(getModelIdentifier())) { - res.add(breakpoint); - } - } + Set brkps = BREAKPOINTS.get(EcoreUtil.getURI(instruction)); + if (brkps != null) { + for (DSLBreakpoint breakpoint : brkps) { + if (breakpoint.getModelIdentifier().equals(getModelIdentifier())) { + res.add(breakpoint); + } } + } - return res; + return res; } /** * Tells if the given {@link EObject instruction} is a currently debugged instruction. A debugged - * instruction in this context is an instruction a debug target is suspended on. + * instruction in this context is an instruction a debug target is suspended on. This service works in + * a similar way as {@link AbstractGemocAnimatorServices hasBeenActivated} but will be activated only + * when the engine is paused. In addition, its content is related to the selected stack frame. * * @param instruction * the {@link EObject instruction} - * @return true if the given {@link EObject instruction} is a currently debugged instruction, - * false otherwise + * @return true if the given {@link EObject instruction} is a currently debugged + * instruction, false otherwise */ public boolean isCurrentInstruction(EObject instruction) { - final URI uri = CURRENT_INSTRUCTIONS_PER_FRAME.get(LISTENER.getCurrentFrame()); - return uri != null && uri.equals(EcoreUtil.getURI(instruction)); + final Set instructions = CURRENT_INSTRUCTIONS_PER_FRAME.get(LISTENER.getCurrentFrame()); + return instructions != null && instructions.contains(EcoreUtil.getURI(instruction)); } /** From b13acfb82f586a5cc73810c27be8daf70089f587 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Tue, 6 Dec 2016 17:09:46 +0100 Subject: [PATCH 067/267] fixing isCurrentInstruction --- .../ui/launcher/GemocSourceLocator.java | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java index 25084be76..bf0c2f54b 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java @@ -14,6 +14,8 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.model.IStackFrame; +import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.DelegatingModelPresentation; import org.eclipse.debug.ui.ISourcePresentation; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; @@ -22,6 +24,7 @@ import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.xtext.resource.XtextResource; +import org.gemoc.execution.sequential.javaengine.ui.Activator; import fr.inria.diverse.melange.resource.MelangeResourceImpl; import fr.inria.diverse.trace.commons.model.trace.Step; @@ -73,11 +76,18 @@ public IEditorInput getEditorInput(Object element) { } } - URI uri = target.eResource().getURI(); - if(uri.toPlatformString(true) != null){ - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true))); - IFileEditorInput input = new FileEditorInput(file); - return input; + Resource r = eObject.eResource(); + if (r instanceof XtextResource) { + URI uri = target.eResource().getURI(); + if(uri.toPlatformString(true) != null){ + IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true))); + IFileEditorInput input = new FileEditorInput(file); + return input; + } + } + else { + //Default + return getPresentation().getEditorInput(eObject); } } return null; @@ -92,6 +102,13 @@ public String getEditorId(IEditorInput input, Object element) { return ((XtextResource) r).getLanguageName(); } } - return null; + + //Default + ISourcePresentation presentation = getPresentation(); + return presentation.getEditorId(input, element); + } + private ISourcePresentation getPresentation() { + String id = Activator.DEBUG_MODEL_ID; + return ((DelegatingModelPresentation)DebugUIPlugin.getModelPresentation()).getPresentation(id); } } From 0eebf0cb07329f500eb7eeb446f575063784e391 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Wed, 7 Dec 2016 11:21:34 +0100 Subject: [PATCH 068/267] Added support for external events --- ...ommandBasedSequentialExecutionEngine.xtend | 13 +-- .../engine/core/AbstractExecutionEngine.java | 10 ++ .../AbstractSequentialExecutionEngine.java | 27 +++-- .../api/engine_addon/IEngineAddon.java | 5 + .../debug/GenericSequentialModelDebugger.java | 35 +++--- .../javaengine/PlainK3ExecutionEngine.java | 103 ++++++++++-------- .../gemoc/traceaddon/AbstractTraceAddon.xtend | 8 +- .../generator/TraceMMGeneratorSteps.xtend | 3 +- .../K3StepExtractor.xtend | 36 +++++- 9 files changed, 150 insertions(+), 90 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend index df4f84219..804060947 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend @@ -13,21 +13,18 @@ abstract class AbstractCommandBasedSequentialExecutionEngine extends AbstractSeq * @param operation */ protected def void executeOperation(Object caller, String className, String operationName, Runnable operation) { - val RecordingCommand rc = new RecordingCommand(editingDomain) { override doExecute() { - operation.run(); + operation.run() } - }; + } try { - beforeExecutionStep(caller, className, operationName, rc); - rc.execute(); - afterExecutionStep(); + beforeExecutionStep(caller, className, operationName, rc) + rc.execute + afterExecutionStep } finally { - // Important to remove notifiers. rc.dispose } } - } \ No newline at end of file diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java index 1cc16fdb8..520fba990 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java @@ -144,6 +144,16 @@ protected void notifyEngineStarted() { } } } + + protected void notifyEngineInitialized() { + for (IEngineAddon addon : getExecutionContext().getExecutionPlatform().getEngineAddons()) { + try { + addon.engineInitialized(this); + } catch (Exception e) { + addonError(addon, e); + } + } + } protected final void notifyAboutToStop() { for (IEngineAddon addon : getExecutionContext().getExecutionPlatform().getEngineAddons()) { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index 563dc809b..8b14d22fc 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -24,6 +24,8 @@ import org.gemoc.xdsmlframework.api.core.IExecutionContext; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; +import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; import fr.inria.diverse.trace.commons.model.trace.GenericMSE; import fr.inria.diverse.trace.commons.model.trace.MSE; import fr.inria.diverse.trace.commons.model.trace.MSEModel; @@ -39,7 +41,7 @@ public abstract class AbstractSequentialExecutionEngine extends AbstractExecutio private IMultiDimensionalTraceAddon traceAddon; abstract protected void executeEntryPoint(); - + abstract protected void initializeModel(); abstract protected void prepareEntryPoint(IExecutionContext executionContext); @@ -58,6 +60,7 @@ public final void performInitialize(IExecutionContext executionContext) { @Override protected final void performStart() { initializeModel(); + notifyEngineInitialized(); executeEntryPoint(); Activator.getDefault().info("Execution finished"); } @@ -66,7 +69,6 @@ protected final void performStart() { * To be called just before each execution step by an implementing engine. */ protected final void beforeExecutionStep(Object caller, String className, String operationName) { - // We will trick the transaction with an empty command. This most // probably make rollbacks impossible, but at least we can manage // transactions the way we want. @@ -85,19 +87,25 @@ protected void doExecute() { * the step was done through a RecordingCommand, it can be given. */ protected final void beforeExecutionStep(Object caller, String className, String operationName, RecordingCommand rc) { - if (caller != null && caller instanceof EObject && editingDomain != null) { - // Call expected to be done from an EMF model, hence EObjects EObject caller_cast = (EObject) caller; - // We create a step Step step = createStep(caller_cast, className, operationName); - beforeExecutionStep(step, rc); + MSEOccurrence mse = getCurrentMSEOccurrence(); + if (mse != null) { + EObject container = mse.eContainer(); + if (container instanceof SequentialStep) { + IEventManager eventManager = EventManagerRegistry.getInstance().findEventManager(null); + if (eventManager != null) { + eventManager.manageEvents(); + } + } + } + beforeExecutionStep(step, rc); } - } private Step createStep(EObject caller, String className, String methodName) { @@ -118,7 +126,6 @@ private Step createStep(EObject caller, String className, String methodName) { } private EOperation findOperation(EObject object, String className, String methodName) { - // We try to find the corresponding EOperation in the execution // metamodel for (EOperation operation : object.eClass().getEAllOperations()) { @@ -152,9 +159,7 @@ private EOperation findOperation(EObject object, String className, String method } public final MSE findOrCreateMSE(EObject caller, String className, String methodName) { - EOperation operation = findOperation(caller, className, methodName); - // TODO Should be created/loaded before execution by analyzing the // model? if (_actionModel == null) { @@ -205,13 +210,11 @@ protected void doExecute() { @Override protected void beforeStart() { // TODO Auto-generated method stub - } @Override protected void performStop() { // TODO Auto-generated method stub - } @Override diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java index 2ff88e17f..0a3d45bcd 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java @@ -30,6 +30,10 @@ public interface IEngineAddon { */ public void engineStarted(IExecutionEngine executionEngine); + default public void engineInitialized(IExecutionEngine executionEngine) { + + } + public void engineAboutToStop(IExecutionEngine engine); /** @@ -37,6 +41,7 @@ public interface IEngineAddon { */ public void engineStopped(IExecutionEngine engine); + /** * Operation before the engine has been disposed (and after the engine has * been stopped) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java index 0fb78afc6..762fcd345 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java @@ -23,7 +23,6 @@ import org.eclipse.xtext.naming.QualifiedName; import org.gemoc.executionframework.engine.core.EngineStoppedException; import org.gemoc.executionframework.engine.ui.debug.AbstractGemocDebugger; -import org.gemoc.executionframework.engine.ui.debug.MutableField; import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; @@ -39,10 +38,12 @@ public class GenericSequentialModelDebugger extends AbstractGemocDebugger { */ private static final EObject FAKE_INSTRUCTION = EcorePackage.eINSTANCE; + private List toPushPop = new ArrayList<>(); + protected final String threadName = "Model debugging"; protected int nbStackFrames = 0; - + protected boolean executionTerminated = false; public GenericSequentialModelDebugger(IDSLDebugEventProcessor target, IExecutionEngine engine) { @@ -146,7 +147,7 @@ public void popStackFrame(String threadName) { super.popStackFrame(threadName); nbStackFrames--; } - + protected final DefaultDeclarativeQualifiedNameProvider nameprovider = new DefaultDeclarativeQualifiedNameProvider(); @Override @@ -179,7 +180,10 @@ protected void updateStack(String threadName, EObject instruction) { EObject caller = mseOccurrence.getMse().getCaller(); QualifiedName qname = nameprovider.getFullyQualifiedName(caller); String objectName = ""; - if(qname != null) objectName=qname.toString(); else objectName=caller.toString(); + if (qname != null) + objectName = qname.toString(); + else + objectName = caller.toString(); String opName = mseOccurrence.getMse().getAction().getName(); String callerType = caller.eClass().getName(); String prettyName = "(" + callerType + ") " + objectName + " -> " + opName + "()"; @@ -199,7 +203,8 @@ public void updateData(String threadName, EObject instruction) { return; } - // We don't want to deal with logical steps since we are in sequential mode + // We don't want to deal with logical steps since we are in sequential + // mode if (instruction instanceof Step) { instruction = ((Step) instruction).getMseoccurrence().getMse().getCaller(); } else if (instruction instanceof MSEOccurrence) { @@ -214,16 +219,17 @@ public boolean shouldBreak(EObject instruction) { if (instruction instanceof MSEOccurrence) { return shouldBreakMSEOccurence((MSEOccurrence) instruction); } else if (instruction == FAKE_INSTRUCTION) { - // Part of the breakpoint simulation to suspend the execution once the end has been reached. + // Part of the breakpoint simulation to suspend the execution once + // the end has been reached. return true; } return false; } private boolean hasRegularBreakpointTrue(EObject o) { - return super.shouldBreak(o) - && (Boolean.valueOf((String) getBreakpointAttributes(o, GemocBreakpoint.BREAK_ON_LOGICAL_STEP)) || Boolean - .valueOf((String) getBreakpointAttributes(o, GemocBreakpoint.BREAK_ON_MSE_OCCURRENCE))); + return super.shouldBreak(o) && (Boolean + .valueOf((String) getBreakpointAttributes(o, GemocBreakpoint.BREAK_ON_LOGICAL_STEP)) + || Boolean.valueOf((String) getBreakpointAttributes(o, GemocBreakpoint.BREAK_ON_MSE_OCCURRENCE))); } private boolean shouldBreakMSEOccurence(MSEOccurrence mseOccurrence) { @@ -281,13 +287,13 @@ public void stepExecuted(IExecutionEngine engine, Step step) { toPushPop.add(stackModification); } } - + @Override public void engineAboutToStop(IExecutionEngine engine) { // Simulating breakpoint - // TODO maybe display a warning informing the user the execution has ended, - // as resuming execution will prevent further interactions with the trace and the - // debugging facilities, which might not be desirable. + // TODO maybe display a warning informing the user the execution has + // ended, as resuming execution will prevent further interactions with the + // trace and the debugging facilities, which might not be desirable. executionTerminated = true; control(threadName, FAKE_INSTRUCTION); } @@ -307,7 +313,4 @@ private static class ToPushPop { this.push = push; } } - - private List toPushPop = new ArrayList<>(); - } diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java index da0974c74..a21801f19 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java @@ -68,7 +68,7 @@ public class PlainK3ExecutionEngine extends AbstractCommandBasedSequentialExecut private Method entryPointMethod; private List entryPointMethodParameters; private Class entryPointClass; - + private static final String LAUNCH_CONFIGURATION_TYPE = "org.gemoc.execution.sequential.javaengine.ui.launcher"; @Override @@ -77,9 +77,11 @@ public String engineKindName() { } /** - * Constructs a PlainK3 execution engine using an entry point (~ a main operation) The entrypoint will register - * itself as a StepManager into the K3 step manager registry, and unregister itself at the end. As a StepManager, - * the PlainK3ExecutionEngine will receive callbacks through its "executeStep" operation. + * Constructs a PlainK3 execution engine using an entry point (~ a main + * operation) The entrypoint will register itself as a StepManager into the + * K3 step manager registry, and unregister itself at the end. As a + * StepManager, the PlainK3ExecutionEngine will receive callbacks through + * its "executeStep" operation. */ @Override protected void prepareEntryPoint(IExecutionContext executionContext) { @@ -111,9 +113,9 @@ protected void prepareEntryPoint(IExecutionContext executionContext) { } catch (ClassNotFoundException e) { String bundleName = bundle.getHeaders().get("Bundle-Name"); e.printStackTrace(); - throw new RuntimeException("Could not find class " - + executionContext.getRunConfiguration().getExecutionEntryPoint() + " in bundle " + bundleName - + "."); + throw new RuntimeException( + "Could not find class " + executionContext.getRunConfiguration().getExecutionEntryPoint() + + " in bundle " + bundleName + "."); } // search the method @@ -147,39 +149,46 @@ protected void prepareInitializeModel(IExecutionContext executionContext) { .substring(modelInitializationMethodQName.lastIndexOf(".") + 1); boolean isListArgs = false; boolean isEListArgs = false; + boolean isFound = false; try { Class[] modelInitializationParamType = new Class[] { entryPointMethodParameters.get(0).getClass().getInterfaces()[0], String[].class }; initializeMethod = entryPointClass.getMethod(modelInitializationMethodName, modelInitializationParamType); isListArgs = false; // this is a java array + isFound = true; } catch (Exception e) { + + } + if (!isFound) { try { Class[] modelInitializationParamType = new Class[] { entryPointMethodParameters.get(0).getClass().getInterfaces()[0], List.class }; initializeMethod = entryPointClass.getMethod(modelInitializationMethodName, modelInitializationParamType); isListArgs = true; // this is a List + isFound = true; + } catch (Exception e) { - } catch (Exception e2) { - try { - Class[] modelInitializationParamType = new Class[] { - entryPointMethodParameters.get(0).getClass().getInterfaces()[0], EList.class }; - this.initializeMethod = entryPointClass.getMethod(modelInitializationMethodName, - modelInitializationParamType); - isEListArgs = true; // this is an EList - } catch (Exception e3) { - - String msg = "There is no \"" + modelInitializationMethodName + "\" method in " - + entryPointClass.getName() + " with first parameter able to handle " - + entryPointMethodParameters.get(0).toString(); - msg += " and String[] or List or EList args as second parameter"; - msg += " from " + ((EObject) entryPointMethodParameters.get(0)).eClass().getEPackage().getNsURI(); - Activator.error(msg, e); - // ((EObject)parameters.get(0)).eClass().getEPackage().getNsURI() - throw new RuntimeException("Could not find method " + modelInitializationMethodName - + " with correct parameters."); - } + } + } + if (!isFound) { + try { + Class[] modelInitializationParamType = new Class[] { + entryPointMethodParameters.get(0).getClass().getInterfaces()[0], EList.class }; + this.initializeMethod = entryPointClass.getMethod(modelInitializationMethodName, + modelInitializationParamType); + isEListArgs = true; // this is an EList + } catch (Exception e) { + String msg = "There is no \"" + modelInitializationMethodName + "\" method in " + + entryPointClass.getName() + " with first parameter able to handle " + + entryPointMethodParameters.get(0).toString(); + msg += " and String[] or List or EList args as second parameter"; + msg += " from " + ((EObject) entryPointMethodParameters.get(0)).eClass().getEPackage().getNsURI(); + Activator.error(msg, e); + // ((EObject)parameters.get(0)).eClass().getEPackage().getNsURI() + throw new RuntimeException( + "Could not find method " + modelInitializationMethodName + " with correct parameters."); } } final boolean final_isListArgs = isListArgs; @@ -201,10 +210,9 @@ protected void prepareInitializeModel(IExecutionContext executionContext) { } initializeMethodParameters.add(modelInitializationListParameters); } else { - initializeMethodParameters.add(executionContext.getRunConfiguration() - .getModelInitializationArguments().split("\\r?\\n")); + initializeMethodParameters + .add(executionContext.getRunConfiguration().getModelInitializationArguments().split("\\r?\\n")); } - } } @@ -255,11 +263,13 @@ protected void executeEntryPoint() { @Override /* - * This is the operation called from K3 code. We use this callback to pass the command to the generic - * executeOperation operation. (non-Javadoc) + * This is the operation called from K3 code. We use this callback to pass + * the command to the generic executeOperation operation. (non-Javadoc) * - * @see fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IStepManager# executeStep(java.lang.Object, - * fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepCommand, java.lang.String) + * @see fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IStepManager# + * executeStep(java.lang.Object, + * fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepCommand, + * java.lang.String) */ public void executeStep(Object caller, final StepCommand command, String className, String methodName) { executeOperation(caller, className, methodName, new Runnable() { @@ -272,10 +282,11 @@ public void run() { @Override /* - * This is the operation used to act as a StepManager in K3. We return true if we have the same editing domain as - * the object. (non-Javadoc) + * This is the operation used to act as a StepManager in K3. We return true + * if we have the same editing domain as the object. (non-Javadoc) * - * @see fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IStepManager#canHandle (java.lang.Object) + * @see fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IStepManager# + * canHandle (java.lang.Object) */ public boolean canHandle(Object caller) { if (caller instanceof EObject) { @@ -339,10 +350,12 @@ private Bundle findBundle(final IExecutionContext executionContext, String aspec } /** - * search the bundle that contains the Main class. The search is done in the workspace scope (ie. if it is defined - * in the current workspace it will find it + * search the bundle that contains the Main class. The search is done in the + * workspace scope (ie. if it is defined in the current workspace it will + * find it * - * @return the name of the bundle containing the Main class or null if not found + * @return the name of the bundle containing the Main class or null if not + * found */ private IType getITypeMainByWorkspaceScope(String className) { SearchPattern pattern = SearchPattern.createPattern(className, IJavaSearchConstants.CLASS, @@ -395,7 +408,7 @@ public static Resource loadModel(URI modelURI) { } return resource; } - + @Override public LaunchConfiguration extractLaunchConfiguration() { final IRunConfiguration configuration = getExecutionContext().getRunConfiguration(); @@ -431,12 +444,14 @@ public LaunchConfiguration extractLaunchConfiguration() { launchConfiguration.getParameters().add(modelRootParam); } if (configuration.getModelInitializationMethod() != null) { - final InitializationMethodParameter initializationMethodParam = TraceFactory.eINSTANCE.createInitializationMethodParameter(); + final InitializationMethodParameter initializationMethodParam = TraceFactory.eINSTANCE + .createInitializationMethodParameter(); initializationMethodParam.setValue(configuration.getModelInitializationMethod()); launchConfiguration.getParameters().add(initializationMethodParam); } if (configuration.getModelInitializationArguments() != null) { - final InitializationArgumentsParameter initializationArgumentsParam = TraceFactory.eINSTANCE.createInitializationArgumentsParameter(); + final InitializationArgumentsParameter initializationArgumentsParam = TraceFactory.eINSTANCE + .createInitializationArgumentsParameter(); initializationArgumentsParam.setValue(configuration.getModelInitializationArguments()); launchConfiguration.getParameters().add(initializationArgumentsParam); } @@ -447,8 +462,4 @@ public LaunchConfiguration extractLaunchConfiguration() { }); return launchConfiguration; } - - - - } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index 994994b79..291ca24c4 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -19,18 +19,18 @@ import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.emf.transaction.RecordingCommand import org.eclipse.emf.transaction.util.TransactionUtil +import org.gemoc.commons.eclipse.emf.EMFResource import org.gemoc.executionframework.engine.core.CommandExecution import org.gemoc.xdsmlframework.api.core.IExecutionContext +import org.gemoc.xdsmlframework.api.core.IExecutionEngine import org.gemoc.xdsmlframework.api.engine_addon.DefaultEngineAddon import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListenerAddon import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl -import org.gemoc.xdsmlframework.api.core.IExecutionEngine -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener -import org.gemoc.commons.eclipse.emf.EMFResource abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDimensionalTraceAddon { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend index 2e260a1f1..cf67ffe83 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend @@ -173,7 +173,6 @@ class TraceMMGeneratorSteps { // Default basic name stepClass.name = stepRule.operation.name - // If in the context of gemoc, we implement a "getCaller" eoperation that is well typed if (gemoc && stepRule.containingClass != null) { val EOperation getCallerEOperation = EcoreFactory.eINSTANCE.createEOperation @@ -253,7 +252,7 @@ class TraceMMGeneratorSteps { implicitStepClass.ESuperTypes.addAll(subStepSuperClass, mseSmallStepClass) traceability.putImplicitStepClass(implicitStepClass, stepRule.containingClass) - + for (calledStepRule : stepRule.calledRules) { // For each called step rule, we create an step class (if not created already) val EClass subStepClass = getStepClass(calledStepRule) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend index 9aa7af799..ff86c5fc6 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend @@ -33,6 +33,7 @@ class K3StepExtractor { private val Set allk3Methods = new HashSet private val Set allSuperMethods = new HashSet private val Set stepFunctions = new HashSet + private val Set eventFunctions = new HashSet private val Map functionToRule = new HashMap private val Set inspectedClasses = new HashSet @@ -44,6 +45,7 @@ class K3StepExtractor { private val Map> callGraph = new HashMap private val Map> classToSubClasses = new HashMap private val Map> classToSuperClasses = new HashMap + new(Set aspects, String languageName, EPackage extendedMetamodel, Ecorext inConstructionEcorext) { this.allClasses = aspects @@ -88,7 +90,7 @@ class K3StepExtractor { private def void inspectForBigStep(IMethod function) { - // We consider that each Kermeta function is a transformation rule (even through we cannot know if it modifies anything) + // We consider that each Kermeta function is a transformation rule (even through we cannot know if it modifies anything) val Rule rule = getRuleOfFunction(function) // We retrieve which functions are called by the function @@ -160,8 +162,11 @@ class K3StepExtractor { // We store the aspect class and the aspected class stepAspectsClassToAspectedClasses.put(type, aspectedEClass) - // And we store all the functions with @Step + // We store all the functions with @Step stepFunctions.addAll(type.methods.filter[isStep]) + + // And we store all the functions with @EventProcessor + eventFunctions.addAll(type.methods.filter[isEvent]) } inspectedClasses.add(type) } @@ -313,6 +318,15 @@ class K3StepExtractor { totalLength = callGraphTotalLengthComputer.apply() } + allMethods.forEach[m| + var calledMethods = callGraph.get(m) + if (calledMethods == null) { + calledMethods = new HashSet + callGraph.put(m,calledMethods) + } + calledMethods.addAll(eventFunctions) + ] + // We then add in the support for calls to super methods. allMethods.forEach[m| val k3m = methodToK3Method.get(m) @@ -391,6 +405,24 @@ class K3StepExtractor { testAnnotation(method, "Step") } + /** + * Return true if 'method' is tagged with "@EventProcessor" + */ + private def boolean isEvent(IMethod method) { + val annotation = method.annotations.findFirst[a| + val name = a.elementName + val lastDotIndex = name.lastIndexOf('.') + var simpleName = name + if (lastDotIndex !== -1) { + simpleName = name.substring(lastDotIndex + 1) + } + return simpleName == "Step" + ] + annotation != null && annotation.memberValuePairs.exists[p| + p.memberName == "eventTriggerable" && p.value instanceof Boolean && p.value as Boolean + ] + } + /** * Return true if 'method' is tagged with "@OverrideAspectMethod" */ From 3cee609d2309eb2a9436a601ea7cbd3623edcbdd Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Wed, 7 Dec 2016 13:22:10 +0100 Subject: [PATCH 069/267] Adapted sirius extension to new API --- .../modelloader/DefaultModelLoader.java | 299 +++++++++--------- 1 file changed, 141 insertions(+), 158 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index 731e05dcd..8456164f1 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -59,6 +59,7 @@ import org.eclipse.sirius.ui.business.api.session.IEditingSession; import org.eclipse.sirius.ui.business.api.session.SessionUIManager; import org.eclipse.sirius.viewpoint.DRepresentation; +import org.eclipse.sirius.viewpoint.DRepresentationDescriptor; import org.eclipse.sirius.viewpoint.DView; import org.eclipse.sirius.viewpoint.description.RepresentationExtensionDescription; import org.eclipse.sirius.viewpoint.description.Viewpoint; @@ -83,13 +84,11 @@ public class DefaultModelLoader implements IModelLoader { - public Resource loadModel(IExecutionContext context) - throws RuntimeException { + public Resource loadModel(IExecutionContext context) throws RuntimeException { Resource resource = null; ResourceSet resourceSet; resourceSet = new ResourceSetImpl(); - resource = resourceSet.createResource(context.getRunConfiguration() - .getExecutedModelURI()); + resource = resourceSet.createResource(context.getRunConfiguration().getExecutedModelURI()); try { resource.load(null); } catch (IOException e) { @@ -98,36 +97,32 @@ public Resource loadModel(IExecutionContext context) return resource; } - public Resource loadModelForAnimation(IExecutionContext context) - throws RuntimeException { + public Resource loadModelForAnimation(IExecutionContext context) throws RuntimeException { Resource resource = null; ResourceSet resourceSet; if (context.getRunConfiguration().getAnimatorURI() != null) { - killPreviousSiriusSession(context.getRunConfiguration() - .getAnimatorURI()); + killPreviousSiriusSession(context.getRunConfiguration().getAnimatorURI()); Session session; try { - session = openNewSiriusSession(context, context - .getRunConfiguration().getAnimatorURI()); - resourceSet = session.getTransactionalEditingDomain() - .getResourceSet(); + session = openNewSiriusSession(context, context.getRunConfiguration().getAnimatorURI()); + resourceSet = session.getTransactionalEditingDomain().getResourceSet(); } catch (CoreException e) { throw new RuntimeException(e); } - // At this point Sirius has loaded the model, so we just need to find it + // At this point Sirius has loaded the model, so we just need to + // find it boolean useMelange = context.getRunConfiguration().getMelangeQuery() != null && !context.getRunConfiguration().getMelangeQuery().isEmpty(); // calculating model URI as MelangeURI - URI modelURI = useMelange ? context.getRunConfiguration() - .getExecutedModelAsMelangeURI() : context.getRunConfiguration() - .getExecutedModelURI(); + URI modelURI = useMelange ? context.getRunConfiguration().getExecutedModelAsMelangeURI() + : context.getRunConfiguration().getExecutedModelURI(); for (Resource r : resourceSet.getResources()) { if (r.getURI().equals(modelURI)) { resource = r; break; } } - + return resource; } else { // animator not available; fall back to classic load @@ -136,36 +131,30 @@ public Resource loadModelForAnimation(IExecutionContext context) } private void killPreviousSiriusSession(URI sessionResourceURI) { - final Session session = SessionManager.INSTANCE - .getExistingSession(sessionResourceURI); + final Session session = SessionManager.INSTANCE.getExistingSession(sessionResourceURI); if (session != null) { - final IEditingSession uiSession = SessionUIManager.INSTANCE - .getUISession(session); + final IEditingSession uiSession = SessionUIManager.INSTANCE.getUISession(session); DebugPermissionProvider permProvider = new DebugPermissionProvider(); - if (!permProvider.provides(session.getTransactionalEditingDomain() - .getResourceSet())) { + if (!permProvider.provides(session.getTransactionalEditingDomain().getResourceSet())) { // this is a not debugSession (ie. a normal editing session) if (uiSession != null) { for (final DialectEditor editor : uiSession.getEditors()) { final IEditorSite editorSite = editor.getEditorSite(); if (editor.getSite() == null) { - editorSite.getShell().getDisplay() - .syncExec(new Runnable() { - @Override - public void run() { - editorSite.getPage().closeEditor( - editor, true); - } - }); - } - } - PlatformUI.getWorkbench().getDisplay() - .syncExec(new Runnable() { + editorSite.getShell().getDisplay().syncExec(new Runnable() { @Override public void run() { - uiSession.close(); + editorSite.getPage().closeEditor(editor, true); } }); + } + } + PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + @Override + public void run() { + uiSession.close(); + } + }); } } PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { @@ -178,86 +167,89 @@ public void run() { } } - private Session openNewSiriusSession(final IExecutionContext context, - URI sessionResourceURI) throws CoreException { - + private Session openNewSiriusSession(final IExecutionContext context, URI sessionResourceURI) throws CoreException { + SubMonitor subMonitor = SubMonitor.convert(this.progressMonitor, 10); - + boolean useMelange = context.getRunConfiguration().getMelangeQuery() != null && !context.getRunConfiguration().getMelangeQuery().isEmpty(); - if( useMelange){ + if (useMelange) { subMonitor.setTaskName("Loading model for animation with melange"); } else { subMonitor.setTaskName("Loading model for animation"); } // calculating model URI as MelangeURI - URI modelURI = useMelange ? context.getRunConfiguration() - .getExecutedModelAsMelangeURI() : context.getRunConfiguration() - .getExecutedModelURI(); - + URI modelURI = useMelange ? context.getRunConfiguration().getExecutedModelAsMelangeURI() + : context.getRunConfiguration().getExecutedModelURI(); subMonitor.subTask("Configuring ResourceSet"); subMonitor.newChild(1); // create and configure resource set HashMap nsURIMapping = getnsURIMapping(context); - //final ResourceSet rs = createAndConfigureResourceSet(modelURI, nsURIMapping); + // final ResourceSet rs = createAndConfigureResourceSet(modelURI, + // nsURIMapping); final ResourceSet rs = createAndConfigureResourceSet(modelURI, nsURIMapping); subMonitor.subTask("Loading model"); subMonitor.newChild(3); // load model resource and resolve all proxies Resource r = rs.getResource(modelURI, true); - EcoreUtil.resolveAll(rs); -// EObject root = r.getContents().get(0); + EcoreUtil.resolveAll(rs); + // EObject root = r.getContents().get(0); // force adaptee model resource in the main ResourceSet - if(r instanceof MelangeResourceImpl){ - MelangeResourceImpl mr = (MelangeResourceImpl)r; + if (r instanceof MelangeResourceImpl) { + MelangeResourceImpl mr = (MelangeResourceImpl) r; rs.getResources().add(mr.getWrappedResource()); - - if(!r.getContents().isEmpty() && r.getContents().get(0) instanceof EObjectAdapter){ + + if (!r.getContents().isEmpty() && r.getContents().get(0) instanceof EObjectAdapter) { Resource realResource = ((EObjectAdapter) r.getContents().get(0)).getAdaptee().eResource(); rs.getResources().add(realResource); } } - // calculating aird URI - /*URI airdURI = useMelange ? URI.createURI(sessionResourceURI.toString() - .replace("platform:/", "melange:/")) : sessionResourceURI;*/ - URI airdURI = sessionResourceURI; + /* + * URI airdURI = useMelange ? + * URI.createURI(sessionResourceURI.toString() .replace("platform:/", + * "melange:/")) : sessionResourceURI; + */ + URI airdURI = sessionResourceURI; // URI airdURI = sessionResourceURI; subMonitor.subTask("Creating Sirius session"); subMonitor.newChild(1); // create and load sirius session - final Session session = DebugSessionFactory.INSTANCE.createSession(rs, - airdURI); - - //final IProgressMonitor monitor = new NullProgressMonitor(); - final TransactionalEditingDomain editingDomain = session - .getTransactionalEditingDomain(); - //Specific to MelangeResource - if(r.getContents().size() > 0) { - Resource res = r.getContents().get(0).eResource(); // get the used resource - res.eAdapters().add(new SessionTransientAttachment(session)); // link the resource with Sirius session - RecordingCommand cmd = new RecordingCommand(editingDomain){ - @Override - protected void doExecute() { - DAnalysisSessionImpl sessionImpl = (DAnalysisSessionImpl) session; - EList srList = sessionImpl.getAnalyses().get(0).getSemanticResources(); - srList.clear(); - srList.add(new ResourceDescriptor(modelURI)); - } - }; - try{ - CommandExecution.execute(editingDomain, cmd); - } catch (Exception e){ - //TODO: error msg - } - - } - - + final Session session = DebugSessionFactory.INSTANCE.createSession(rs, airdURI); + + // final IProgressMonitor monitor = new NullProgressMonitor(); + final TransactionalEditingDomain editingDomain = session.getTransactionalEditingDomain(); + // Specific to MelangeResource + if (r.getContents().size() > 0) { + Resource res = r.getContents().get(0).eResource(); // get the used + // resource + res.eAdapters().add(new SessionTransientAttachment(session)); // link + // the + // resource + // with + // Sirius + // session + RecordingCommand cmd = new RecordingCommand(editingDomain) { + @Override + protected void doExecute() { + DAnalysisSessionImpl sessionImpl = (DAnalysisSessionImpl) session; + EList srList = sessionImpl.getAnalyses().get(0).getSemanticResources(); + srList.clear(); + srList.add(new ResourceDescriptor(modelURI)); + } + }; + try { + CommandExecution.execute(editingDomain, cmd); + } catch (Exception e) { + // TODO: error msg + } + + } + subMonitor.subTask("Opening Sirius session"); session.open(subMonitor.newChild(2)); // EcoreUtil.resolveAll(rs); @@ -265,38 +257,32 @@ protected void doExecute() { subMonitor.subTask("Opening Sirius editors"); SubMonitor openEditorSubMonitor = subMonitor.newChild(2); for (DView view : session.getSelectedViews()) { - for (DRepresentation representation : view - .getOwnedRepresentations()) { - - + for (DRepresentationDescriptor representation : view.getOwnedRepresentationDescriptors()) { final DSemanticDiagram diagram = (DSemanticDiagram) representation; openEditorSubMonitor.subTask(diagram.getName()); final List elements = new ArrayList(); elements.add(diagram); - final IEditorPart editorPart = DialectUIManager.INSTANCE - .openEditor(session, representation, openEditorSubMonitor.newChild(1)); + final IEditorPart editorPart = DialectUIManager.INSTANCE.openEditor(session, + representation.getRepresentation(), openEditorSubMonitor.newChild(1)); if (editorPart instanceof DDiagramEditor) { - ((DDiagramEditor) editorPart).getPaletteManager() - .addToolFilter(new ToolFilter() { - @Override - public boolean filter(DDiagram diagram, - AbstractToolDescription tool) { - return true; - } - }); + ((DDiagramEditor) editorPart).getPaletteManager().addToolFilter(new ToolFilter() { + @Override + public boolean filter(DDiagram diagram, AbstractToolDescription tool) { + return true; + } + }); } - try{ + try { RefreshDiagramOnOpeningCommand refresh = new RefreshDiagramOnOpeningCommand(editingDomain, diagram); CommandExecution.execute(editingDomain, refresh); - } catch (Exception e){ - Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + } catch (Exception e) { + Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Problem refreshing diagrams : " + diagram, e)); } - + if (editorPart instanceof DiagramEditorWithFlyOutPalette) { - PaletteUtils - .colapsePalette((DiagramEditorWithFlyOutPalette) editorPart); + PaletteUtils.colapsePalette((DiagramEditorWithFlyOutPalette) editorPart); } RecordingCommand command = new RecordingCommand(editingDomain, "Activating animator and debug layers") { @@ -332,7 +318,8 @@ protected void doExecute() { } } if (!hasADebugLayer) { - // no debug layer defined in the odesign for debugmodelID + // no debug layer defined in the odesign for + // debugmodelID Activator.getDefault().getLog() .log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "No debug service defined in the odesign for the debug model id : " @@ -347,23 +334,28 @@ protected void doExecute() { } private ResourceSet createAndConfigureResourceSet(URI modelURI, HashMap nsURIMapping) { - final ResourceSet rs = ResourceSetFactory.createFactory() - .createResourceSet(modelURI); + final ResourceSet rs = ResourceSetFactory.createFactory().createResourceSet(modelURI); final String fileExtension = modelURI.fileExtension(); // indicates which melange query should be added to the xml uri handler // for a given extension - final XMLURIHandler handler = new XMLURIHandler(modelURI.query(), fileExtension); // use to resolve cross ref - // URI during XMI parsing - //final XtextPlatformResourceURIHandler handler = new XtextPlatformResourceURIHandler(); - handler.setResourceSet(rs); + final XMLURIHandler handler = new XMLURIHandler(modelURI.query(), fileExtension); // use + // to + // resolve + // cross + // ref + // URI during XMI parsing + // final XtextPlatformResourceURIHandler handler = new + // XtextPlatformResourceURIHandler(); + handler.setResourceSet(rs); rs.getLoadOptions().put(XMLResource.OPTION_URI_HANDLER, handler); - + final MelangeURIConverter converter = new MelangeURIConverter(nsURIMapping); - //final ExtensibleURIConverterImpl converter = new ExtensibleURIConverterImpl(); + // final ExtensibleURIConverterImpl converter = new + // ExtensibleURIConverterImpl(); rs.setURIConverter(converter); // fix sirius to prevent non intentional model savings converter.getURIHandlers().add(0, new DebugURIHandler(converter.getURIHandlers())); - + return rs; } @@ -371,24 +363,20 @@ private ResourceSet createAndConfigureResourceSet(URI modelURI, HashMap getnsURIMapping(IExecutionContext context) { HashMap nsURIMapping = new HashMap(); - + final String langQuery = "lang="; - String melangeQuery = context.getRunConfiguration() - .getExecutedModelAsMelangeURI().query(); - if (melangeQuery != null && !melangeQuery.isEmpty() - && melangeQuery.contains(langQuery)) { - - String targetLanguage = melangeQuery.substring(melangeQuery - .indexOf(langQuery) + langQuery.length()); - if(targetLanguage.contains("&")){ + String melangeQuery = context.getRunConfiguration().getExecutedModelAsMelangeURI().query(); + if (melangeQuery != null && !melangeQuery.isEmpty() && melangeQuery.contains(langQuery)) { + + String targetLanguage = melangeQuery.substring(melangeQuery.indexOf(langQuery) + langQuery.length()); + if (targetLanguage.contains("&")) { targetLanguage = targetLanguage.substring(0, targetLanguage.indexOf("&")); } String targetLanguageNsURI = MelangeRegistry.INSTANCE.getLanguageByIdentifier(targetLanguage).getUri(); - + // simply open the original model file in a separate ResourceSet - // and ask its root element class nsURI - Object o = EMFResource.getFirstContent(context - .getRunConfiguration().getExecutedModelURI()); + // and ask its root element class nsURI + Object o = EMFResource.getFirstContent(context.getRunConfiguration().getExecutedModelURI()); if (o instanceof EObject) { EPackage rootPackage = ((EObject) o).eClass().getEPackage(); while (rootPackage.getESuperPackage() != null) { @@ -397,7 +385,7 @@ protected HashMap getnsURIMapping(IExecutionContext context) { nsURIMapping.put(rootPackage.getNsURI(), targetLanguageNsURI); } } - + return nsURIMapping; } @@ -405,35 +393,32 @@ class MelangeURIConverter extends ExtensibleURIConverterImpl { private HashMap _nsURIMapping; - public MelangeURIConverter( HashMap nsURIMapping) { + public MelangeURIConverter(HashMap nsURIMapping) { _nsURIMapping = nsURIMapping; } @SuppressWarnings("resource") @Override - public InputStream createInputStream(URI uri, Map options) - throws IOException { + public InputStream createInputStream(URI uri, Map options) throws IOException { InputStream result = null; - - // do not modify content of files loaded using melange:/ scheme + + // do not modify content of files loaded using melange:/ scheme // melange is supposed to do the job - //if (uri.scheme()!= null && uri.scheme().equals("melange")) { + // if (uri.scheme()!= null && uri.scheme().equals("melange")) { // return super.createInputStream(uri); - //} - if(uri.fileExtension() == null || !uri.fileExtension().equals("aird")){ + // } + if (uri.fileExtension() == null || !uri.fileExtension().equals("aird")) { // only the root aird must be adapted return super.createInputStream(uri, options); } - + InputStream originalInputStream = null; try { - originalInputStream = super.createInputStream(uri, options); + originalInputStream = super.createInputStream(uri, options); String originalContent = convertStreamToString(originalInputStream); String modifiedContent = originalContent; - for (Entry entry : _nsURIMapping - .entrySet()) { - modifiedContent = modifiedContent.replace( - entry.getKey(), entry.getValue()); + for (Entry entry : _nsURIMapping.entrySet()) { + modifiedContent = modifiedContent.replace(entry.getKey(), entry.getValue()); } result = new StringInputStream(modifiedContent); return result; @@ -442,7 +427,7 @@ public InputStream createInputStream(URI uri, Map options) originalInputStream.close(); } } - + } private String convertStreamToString(java.io.InputStream is) { @@ -454,9 +439,11 @@ private String convertStreamToString(java.io.InputStream is) { return result; } } - + /** - * change scheme to melange:// for files with the given fileextension when a melange query is active + * change scheme to melange:// for files with the given fileextension when a + * melange query is active + * * @author dvojtise * */ @@ -477,29 +464,25 @@ public XMLURIHandler(String queryParameters, String fileExtension) { @Override public URI resolve(URI uri) { URI resolvedURI = super.resolve(uri); - if ( !_queryParameters.isEmpty() - && resolvedURI.scheme() != null - && !resolvedURI.scheme().equals("melange") - && resolvedURI.fileExtension() != null - && resolvedURI.fileExtension().equals(_fileExtension)) { - + if (!_queryParameters.isEmpty() && resolvedURI.scheme() != null && !resolvedURI.scheme().equals("melange") + && resolvedURI.fileExtension() != null && resolvedURI.fileExtension().equals(_fileExtension)) { + String fileExtensionWithPoint = "." + _fileExtension; - int lastIndexOfFileExtension = resolvedURI.toString() - .lastIndexOf(fileExtensionWithPoint); - String part1 = resolvedURI.toString().substring(0, - lastIndexOfFileExtension); + int lastIndexOfFileExtension = resolvedURI.toString().lastIndexOf(fileExtensionWithPoint); + String part1 = resolvedURI.toString().substring(0, lastIndexOfFileExtension); part1 = part1.replaceFirst("platform:/", "melange:/"); String part2 = fileExtensionWithPoint + _queryParameters; - String part3 = resolvedURI.toString().substring( - lastIndexOfFileExtension - + fileExtensionWithPoint.length()); + String part3 = resolvedURI.toString() + .substring(lastIndexOfFileExtension + fileExtensionWithPoint.length()); String newURIAsString = part1 + part2 + part3; return URI.createURI(newURIAsString); } return resolvedURI; } } + IProgressMonitor progressMonitor; + @Override public void setProgressMonitor(IProgressMonitor progressMonitor) { this.progressMonitor = progressMonitor; From 07639f3854c8997ec72188f06dad300cddd5ac58 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Wed, 7 Dec 2016 11:53:42 +0100 Subject: [PATCH 070/267] upgrade to Neon (and xtend 2.10.0 ; Sirius 4.1.x) --- .../META-INF/MANIFEST.MF | 2 +- .../modelloader/DefaultModelLoader.java | 14 ++++++ pom.xml | 22 ++++----- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 8 ++-- .../ide/sirius/ui/DebugSiriusIdeUiPlugin.java | 45 +++++++++---------- .../ide/sirius/ui/SiriusEditorUtils.java | 9 ++-- simulationmodelanimation/pom.xml | 2 +- .../dsldebug-neon.target | 26 +++++++++++ .../dsldebug-neon.tpd | 20 +++++++++ 10 files changed, 105 insertions(+), 49 deletions(-) create mode 100644 simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.target create mode 100644 simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.tpd diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF index 925ccca28..698bf08bc 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.gemoc.executionframework.extensions.sirius;singleton:=t Bundle-Version: 0.1.0.qualifier Bundle-Activator: org.gemoc.executionframework.extensions.sirius.Activator Require-Bundle: org.gemoc.xdsmlframework.api, - org.eclipse.sirius.diagram.ui;bundle-version="3.0.0", + org.eclipse.sirius.diagram.ui;bundle-version="4.0.0", org.eclipse.sirius.common;bundle-version="1.0.1", fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0";visibility:=reexport, org.eclipse.sirius.ecore.extender;bundle-version="2.0.3", diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index 8456164f1..795597374 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -256,15 +256,28 @@ protected void doExecute() { // activating layers subMonitor.subTask("Opening Sirius editors"); SubMonitor openEditorSubMonitor = subMonitor.newChild(2); + + // for each representation in the selected views for (DView view : session.getSelectedViews()) { +<<<<<<< Upstream, based on origin/master for (DRepresentationDescriptor representation : view.getOwnedRepresentationDescriptors()) { +======= + for (DRepresentationDescriptor repDescriptor : view.getOwnedRepresentationDescriptors()) { + DRepresentation representation = repDescriptor.getRepresentation(); + +>>>>>>> c521367 upgrade to Neon (and xtend 2.10.0 ; Sirius 4.1.x) final DSemanticDiagram diagram = (DSemanticDiagram) representation; openEditorSubMonitor.subTask(diagram.getName()); final List elements = new ArrayList(); elements.add(diagram); +<<<<<<< Upstream, based on origin/master final IEditorPart editorPart = DialectUIManager.INSTANCE.openEditor(session, representation.getRepresentation(), openEditorSubMonitor.newChild(1)); +======= + final IEditorPart editorPart = DialectUIManager.INSTANCE.openEditor(session, representation, + openEditorSubMonitor.newChild(1)); +>>>>>>> c521367 upgrade to Neon (and xtend 2.10.0 ; Sirius 4.1.x) if (editorPart instanceof DDiagramEditor) { ((DDiagramEditor) editorPart).getPaletteManager().addToolFilter(new ToolFilter() { @Override @@ -330,6 +343,7 @@ protected void doExecute() { CommandExecution.execute(editingDomain, command); } } + return session; } diff --git a/pom.xml b/pom.xml index f8cf4af24..9c66145dc 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 0.25.0 - 2.9.1 + 2.10.0 UTF8 scm:git:https://github.com/gemoc/modelanimation.git @@ -18,15 +18,11 @@ - - - - - + - Mars release + Neon release p2 - http://download.eclipse.org/releases/mars/201602261000 + http://download.eclipse.org/releases/neon diverse-commons @@ -48,11 +44,11 @@ p2 http://download.eclipse.org/elk/updates/releases/0.1.0/ - - - - - + + Sirius + p2 + http://download.eclipse.org/sirius/updates/releases/4.1.2/neon/ + diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.core.prefs b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.core.prefs index 5fc34d704..c25b2af9e 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.core.prefs +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,14 +1,14 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF index 36fbdb6f6..8bed68e89 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF @@ -13,11 +13,11 @@ Require-Bundle: org.eclipse.debug.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.ui.ide;bundle-version="3.7.0", fr.obeo.dsl.debug.ide.ui;bundle-version="1.0.0", - org.eclipse.sirius;bundle-version="2.0.0", - org.eclipse.sirius.ui;bundle-version="2.0.0", - org.eclipse.sirius.diagram;bundle-version="2.0.0", + org.eclipse.sirius;bundle-version="4.1.1", + org.eclipse.sirius.ui;bundle-version="4.0.0", + org.eclipse.sirius.diagram;bundle-version="4.0.0", org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0", - org.eclipse.sirius.diagram.ui, + org.eclipse.sirius.diagram.ui;bundle-version="4.0.0", com.google.guava;bundle-version="15.0.0", org.eclipse.equinox.registry, fr.inria.diverse.trace.commons.model diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java index 4526c193c..d74c15648 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java @@ -10,8 +10,6 @@ *******************************************************************************/ package fr.obeo.dsl.debug.ide.sirius.ui; -import fr.obeo.dsl.debug.ide.sirius.ui.services.AbstractDSLDebuggerServices; - import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; import org.osgi.framework.BundleContext; @@ -42,7 +40,7 @@ public final class DebugSiriusIdeUiPlugin extends EMFPlugin { * Create the instance. */ public DebugSiriusIdeUiPlugin() { - super(new ResourceLocator[] {}); + super(new ResourceLocator[] {}); } /** @@ -52,7 +50,7 @@ public DebugSiriusIdeUiPlugin() { */ @Override public ResourceLocator getPluginResourceLocator() { - return plugin; + return plugin; } /** @@ -61,35 +59,34 @@ public ResourceLocator getPluginResourceLocator() { * @return the singleton instance. */ public static Implementation getPlugin() { - return plugin; + return plugin; } /** * The actual implementation of the Eclipse Plug-in. */ public static class Implementation extends EclipsePlugin { - /** - * Creates an instance. - */ - public Implementation() { - super(); - // Remember the static instance. - // - plugin = this; - } + /** + * Creates an instance. + */ + public Implementation() { + super(); + // Remember the static instance. + // + plugin = this; - @Override - public void start(BundleContext context) throws Exception { - AbstractDSLDebuggerServices.LISTENER.install(); - super.start(context); - } + } - @Override - public void stop(BundleContext context) throws Exception { - AbstractDSLDebuggerServices.LISTENER.uninstall(); - super.stop(context); - } + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + } + + @Override + public void stop(BundleContext context) throws Exception { + super.stop(context); + } } diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java index 18cc85b63..ce6d9f80c 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java @@ -32,6 +32,7 @@ import org.eclipse.sirius.ui.business.api.dialect.DialectUIManager; import org.eclipse.sirius.ui.business.api.dialect.marker.TraceabilityMarkerNavigationProvider; import org.eclipse.sirius.viewpoint.DRepresentation; +import org.eclipse.sirius.viewpoint.DRepresentationDescriptor; import org.eclipse.sirius.viewpoint.DRepresentationElement; import org.eclipse.sirius.viewpoint.DView; import org.eclipse.sirius.viewpoint.ViewpointPackage; @@ -86,8 +87,10 @@ public static List getRepresentations(Session session, URI inst final EObject instruction = session.getTransactionalEditingDomain().getResourceSet().getEObject( instructionURI, false); + for (DView view : session.getSelectedViews()) { - for (DRepresentation representation : view.getOwnedRepresentations()) { + for (DRepresentationDescriptor rdescriptor : view.getOwnedRepresentationDescriptors()) { + DRepresentation representation = rdescriptor.getRepresentation(); if (representSemanticElement(representation, instruction)) { res.add(representation); } @@ -137,8 +140,8 @@ public static void showInstruction(DialectEditor editorPart, EObject instruction final URI resourceURI = instruction.eResource().getURI(); if (resourceURI.isPlatformResource()) { final String resourcePath = resourceURI.toPlatformString(true); - final IResource resource = ResourcesPlugin.getWorkspace().getRoot().getFile( - new Path(resourcePath)); + final IResource resource = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path( + resourcePath)); try { final IMarker marker = resource.createMarker(EValidator.MARKER); marker.setAttribute(EValidator.URI_ATTRIBUTE, EcoreUtil.getURI(instruction).toString()); diff --git a/simulationmodelanimation/pom.xml b/simulationmodelanimation/pom.xml index 07d0a4941..d0bd793d5 100644 --- a/simulationmodelanimation/pom.xml +++ b/simulationmodelanimation/pom.xml @@ -94,7 +94,7 @@ Contributors: ${project.artifactId} ${project.version} - ../../releng/fr.obeo.dsl.debug.target/dsldebug-luna + ../../releng/fr.obeo.dsl.debug.target/dsldebug-neon diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.target b/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.target new file mode 100644 index 000000000..e71de4762 --- /dev/null +++ b/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.target @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.tpd b/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.tpd new file mode 100644 index 000000000..e6d548750 --- /dev/null +++ b/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.tpd @@ -0,0 +1,20 @@ +target "dsldebug_luna" with source, requirements + +location Eclipse-Neon "http://download.eclipse.org/releases/neon/201610111000" { + org.eclipse.platform.sdk lazy + org.eclipse.equinox.executable.feature.group lazy + org.eclipse.emf.edit.feature.group lazy + org.eclipse.emf.ecore.editor.feature.group lazy + org.eclipse.emf.transaction.feature.group lazy + org.eclipse.emf.ecore.feature.group lazy + org.eclipse.emf.edit.ui.feature.group lazy + org.eclipse.gmf.runtime.sdk.feature.group lazy + com.google.guava [15.0.0,16.0.0) + org.junit lazy +} + +location Sirius "http://download.eclipse.org/sirius/updates/nightly/4.1.x/neon" { + org.eclipse.sirius.runtime.feature.group lazy + org.eclipse.sirius.runtime.acceleo.feature.group lazy + org.eclipse.sirius.runtime.ide.ui.feature.group lazy +} \ No newline at end of file From a1dc52aaf2951e103901912173565243ef589a01 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Wed, 7 Dec 2016 14:49:54 +0100 Subject: [PATCH 071/267] fix failed conflict merge --- .../sirius/modelloader/DefaultModelLoader.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index 795597374..aa35be7ad 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -259,25 +259,16 @@ protected void doExecute() { // for each representation in the selected views for (DView view : session.getSelectedViews()) { -<<<<<<< Upstream, based on origin/master - for (DRepresentationDescriptor representation : view.getOwnedRepresentationDescriptors()) { -======= for (DRepresentationDescriptor repDescriptor : view.getOwnedRepresentationDescriptors()) { DRepresentation representation = repDescriptor.getRepresentation(); ->>>>>>> c521367 upgrade to Neon (and xtend 2.10.0 ; Sirius 4.1.x) final DSemanticDiagram diagram = (DSemanticDiagram) representation; openEditorSubMonitor.subTask(diagram.getName()); final List elements = new ArrayList(); elements.add(diagram); -<<<<<<< Upstream, based on origin/master final IEditorPart editorPart = DialectUIManager.INSTANCE.openEditor(session, - representation.getRepresentation(), openEditorSubMonitor.newChild(1)); -======= - final IEditorPart editorPart = DialectUIManager.INSTANCE.openEditor(session, representation, - openEditorSubMonitor.newChild(1)); ->>>>>>> c521367 upgrade to Neon (and xtend 2.10.0 ; Sirius 4.1.x) + representation, openEditorSubMonitor.newChild(1)); if (editorPart instanceof DDiagramEditor) { ((DDiagramEditor) editorPart).getPaletteManager().addToolFilter(new ToolFilter() { @Override From 5cdcc1eb7d1ad75309f827c81123a0f6855b7870 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Thu, 8 Dec 2016 11:11:08 +0100 Subject: [PATCH 072/267] Added the event manager GUI and made the engine check for events after a step has been executed as well --- .../engine/core/AbstractExecutionEngine.java | 2 +- .../AbstractSequentialExecutionEngine.java | 30 ++- .../.classpath | 7 + .../.project | 28 +++ .../.settings/org.eclipse.jdt.core.prefs | 7 + .../META-INF/MANIFEST.MF | 16 ++ .../build.properties | 7 + .../contexts.xml | 13 ++ .../icons/sample.gif | Bin 0 -> 983 bytes .../plugin.xml | 38 ++++ .../eventmanager/Activator.java | 61 ++++++ .../views/EventManagerRenderer.java | 196 ++++++++++++++++++ .../views/EventManagerViewPart.java | 41 ++++ .../eventmanager/views/EventPane.java | 18 ++ .../eventmanager/views/EventTableView.java | 167 +++++++++++++++ 15 files changed, 620 insertions(+), 11 deletions(-) create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.classpath create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.project create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.settings/org.eclipse.jdt.core.prefs create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/build.properties create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/contexts.xml create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/sample.gif create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/plugin.xml create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java index 520fba990..3a643ddcf 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java @@ -480,7 +480,7 @@ private boolean isInStep() { /** * To be called just after each execution step by an implementing engine. */ - protected final void afterExecutionStep() { + protected void afterExecutionStep() { RecordingCommand emptyrc = null; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index 8b14d22fc..e9667fc95 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -64,7 +64,26 @@ protected final void performStart() { executeEntryPoint(); Activator.getDefault().info("Execution finished"); } + + private void manageEvents() { + MSEOccurrence mse = getCurrentMSEOccurrence(); + if (mse != null) { + EObject container = mse.eContainer(); + if (container instanceof SequentialStep) { + IEventManager eventManager = EventManagerRegistry.getInstance().findEventManager(); + if (eventManager != null) { + eventManager.manageEvents(); + } + } + } + } + @Override + protected final void afterExecutionStep() { + manageEvents(); + super.afterExecutionStep(); + } + /** * To be called just before each execution step by an implementing engine. */ @@ -93,16 +112,7 @@ protected final void beforeExecutionStep(Object caller, String className, String // We create a step Step step = createStep(caller_cast, className, operationName); - MSEOccurrence mse = getCurrentMSEOccurrence(); - if (mse != null) { - EObject container = mse.eContainer(); - if (container instanceof SequentialStep) { - IEventManager eventManager = EventManagerRegistry.getInstance().findEventManager(null); - if (eventManager != null) { - eventManager.manageEvents(); - } - } - } + manageEvents(); beforeExecutionStep(step, rc); } diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.classpath b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.classpath new file mode 100644 index 000000000..eca7bdba8 --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.project b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.project new file mode 100644 index 000000000..9402dc2ff --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.project @@ -0,0 +1,28 @@ + + + org.gemoc.executionframework.eventmanager + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF new file mode 100644 index 000000000..d7df9ffc3 --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF @@ -0,0 +1,16 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Eventmanager +Bundle-SymbolicName: org.gemoc.executionframework.eventmanager;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.gemoc.executionframework.eventmanager.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.gemoc.executionframework.ui, + org.gemoc.xdsmlframework.api, + org.eclipse.emf.ecore, + fr.inria.diverse.trace.commons.model, + org.eclipse.xtext, + fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="3.2.1" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-ActivationPolicy: lazy diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/build.properties b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/build.properties new file mode 100644 index 000000000..caaec514b --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/build.properties @@ -0,0 +1,7 @@ +source.. = src/ +output.. = bin/ +bin.includes = plugin.xml,\ + META-INF/,\ + .,\ + icons/,\ + contexts.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/contexts.xml b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/contexts.xml new file mode 100644 index 000000000..b3b18ae3d --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/contexts.xml @@ -0,0 +1,13 @@ + + + + This is the context help for the sample view with a table viewer. It was generated by a PDE template. + + + + + + + + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/sample.gif b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/sample.gif new file mode 100644 index 0000000000000000000000000000000000000000..34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610 GIT binary patch literal 983 zcmZ?wbhEHb6krfw_|CxKYUg-n!?izO{@9*?jxd%4aX0yzy`dymabz zw#(eg=y~&N&n)dZv2xzduG}5lraiApo3(c4*{Ylg5#|$JO_EEZ<^|a2`Z*=9ns7DV zy=TR&gYw*7f%auV?ip3tvjRPmcdoho{K?x$_vR?C#t5&<;~V}S*>OMCr>h}%%bLZ9 zmo3`hYEwTICo-TTCZwgTsC&VjZRgJ1eE#fBa^%9R zmmfWS@;bnyJ27HWY}kxYzv(Hl>yu;FCPlAEh+34Muq-8Rb6C)<8qA3{r2e5 z`$vyngh#H=FWlqqvnapfc5%(!sQ4v?r7J61-&eJNEN^;KTK}T7{#i-gJh%G*9vcYdwv_*~xdw!Gz4Va?T!sXyyF@8?w<>X`X=#j%uHV4GRvj@+tE@ zQ%F!a)GKcn^~8abN>4la1UNXVL;{ZWi)lEwyeatDu%Lr6;aASiLrXXW zQm# + + + + + + + + + + + + + + + + + + + + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java new file mode 100644 index 000000000..7edad625e --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java @@ -0,0 +1,61 @@ +package org.gemoc.executionframework.eventmanager; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.gemoc.executionframework.eventmanager"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + /** + * Returns an image descriptor for the image file at the given + * plug-in relative path + * + * @param path the path + * @return the image descriptor + */ + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } +} diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java new file mode 100644 index 000000000..97b655d6d --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java @@ -0,0 +1,196 @@ +package org.gemoc.executionframework.eventmanager.views; + +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.resource.Resource; +import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; + +import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; +import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; +import fr.inria.diverse.trace.commons.model.trace.Step; +import javafx.application.Platform; +import javafx.collections.FXCollections; +import javafx.collections.ListChangeListener; +import javafx.collections.ObservableList; +import javafx.scene.control.Button; +import javafx.scene.control.ListView; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.cell.ComboBoxListCell; +import javafx.scene.layout.Border; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Pane; +import javafx.util.StringConverter; + +public class EventManagerRenderer extends Pane implements IEngineAddon { + + private IEventManager eventManager; + + private Resource executedModel; + + private final ObservableList eventList = FXCollections.observableArrayList(); + + private final Map eventTypeToEventTableView = new HashMap<>(); + + private final ScrollPane scrollPane = new ScrollPane(); + + private final ListView eventListView = new ListView<>(eventList); + + private final BorderPane borderPane = new BorderPane(); + + private final Button button1 = new Button("Push"); + + private final Button button2 = new Button("Send"); + + private final HBox header = new HBox(); + + public EventManagerRenderer() { + getChildren().add(borderPane); + + borderPane.minWidthProperty().bind(widthProperty()); + borderPane.maxWidthProperty().bind(widthProperty()); + borderPane.minHeightProperty().bind(heightProperty()); + borderPane.maxHeightProperty().bind(heightProperty()); + + header.getChildren().addAll(button1, button2); + + eventListView.setCellFactory((l) -> new ComboBoxListCell(new StringConverter() { + @Override + public String toString(EClass object) { + return object.getName(); + } + @Override + public EClass fromString(String string) { + return null; + } + })); + + eventListView.getSelectionModel().selectedItemProperty().addListener((c, o, n) -> { + scrollPane.setContent(eventTypeToEventTableView.get(n)); + }); + + borderPane.setTop(header); + borderPane.setLeft(eventListView); + borderPane.setCenter(scrollPane); + + scrollPane.setFitToWidth(true); + scrollPane.setBorder(Border.EMPTY); + scrollPane.minHeightProperty().bind(eventListView.heightProperty()); + scrollPane.maxHeightProperty().bind(eventListView.heightProperty()); + final ListChangeListener eventTypesChangeListener = c -> { + while(c.next()) { + c.getRemoved().stream().forEach(e -> eventTypeToEventTableView.remove(e)); + c.getAddedSubList().stream().forEach(e -> { + final EventTableView tableView = new EventTableView(e, executedModel, eventManager); + eventTypeToEventTableView.put(e, tableView); + tableView.refreshEvents(); + tableView.minHeightProperty().bind(scrollPane.heightProperty().subtract(2)); + }); + } + }; + eventList.addListener(eventTypesChangeListener); + } + + public void setEventManager(IEventManager eventManager) { + Runnable runnable = () -> { + this.eventManager = eventManager; + eventList.clear(); + if (eventManager != null) { + eventList.addAll(this.eventManager.getEventClasses()); + } + }; + if (!Platform.isFxApplicationThread()) { + Platform.runLater(runnable); + } else { + runnable.run(); + } + } + + public void setExecutedModel(Resource executedModel) { + this.executedModel = executedModel; + } + + private void refreshEvents() { + eventTypeToEventTableView.entrySet().forEach(e -> { + final EventTableView tableView = e.getValue(); + tableView.refreshEvents(); + }); + final EClass selectedItem = eventListView.getSelectionModel().getSelectedItem(); + if (selectedItem != null) { + final EventTableView selectedTableView = eventTypeToEventTableView.get(selectedItem); + if (selectedTableView != null) { + scrollPane.setContent(selectedTableView); + } else { + scrollPane.setContent(null); + } + } + } + + @Override + public void engineAboutToStart(IExecutionEngine engine) { + } + + @Override + public void engineStarted(IExecutionEngine executionEngine) { + executedModel = executionEngine.getExecutionContext().getResourceModel(); + } + + @Override + public void engineInitialized(IExecutionEngine executionEngine) { + setEventManager(EventManagerRegistry.getInstance().findEventManager()); + } + + @Override + public void engineAboutToStop(IExecutionEngine engine) { + } + + @Override + public void engineStopped(IExecutionEngine engine) { + executedModel = null; + eventList.clear(); + eventTypeToEventTableView.clear(); + scrollPane.setContent(null); + } + + @Override + public void engineAboutToDispose(IExecutionEngine engine) { + } + + @Override + public void stepSelected(IExecutionEngine engine, Step selectedStep) { + } + + @Override + public void aboutToExecuteStep(IExecutionEngine engine, Step stepToExecute) { + refreshEvents(); + } + + @Override + public void stepExecuted(IExecutionEngine engine, Step stepExecuted) { + refreshEvents(); + } + + @Override + public void engineStatusChanged(IExecutionEngine engine, RunStatus newStatus) { + } + + @Override + public List validate(List otherAddons) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void aboutToSelectStep(IExecutionEngine engine, Collection steps) { + } + + @Override + public void proposedStepsChanged(IExecutionEngine engine, Collection steps) { + } +} diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java new file mode 100644 index 000000000..7a8e779a4 --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java @@ -0,0 +1,41 @@ +package org.gemoc.executionframework.eventmanager.views; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; +import org.gemoc.xdsmlframework.api.core.IExecutionEngine; + +import javafx.embed.swt.FXCanvas; +import javafx.scene.Scene; + +public class EventManagerViewPart extends EngineSelectionDependentViewPart { + + /** + * The ID of the view as specified by the extension. + */ + public static final String ID = "org.gemoc.executionframework.eventmanager.views.EventManager"; + + private FXCanvas fxCanvas; + + private EventManagerRenderer eventManagerRenderer; + + public void createPartControl(Composite parent) { + fxCanvas = new FXCanvas(parent, SWT.NONE); + eventManagerRenderer = new EventManagerRenderer(); + Scene scene = new Scene(eventManagerRenderer); + fxCanvas.setScene(scene); + + parent.getShell().addListener(SWT.Resize, (e) -> { + + }); + } + + public void setFocus() { + } + + @Override + public void engineSelectionChanged(IExecutionEngine engine) { + eventManagerRenderer.setExecutedModel(engine.getExecutionContext().getResourceModel()); + engine.getExecutionContext().getExecutionPlatform().addEngineAddon(eventManagerRenderer); + } +} diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java new file mode 100644 index 000000000..2dfbe947a --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java @@ -0,0 +1,18 @@ +package org.gemoc.executionframework.eventmanager.views; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.resource.Resource; + +import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; +import javafx.scene.layout.BorderPane; + +public class EventPane extends BorderPane { + + private final EventTableView tableView; + + public EventPane(EClass eventClass, final Resource executedModel, final IEventManager eventManager) { + tableView = new EventTableView(eventClass, executedModel, eventManager); + setCenter(tableView); + tableView.refreshEvents(); + } +} diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java new file mode 100644 index 000000000..af6a9aa2e --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java @@ -0,0 +1,167 @@ +package org.gemoc.executionframework.eventmanager.views; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EFactory; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; +import org.eclipse.xtext.naming.QualifiedName; + +import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; +import javafx.application.Platform; +import javafx.beans.property.ReadOnlyObjectWrapper; +import javafx.beans.value.ObservableValue; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableColumn.CellDataFeatures; +import javafx.scene.control.TableRow; +import javafx.scene.control.TableView; +import javafx.util.Callback; + +public class EventTableView extends TableView { + + private final EClass eventClass; + + private final EFactory factory; + + private final Resource executedModel; + + private final List eventParameterClasses = new ArrayList<>(); + + private final Map> referenceToMatchingModelElements = new HashMap<>(); + + private final ObservableList events = FXCollections.observableArrayList(); + + private final Function canDisplayEventFunction; + + public EventTableView(final EClass eventClass, final Resource executedModel, final IEventManager eventManager) { + this.eventClass = eventClass; + this.factory = eventClass.getEPackage().getEFactoryInstance(); + this.executedModel = executedModel; + eventParameterClasses + .addAll(eventClass.getEReferences().stream().map(r -> r.eClass()).collect(Collectors.toList())); + setItems(events); + + canDisplayEventFunction = (event) -> { + return eventManager.canSendEvent(event); + }; + + final List> columns = new ArrayList<>(); + eventClass.getEReferences().stream().forEach(r -> { + final TableColumn col = new TableColumn(r.getName()); + col.setCellValueFactory(new EObjectPropertyValueFactory(r)); + columns.add(col); + }); + + setRowFactory(tv -> { + TableRow row = new TableRow<>(); + row.setOnMouseClicked(event -> { + if (event.getClickCount() == 2 && (!row.isEmpty())) { + EObject rowData = row.getItem(); + eventManager.sendEvent(rowData); + } + }); + return row; + }); + + getColumns().setAll(columns); + + } + + public void refreshEvents() { + Platform.runLater(() -> { + referenceToMatchingModelElements.clear(); + gatherPotentialParameters(); + events.clear(); + events.addAll(computeAllPossibleEvents().stream().map(m -> { + final EObject event = factory.create(eventClass); + m.entrySet().forEach(entry -> { + event.eSet(entry.getKey(), entry.getValue()); + }); + return event; + }).filter(event -> canDisplayEventFunction.apply(event)).collect(Collectors.toList())); + }); + + } + + private void gatherPotentialParameters() { + final List eventParameters = eventClass.getEReferences(); + executedModel.getAllContents().forEachRemaining(modelElement -> { + final EClass elementClass = modelElement.eClass(); + final List matchingParameters = eventParameters.stream().filter(r -> { + return elementClass.getClassifierID() == r.getEType().getClassifierID() + || elementClass.getEAllSuperTypes().contains(r.getEType()); + }).collect(Collectors.toList()); + matchingParameters.forEach(r -> { + List elements = referenceToMatchingModelElements.get(r); + if (elements == null) { + elements = new ArrayList<>(); + referenceToMatchingModelElements.put(r, elements); + } + elements.add(modelElement); + }); + }); + } + + private List> computeAllPossibleEvents() { + final List> result = new ArrayList<>(); + final int nbEvents = referenceToMatchingModelElements.values().stream().map(l -> l.size()) + .reduce((i1, i2) -> i1 * i2).orElse(0); + final List>> entries = new ArrayList<>( + referenceToMatchingModelElements.entrySet()); + for (int i = 0; i < nbEvents; i++) { + int j = 1; + final Map parametersAssociation = new HashMap<>(); + for (Map.Entry> entry : entries) { + final List modelElements = entry.getValue(); + parametersAssociation.put(entry.getKey(), modelElements.get((i / j) % modelElements.size())); + j *= modelElements.size(); + } + result.add(parametersAssociation); + } + return result; + } + + static class EObjectPropertyValueFactory + implements Callback, ObservableValue> { + + private final EReference reference; + private final Function stringGetter; + private final DefaultDeclarativeQualifiedNameProvider nameprovider = new DefaultDeclarativeQualifiedNameProvider(); + + public EObjectPropertyValueFactory(EReference reference) { + this.reference = reference; + stringGetter = (o) -> { + if (o instanceof EObject) { + QualifiedName qname = nameprovider.getFullyQualifiedName((EObject) o); + if (qname != null) { + return qname.toString(); + } + } + final String string = o.toString(); + return string.substring(string.lastIndexOf(".") + 1); + }; + } + + @Override + public ObservableValue call(CellDataFeatures p) { + EObject object = p.getValue(); + Object refValue = object.eGet(reference); + if (refValue != null) { + String string = stringGetter.apply(refValue); + ObservableValue result = new ReadOnlyObjectWrapper(string); + return result; + } + return null; + } + } +} From e8264bf29cc48f69d012291323d78a186d24fa49 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Thu, 8 Dec 2016 11:45:29 +0100 Subject: [PATCH 073/267] Removed BatchModelChangeListenerAddon, now using only the non-addon version --- .../BatchModelChangeListener.xtend | 13 +- .../BatchModelChangeListenerAddon.xtend | 246 ------------------ .../gemoc/traceaddon/AbstractTraceAddon.xtend | 9 +- .../META-INF/MANIFEST.MF | 3 - 4 files changed, 13 insertions(+), 258 deletions(-) delete mode 100644 framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListenerAddon.xtend diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend index 8a8eee75a..2776c90b7 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend @@ -32,6 +32,7 @@ public class BatchModelChangeListener { private EContentAdapter adapter; private Map> changes = new HashMap private Set registeredObservers = new HashSet + private Set observedResources public new(Set resources) { /* @@ -46,12 +47,14 @@ public class BatchModelChangeListener { } } }; - resources.forEach [ r | + + observedResources = resources + + observedResources.forEach [ r | if (r != null) { r.eAdapters().add(adapter); } ] - } /** @@ -231,4 +234,10 @@ public class BatchModelChangeListener { addToNewObjects(removedObjects, newObjects, remove) } } + + public def void cleanUp() { + for (r : observedResources.filter[r|r != null]) { + r.eAdapters().remove(adapter); + } + } } diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListenerAddon.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListenerAddon.xtend deleted file mode 100644 index e7cde8654..000000000 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListenerAddon.xtend +++ /dev/null @@ -1,246 +0,0 @@ -package org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; - -import java.util.ArrayList -import java.util.Collection -import java.util.HashMap -import java.util.HashSet -import java.util.List -import java.util.Map -import java.util.Set -import org.eclipse.emf.common.notify.Notification -import org.eclipse.emf.ecore.EObject -import org.eclipse.emf.ecore.EReference -import org.eclipse.emf.ecore.EStructuralFeature -import org.eclipse.emf.ecore.resource.Resource -import org.eclipse.emf.ecore.util.EContentAdapter -import org.gemoc.commons.eclipse.emf.EMFResource -import org.gemoc.xdsmlframework.api.engine_addon.DefaultEngineAddon -import org.gemoc.xdsmlframework.api.core.IExecutionEngine - -/** - * This model listener gathers EMF notifications, and computes when asked a - * set of ModelChange objects to reflect what happened in a more abstract - * and concise way. - * - * For instance, if a field changed multiple times in between two queries to - * the model listener, a single ModelChange object will be computed to reflect that change, - * instead of a list of many EMF Notifications. - * - * A ModelChange can be a new/removed object in the model, or a change in a field. - * See associated class. - * - */ -public class BatchModelChangeListenerAddon extends DefaultEngineAddon { - - private EContentAdapter adapter; - private IExecutionEngine engine; - private Map> changes = new HashMap - private Set registeredObservers = new HashSet - - public new(IExecutionEngine engine) { - this.engine = engine; - engine.executionContext.executionPlatform.addEngineAddon(this) - /* - * We create an adapter that stores and sort all the notifications for each object and field. - * This avoids us to sort everything afterwards. - */ - this.adapter = new EContentAdapter() { - override void notifyChanged(Notification notification) { - super.notifyChanged(notification); - for (obs : registeredObservers) { - changes.get(obs).add(notification) - } - } - }; - val Set allResources = EMFResource.getRelatedResources( - this.engine.getExecutionContext().getResourceModel()); - allResources.forEach [ r | - if (r != null) { - r.eAdapters().add(adapter); - } - ] - - } - - /** - * When an observer asks for the changes, we process all the notifications gathered for it since the last time. - */ - def List getChanges(Object addon) { - val List result = new ArrayList() - val List allNotifs = changes.get(addon); - if (registeredObservers.contains(addon)) { - changes.put( - addon, - new ArrayList() - ); - } - - // First we sort everything per object and field - val Map>> sortedNotifications = new HashMap - val Map> resourcesNotifications = new HashMap - for (Notification notification : allNotifs) { - val int eventType = notification.getEventType(); - if (eventType < Notification.EVENT_TYPE_COUNT && !notification.isTouch()) { - - if (notification.getNotifier() instanceof EObject && - notification.getFeature() instanceof EStructuralFeature) { - val EStructuralFeature feature = notification.getFeature() as EStructuralFeature; - val EObject changedObject = notification.getNotifier() as EObject; - if (!sortedNotifications.containsKey(changedObject)) { - sortedNotifications.put(changedObject, new HashMap) - } - val Map> objectsNotifications = sortedNotifications.get( - changedObject); - if (!objectsNotifications.containsKey(feature)) { - objectsNotifications.put(feature, new ArrayList) - } - val List fieldNotifications = objectsNotifications.get(feature); - fieldNotifications.add(notification); - } else if (notification.getNotifier() instanceof Resource) { - val Resource resource = notification.notifier as Resource - if (!resourcesNotifications.containsKey(resource)) - resourcesNotifications.put(resource, new ArrayList) - val resourceNotifications = resourcesNotifications.get(resource) - resourceNotifications.add(notification) - } - } - } - - val newObjects = new HashSet - val removedObjects = new HashSet - - // First we find new objects added or removed at the root of the resource - for (resource : resourcesNotifications.keySet) { - val resourceNotifications = resourcesNotifications.get(resource) - for (Notification notif : resourceNotifications) { - org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListenerAddon. - manageCollectionContainmentNotification(removedObjects, newObjects, notif) - } - } - - // Next we read all that and try to interpret everything as coarse grained model changes - for (object : sortedNotifications.keySet) { - val featureMap = sortedNotifications.get(object) - for (feature : featureMap.keySet) { - val notifs = featureMap.get(feature) - - // Case multiplicity 0..1: we compare the original value and the new one at the end of the step - if (!feature.isMany) { - - val previousValue = notifs.head.oldValue - val newValue = notifs.last.newValue - - // Case objects: we compare references - if (feature instanceof EReference) { - if (previousValue != newValue) { - - // Register model change - result.add(new NonCollectionFieldModelChange(object, feature)) - - // Register potentially new or removed object - if ((feature as EReference).containment) { - if (previousValue != null && previousValue instanceof EObject) - addToRemovedObjects(removedObjects, newObjects, previousValue as EObject) - if (newValue != null && newValue instanceof EObject) - addToNewObjects(removedObjects, newObjects, newValue as EObject) - } - } - } // Case data types: we compare values - else if (if (previousValue == null) { - newValue != null - } else { - !previousValue.equals(newValue) - }) { - - // Register model change - result.add(new NonCollectionFieldModelChange(object, feature)) - } - - } // Case multiplicity 0..*: we consider that there was a potential change, but maybe following - // all the adds ands remove, the collection went back to its state before the step - else { - - // Very hard to decide if a collection has changed or not based on the notifications, - // (e.g. if we remove and add the same object, the collection in fact doesn't change) - // and we don't have a direct access to the previous content of the collection to compare - // similarly to what we do in a trace manager. - // So for now we simply state a "potential change", and the trace manager will have to compute - // itself if there was a real change. - result.add(new PotentialCollectionFieldModelChange(object, feature, notifs)) - - // Yet we must still find new/removed objects - for (notif : notifs) { - - if (feature instanceof EReference && (feature as EReference).containment) { - org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListenerAddon. - manageCollectionContainmentNotification(removedObjects, newObjects, notif) - } - } - } - } - } - - // Finally we register the new and removed objects from the model - for (newObject : newObjects) { - result.add(0, new NewObjectModelChange(newObject)) - } - for (removedObject : removedObjects) { - result.add(0, new RemovedObjectModelChange(removedObject)) - } - - return result; - } - - def boolean registerObserver(Object observer) { - val boolean res = registeredObservers.add(observer); - if (res) { - changes.put(observer, new ArrayList()); - } - return res; - } - - private static def void addToNewObjects(Collection removedObjects, Collection newObjects, - EObject object) { - if (object != null) { - val hasMoved = removedObjects.remove(object) - if (!hasMoved) - newObjects.add(object) - } - } - - private static def void addToRemovedObjects(Collection removedObjects, Collection newObjects, - EObject object) { - if (object != null) { - val hasMoved = newObjects.remove(object) - if (!hasMoved) - removedObjects.add(object) - - } - } - - // TODO manage objects already contained in new objects ... ? - private static def void manageCollectionContainmentNotification(Collection removedObjects, - Collection newObjects, Notification notif) { - switch (notif.eventType) { - case Notification.ADD: - addToNewObjects(removedObjects, newObjects, notif.newValue as EObject) - case Notification.ADD_MANY: - for (add : notif.newValue as List) - addToNewObjects(removedObjects, newObjects, add) - case Notification.REMOVE: - addToRemovedObjects(removedObjects, newObjects, notif.oldValue as EObject) - case Notification.REMOVE_MANY: - for (remove : notif.oldValue as List) - addToNewObjects(removedObjects, newObjects, remove) - } - } - - override void engineAboutToStop(IExecutionEngine engine) { - val Set allResources = EMFResource.getRelatedResources( - this.engine.getExecutionContext().getResourceModel()); - for (r : allResources.filter[r|r != null]) { - r.eAdapters().remove(adapter); - } - } - -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index 291ca24c4..f4f48fa66 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -29,7 +29,6 @@ import org.gemoc.xdsmlframework.api.core.IExecutionEngine import org.gemoc.xdsmlframework.api.engine_addon.DefaultEngineAddon import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListenerAddon import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDimensionalTraceAddon { @@ -43,7 +42,7 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi private boolean shouldSave = true private var boolean needTransaction = true - private BatchModelChangeListenerAddon listenerAddon + private BatchModelChangeListener listenerAddon abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map exeToTraced) @@ -153,11 +152,7 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi val Resource traceResource = rs.createResource(traceModelURI) // We construct a new listener addon if required - this.listenerAddon = if (engine.hasAddon(BatchModelChangeListenerAddon)) { - engine.getAddon(BatchModelChangeListenerAddon) - } else { - new BatchModelChangeListenerAddon(engine) - } + this.listenerAddon = new BatchModelChangeListener(EMFResource.getRelatedResources(engine.executionContext.resourceModel)) listenerAddon.registerObserver(this) val launchConfiguration = engine.extractLaunchConfiguration diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF index 63081340e..55c311be7 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF @@ -22,9 +22,6 @@ Require-Bundle: org.eclipse.ui, com.google.guava;bundle-version="15.0.0", org.eclipse.elk.alg.layered;bundle-version="0.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.gemoc.sequential_addons.stategraph.model.stategraph, - org.gemoc.sequential_addons.stategraph.model.stategraph.impl, - org.gemoc.sequential_addons.stategraph.model.stategraph.util Import-Package: javafx.animation;version="2.0.0", javafx.application;version="2.0.0", javafx.beans;version="2.0.0", From b34a37e9d834920a900fc330b80fd83d754d43a3 Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Fri, 9 Dec 2016 10:23:32 +0100 Subject: [PATCH 074/267] Updated icon and extension details for the event manager --- .../AbstractSequentialExecutionEngine.java | 2 +- .../icons/IconeGemocModel-16.png | Bin 0 -> 763 bytes .../icons/sample.gif | Bin 983 -> 0 bytes .../plugin.xml | 30 ++++++++++-------- .../views/EventManagerRenderer.java | 2 +- 5 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/IconeGemocModel-16.png delete mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/sample.gif diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index e9667fc95..b102d24de 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -70,7 +70,7 @@ private void manageEvents() { if (mse != null) { EObject container = mse.eContainer(); if (container instanceof SequentialStep) { - IEventManager eventManager = EventManagerRegistry.getInstance().findEventManager(); + IEventManager eventManager = EventManagerRegistry.getInstance().findEventManager(null); if (eventManager != null) { eventManager.manageEvents(); } diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/IconeGemocModel-16.png b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/IconeGemocModel-16.png new file mode 100644 index 0000000000000000000000000000000000000000..1fafbd67182099ec7c67d118a2758e733972bda7 GIT binary patch literal 763 zcmVJNRCwByQe8+>VHke5bL?zWH;XC$ z?8jEypxmbDilhsP%8H1hpNnp~P>gQ6>4ykxNH;+cnMnnrWg%UNw3uFKEDJX;q~V;3 z8>I%~hU~b_v+bOno%VIkNKvLy58uoC{k-4vz3=xvBG?A?58o8=uG(5zS}m+67DJQn z)@!5N#fmmBYVLO6XDzx{mVMguM|9;Fj)`$$KT4;#iMb!)Zr5~&)7H`sJE3*p%g0rU zrl|ytxO5uPNg5^M3B;yYMA0ea53WX=pT2#!`3}B5F*HA@zglNJJ?r)02q6&6U@(AE zsRZ}DV|_d%d978(?^31f&uPn9L@i39fW= z2IBRJQCVOXJV}xp=9`{@!J#2gDC8iMNx}ZX4s0@Ba_Lr^I)^}lV53xPlY_Q(jVq_&|fhhS`(n#}yEJQ)W7sv%La2X7 zDL2|W&kRp}UnV0l6z3&OQE?QFQK;cj-+lO3m~OXMzjse9@FeNAwK#ImEhg&jJvYMt t;BedPsxId@PcR%oE!~5ye~bMszyROMBY8Tx2G#%o002ovPDHLkV1l@cTwwqJ literal 0 HcmV?d00001 diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/sample.gif b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/sample.gif deleted file mode 100644 index 34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 983 zcmZ?wbhEHb6krfw_|CxKYUg-n!?izO{@9*?jxd%4aX0yzy`dymabz zw#(eg=y~&N&n)dZv2xzduG}5lraiApo3(c4*{Ylg5#|$JO_EEZ<^|a2`Z*=9ns7DV zy=TR&gYw*7f%auV?ip3tvjRPmcdoho{K?x$_vR?C#t5&<;~V}S*>OMCr>h}%%bLZ9 zmo3`hYEwTICo-TTCZwgTsC&VjZRgJ1eE#fBa^%9R zmmfWS@;bnyJ27HWY}kxYzv(Hl>yu;FCPlAEh+34Muq-8Rb6C)<8qA3{r2e5 z`$vyngh#H=FWlqqvnapfc5%(!sQ4v?r7J61-&eJNEN^;KTK}T7{#i-gJh%G*9vcYdwv_*~xdw!Gz4Va?T!sXyyF@8?w<>X`X=#j%uHV4GRvj@+tE@ zQ%F!a)GKcn^~8abN>4la1UNXVL;{ZWi)lEwyeatDu%Lr6;aASiLrXXW zQm# + + + + - + - + + + + + - - - - diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java index 97b655d6d..291d03b7e 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java @@ -143,7 +143,7 @@ public void engineStarted(IExecutionEngine executionEngine) { @Override public void engineInitialized(IExecutionEngine executionEngine) { - setEventManager(EventManagerRegistry.getInstance().findEventManager()); + setEventManager(EventManagerRegistry.getInstance().findEventManager(null)); } @Override From 5a1dac488000f920623f7dae2c3664994657f33b Mon Sep 17 00:00:00 2001 From: Dorian Leroy Date: Fri, 9 Dec 2016 13:28:06 +0100 Subject: [PATCH 075/267] Fixed missing icons for diff viewer and improved event manager GUI --- .../views/EventManagerRenderer.java | 92 +++++++++++++------ .../build.properties | 3 +- 2 files changed, 68 insertions(+), 27 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java index 291d03b7e..c26aeec54 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java @@ -1,11 +1,13 @@ package org.gemoc.executionframework.eventmanager.views; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; @@ -26,69 +28,105 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; import javafx.scene.layout.Pane; +import javafx.scene.layout.VBox; import javafx.util.StringConverter; public class EventManagerRenderer extends Pane implements IEngineAddon { private IEventManager eventManager; - + private Resource executedModel; private final ObservableList eventList = FXCollections.observableArrayList(); - + + private final ObservableList pushedEvents = FXCollections.observableArrayList(); + private final Map eventTypeToEventTableView = new HashMap<>(); - + + private final Map> eventTypeToSelectedEvents = new HashMap<>(); + private final ScrollPane scrollPane = new ScrollPane(); - + private final ListView eventListView = new ListView<>(eventList); - + + private final ListView pushedEventListView = new ListView<>(pushedEvents); + private final BorderPane borderPane = new BorderPane(); - - private final Button button1 = new Button("Push"); - - private final Button button2 = new Button("Send"); - + + private final Button pushButton = new Button("Push"); + + private final Button sendButton = new Button("Send"); + private final HBox header = new HBox(); public EventManagerRenderer() { getChildren().add(borderPane); - + borderPane.minWidthProperty().bind(widthProperty()); borderPane.maxWidthProperty().bind(widthProperty()); borderPane.minHeightProperty().bind(heightProperty()); borderPane.maxHeightProperty().bind(heightProperty()); - - header.getChildren().addAll(button1, button2); - + + pushButton.setOnAction(e -> { + eventTypeToSelectedEvents.get(eventListView.getSelectionModel().getSelectedItem()).forEach(event -> { + pushedEvents.add(event); + }); + }); + + sendButton.setOnAction(e -> { + pushedEvents.forEach(eventManager::sendEvent); + pushedEvents.clear(); + }); + + header.getChildren().addAll(pushButton, sendButton); + eventListView.setCellFactory((l) -> new ComboBoxListCell(new StringConverter() { @Override public String toString(EClass object) { return object.getName(); } + @Override public EClass fromString(String string) { return null; } })); - + eventListView.getSelectionModel().selectedItemProperty().addListener((c, o, n) -> { scrollPane.setContent(eventTypeToEventTableView.get(n)); }); + + final VBox leftPanel = new VBox(); + leftPanel.getChildren().addAll(eventListView, pushedEventListView); borderPane.setTop(header); - borderPane.setLeft(eventListView); + borderPane.setLeft(leftPanel); borderPane.setCenter(scrollPane); - + scrollPane.setFitToWidth(true); scrollPane.setBorder(Border.EMPTY); - scrollPane.minHeightProperty().bind(eventListView.heightProperty()); - scrollPane.maxHeightProperty().bind(eventListView.heightProperty()); + scrollPane.minHeightProperty().bind(leftPanel.heightProperty()); + scrollPane.maxHeightProperty().bind(leftPanel.heightProperty()); final ListChangeListener eventTypesChangeListener = c -> { - while(c.next()) { - c.getRemoved().stream().forEach(e -> eventTypeToEventTableView.remove(e)); + while (c.next()) { + c.getRemoved().stream().forEach(e -> { + eventTypeToEventTableView.remove(e); + eventTypeToSelectedEvents.remove(e); + }); c.getAddedSubList().stream().forEach(e -> { final EventTableView tableView = new EventTableView(e, executedModel, eventManager); eventTypeToEventTableView.put(e, tableView); + final List selectedEvents = new ArrayList<>(); + eventTypeToSelectedEvents.put(e, selectedEvents); + + final ListChangeListener selectedEventsChangeListener = c1 -> { + while (c1.next()) { + selectedEvents.removeAll(c1.getRemoved()); + selectedEvents.addAll(c1.getAddedSubList()); + } + }; + + tableView.getSelectionModel().getSelectedItems().addListener(selectedEventsChangeListener); tableView.refreshEvents(); tableView.minHeightProperty().bind(scrollPane.heightProperty().subtract(2)); }); @@ -96,7 +134,7 @@ public EClass fromString(String string) { }; eventList.addListener(eventTypesChangeListener); } - + public void setEventManager(IEventManager eventManager) { Runnable runnable = () -> { this.eventManager = eventManager; @@ -111,11 +149,11 @@ public void setEventManager(IEventManager eventManager) { runnable.run(); } } - + public void setExecutedModel(Resource executedModel) { this.executedModel = executedModel; } - + private void refreshEvents() { eventTypeToEventTableView.entrySet().forEach(e -> { final EventTableView tableView = e.getValue(); @@ -140,7 +178,7 @@ public void engineAboutToStart(IExecutionEngine engine) { public void engineStarted(IExecutionEngine executionEngine) { executedModel = executionEngine.getExecutionContext().getResourceModel(); } - + @Override public void engineInitialized(IExecutionEngine executionEngine) { setEventManager(EventManagerRegistry.getInstance().findEventManager(null)); @@ -155,7 +193,9 @@ public void engineStopped(IExecutionEngine engine) { executedModel = null; eventList.clear(); eventTypeToEventTableView.clear(); - scrollPane.setContent(null); + Platform.runLater(() -> { + scrollPane.setContent(null); + }); } @Override diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/build.properties b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/build.properties index e9863e281..6c480f39f 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/build.properties +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/build.properties @@ -2,4 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml + plugin.xml,\ + icons/ From 99a74441a0fb6916edf98542ee65d413ffafe845 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 20 Jan 2017 15:43:07 +0100 Subject: [PATCH 076/267] Alignment of versions to 2.3.0 all version features and plugins of this repo are now synchronized to 2.3.0 --- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../org.gemoc.executionframework.ui/pom.xml | 4 +- framework/execution_framework/pom.xml | 4 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../org.gemoc.xdsmlframework.api/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.gemoc.xdsmlframework.commons/pom.xml | 2 +- framework/framework_commons/pom.xml | 4 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.gemoc.xdsmlframework.ide.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.gemoc.xdsmlframework.ui.utils/pom.xml | 2 +- framework/xdsml_framework/pom.xml | 4 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- java_execution/pom.xml | 4 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- pom.xml | 6 +-- .../category.xml | 42 +++++++++---------- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../plugins/fr.obeo.dsl.debug.edit/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../fr.obeo.dsl.debug.ide.sirius.ui/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../plugins/fr.obeo.dsl.debug.ide.ui/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../plugins/fr.obeo.dsl.debug.ide/pom.xml | 4 +- .../fr.obeo.dsl.debug/META-INF/MANIFEST.MF | 2 +- .../plugins/fr.obeo.dsl.debug/pom.xml | 4 +- simulationmodelanimation/pom.xml | 2 +- .../fr.obeo.dsl.debug.feature/feature.xml | 2 +- .../releng/fr.obeo.dsl.debug.feature/pom.xml | 4 +- .../feature.xml | 2 +- .../pom.xml | 4 +- .../fr.obeo.dsl.debug.ui.feature/feature.xml | 2 +- .../fr.obeo.dsl.debug.ui.feature/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../tests/fr.obeo.dsl.debug.ide.tests/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../tests/fr.obeo.dsl.debug.tests/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../fr.inria.diverse.trace.api/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../fr.inria.diverse.trace.commons/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../fr.inria.diverse.trace.gemoc.api/pom.xml | 4 +- trace/commons/pom.xml | 4 +- .../feature.xml | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../plugins/fr.inria.diverse.ecorext/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../fr.inria.diverse.trace.gemoc.ui/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../fr.inria.diverse.trace.gemoc/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- trace/generator/pom.xml | 4 +- .../feature.xml | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- trace/manager/pom.xml | 4 +- .../feature.xml | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../benchmark-models/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.gemoc.sample.tfsm.plaink3.dsa/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- 124 files changed, 191 insertions(+), 191 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF index 365dccd72..d48351f07 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Execution Engine UI Bundle-SymbolicName: org.gemoc.executionframework.engine.ui;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.engine.ui.Activator Require-Bundle: org.gemoc.xdsmlframework.api, org.gemoc.commons.eclipse, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/pom.xml b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/pom.xml index 7baec609a..9e1cae9c0 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/pom.xml +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/pom.xml @@ -7,11 +7,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ../.. org.gemoc.modeldebugging.executionframework org.gemoc.modeldebugging.executionframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.executionframework.engine.ui - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF index c6d073abc..41969111a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Engine Bundle-SymbolicName: org.gemoc.executionframework.engine;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.engine.Activator Require-Bundle: org.gemoc.xdsmlframework.api, org.gemoc.commons.eclipse, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/pom.xml b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/pom.xml index 729aa9ebb..c86c2eec3 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/pom.xml +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/pom.xml @@ -7,11 +7,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ../.. org.gemoc.modeldebugging.executionframework org.gemoc.modeldebugging.executionframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.executionframework.engine - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF index d7df9ffc3..2f31e2855 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Eventmanager Bundle-SymbolicName: org.gemoc.executionframework.eventmanager;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.eventmanager.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF index 698bf08bc..ac1cff53e 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Sirius Bundle-SymbolicName: org.gemoc.executionframework.extensions.sirius;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.extensions.sirius.Activator Require-Bundle: org.gemoc.xdsmlframework.api, org.eclipse.sirius.diagram.ui;bundle-version="4.0.0", diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/pom.xml b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/pom.xml index fcb12cbf1..a585b483a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/pom.xml +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/pom.xml @@ -7,11 +7,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ../.. org.gemoc.modeldebugging.executionframework org.gemoc.modeldebugging.executionframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.executionframework.extensions.sirius - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF index 8e12e1f5f..cddf41171 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Execution framework UI Bundle-SymbolicName: org.gemoc.executionframework.ui;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.ui.Activator Require-Bundle: org.gemoc.xdsmlframework.api, org.gemoc.commons.eclipse, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/pom.xml b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/pom.xml index f925581a6..9a4451f57 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/pom.xml +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/pom.xml @@ -7,11 +7,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ../.. org.gemoc.modeldebugging.executionframework org.gemoc.modeldebugging.executionframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.executionframework.ui - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/execution_framework/pom.xml b/framework/execution_framework/pom.xml index 61fc9f6e2..62ad4f404 100644 --- a/framework/execution_framework/pom.xml +++ b/framework/execution_framework/pom.xml @@ -3,12 +3,12 @@ 4.0.0 org.gemoc.modeldebugging.executionframework org.gemoc.modeldebugging.executionframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT pom org.gemoc org.gemoc.siriusanimation.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml index 98f8ad4f8..cadaeb803 100644 --- a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml +++ b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/pom.xml b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/pom.xml index 2cf14a6b9..84e439602 100644 --- a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/pom.xml +++ b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/pom.xml @@ -6,7 +6,7 @@ ../../pom.xml org.gemoc.modeldebugging.executionframework org.gemoc.modeldebugging.executionframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.modeldebugging.executionframework.feature diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF index 7f0ef9a78..81593bc43 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gemoc.executionframework.reflectivetrace.model;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: INRIA Bundle-Localization: plugin diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/pom.xml b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/pom.xml index 052ab25ec..30f1df078 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/pom.xml +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/pom.xml @@ -6,10 +6,10 @@ ../.. org.gemoc.modeldebugging.framework.commons org.gemoc.modeldebugging.framework.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.executionframework.reflectivetrace.model eclipse-plugin - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT \ No newline at end of file diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF index e9c6caf98..a4e9bdf42 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Language Api Bundle-SymbolicName: org.gemoc.xdsmlframework.api;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.xdsmlframework.api.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore, diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/pom.xml b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/pom.xml index 694ed8965..dc2447f6c 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/pom.xml +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/pom.xml @@ -6,7 +6,7 @@ ../.. org.gemoc.modeldebugging.framework.commons org.gemoc.modeldebugging.framework.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.xdsmlframework.api diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/META-INF/MANIFEST.MF index 798a44347..e3f9297a8 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.gemoc.xdsmlframework.commons Bundle-SymbolicName: org.gemoc.xdsmlframework.commons -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.emf.ecore, org.eclipse.xtend.lib Export-Package: org.gemoc.xdsmlframework.commons diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/pom.xml b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/pom.xml index b4ffb3f95..91193a309 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/pom.xml +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/pom.xml @@ -6,7 +6,7 @@ ../.. org.gemoc.modeldebugging.framework.commons org.gemoc.modeldebugging.framework.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.xdsmlframework.commons diff --git a/framework/framework_commons/pom.xml b/framework/framework_commons/pom.xml index 7d1a510ec..0106e4a4e 100644 --- a/framework/framework_commons/pom.xml +++ b/framework/framework_commons/pom.xml @@ -3,12 +3,12 @@ 4.0.0 org.gemoc.modeldebugging.framework.commons org.gemoc.modeldebugging.framework.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT pom org.gemoc org.gemoc.siriusanimation.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml index 52a62b261..66edf60dc 100644 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml +++ b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/pom.xml b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/pom.xml index 3cf2ebb81..d6f87dd02 100644 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/pom.xml +++ b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/pom.xml @@ -6,7 +6,7 @@ ../../pom.xml org.gemoc.modeldebugging.framework.commons org.gemoc.modeldebugging.framework.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.modeldebugging.framework.commons.feature diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF index ea5a7a373..79198e184 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc extension for Sirius Bundle-SymbolicName: org.gemoc.xdsmlframework.extensions.sirius;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.xdsmlframework.extensions.sirius.Activator Require-Bundle: org.gemoc.xdsmlframework.api, fr.inria.diverse.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/pom.xml b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/pom.xml index 215594f19..cdbf49052 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/pom.xml +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/pom.xml @@ -6,7 +6,7 @@ ../.. org.gemoc.modeldebugging.xdsmlframework org.gemoc.modeldebugging.xdsmlframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.xdsmlframework.extensions.sirius diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF index 9211fbc73..c22b28cf6 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ExecutionFrmaework Language Workbench UI Bundle-SymbolicName: org.gemoc.xdsmlframework.ide.ui;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.xdsmlframework.ide.ui.Activator Bundle-Vendor: INRIA Require-Bundle: org.eclipse.core.runtime, diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/pom.xml b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/pom.xml index ddd7192f8..3726d63b2 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/pom.xml +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/pom.xml @@ -6,7 +6,7 @@ ../.. org.gemoc.modeldebugging.xdsmlframework org.gemoc.modeldebugging.xdsmlframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.xdsmlframework.ide.ui diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF index c44e0fe09..fa5fb70cf 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Utils Bundle-SymbolicName: org.gemoc.xdsmlframework.ui.utils -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.xdsmlframework.ui.utils.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.codegen.ecore.ui;bundle-version="2.8.0", diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/pom.xml b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/pom.xml index 1da46d878..9ccef865a 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/pom.xml +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/pom.xml @@ -6,7 +6,7 @@ ../.. org.gemoc.modeldebugging.xdsmlframework org.gemoc.modeldebugging.xdsmlframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.xdsmlframework.ui.utils diff --git a/framework/xdsml_framework/pom.xml b/framework/xdsml_framework/pom.xml index a26af18d7..ad231e3fc 100644 --- a/framework/xdsml_framework/pom.xml +++ b/framework/xdsml_framework/pom.xml @@ -3,12 +3,12 @@ 4.0.0 org.gemoc.modeldebugging.xdsmlframework org.gemoc.modeldebugging.xdsmlframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT pom org.gemoc org.gemoc.siriusanimation.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml index 2f4757003..f37f2fc1b 100644 --- a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml +++ b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/pom.xml b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/pom.xml index dcfb12177..88f58a745 100644 --- a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/pom.xml +++ b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/pom.xml @@ -6,7 +6,7 @@ ../../pom.xml org.gemoc.modeldebugging.xdsmlframework org.gemoc.modeldebugging.xdsmlframework.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.modeldebugging.xdsmlframework.feature diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index 03e0f969c..b8b7dd4a6 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Sequential Language Workbench UI Bundle-SymbolicName: org.gemoc.execution.sequential.javaengine.ui;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.execution.sequential.javaengine.ui.Activator Bundle-Vendor: INRIA Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/pom.xml b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/pom.xml index 4ee8d3857..befa024da 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/pom.xml +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/pom.xml @@ -6,7 +6,7 @@ ../../.. org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.execution.sequential.javaengine.ui diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF index 7375d1b17..35d1ca695 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Sequential Language Api Bundle-SymbolicName: org.gemoc.execution.sequential.javaengine;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: org.gemoc.xdsmlframework.api, org.gemoc.execution.sequential.javaxdsml.api, org.gemoc.executionframework.engine, diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/pom.xml b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/pom.xml index 988683d30..6a8070562 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/pom.xml +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/pom.xml @@ -6,7 +6,7 @@ ../../.. org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.execution.sequential.javaengine diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF index db9a5d9e5..3b6a1404f 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Sequential Language Api Bundle-SymbolicName: org.gemoc.execution.sequential.javaxdsml.api;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.gemoc.xdsmlframework.api, org.gemoc.executionframework.engine.ui diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/pom.xml b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/pom.xml index 4602f6185..0f0edcbe5 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/pom.xml +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/pom.xml @@ -6,7 +6,7 @@ ../../.. org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.execution.sequential.javaxdsml.api diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF index 8efdc4c4a..f7e068166 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Sequential Java XDSML UI Bundle-SymbolicName: org.gemoc.execution.sequential.javaxdsml.ide.ui;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator Bundle-Vendor: INRIA Require-Bundle: org.eclipse.core.runtime, diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml index 510759d3f..fae3cfc27 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml @@ -6,7 +6,7 @@ ../../.. org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.execution.sequential.javaxdsml.ide.ui diff --git a/java_execution/pom.xml b/java_execution/pom.xml index 1f78e8199..8ccc2ff9c 100644 --- a/java_execution/pom.xml +++ b/java_execution/pom.xml @@ -3,12 +3,12 @@ 4.0.0 org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT pom org.gemoc org.gemoc.siriusanimation.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT .. diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/feature.xml b/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/feature.xml index f964f3ffe..eab407d84 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/feature.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/pom.xml b/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/pom.xml index d56c50a09..dd6c061a2 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/pom.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/pom.xml @@ -6,7 +6,7 @@ ../../pom.xml org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.execution.sequential.javaengine.feature diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/feature.xml b/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/feature.xml index e610d5382..2770bdcd9 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/feature.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/pom.xml b/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/pom.xml index d3241a41b..defb6b7cd 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/pom.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/pom.xml @@ -6,7 +6,7 @@ ../../pom.xml org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.execution.sequential.javaengine.ui.feature diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/feature.xml b/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/feature.xml index 5c5f18f46..d31ee0987 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/feature.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/pom.xml b/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/pom.xml index 4ae26f5ec..81d269449 100644 --- a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/pom.xml +++ b/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/pom.xml @@ -6,7 +6,7 @@ ../../pom.xml org.gemoc.execution.sequential.java org.gemoc.execution.sequential.java.root - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT org.gemoc.execution.sequential.javaxdsml.feature diff --git a/pom.xml b/pom.xml index 9c66145dc..8b838b4cc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.gemoc org.gemoc.siriusanimation.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT pom @@ -103,14 +103,14 @@ com.oracle javafx - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT ${java.home}/lib/jfxrt.jar system com.oracle javafxswt - 2.2.0-SNAPSHOTT + 2.3.0-SNAPSHOTT ${java.home}/lib/jfxswt.jar system diff --git a/releng/org.gemoc.siriusanimation.repository/category.xml b/releng/org.gemoc.siriusanimation.repository/category.xml index a77da95eb..bb9310113 100644 --- a/releng/org.gemoc.siriusanimation.repository/category.xml +++ b/releng/org.gemoc.siriusanimation.repository/category.xml @@ -1,21 +1,21 @@ - + - + - + - + - + - + @@ -29,53 +29,53 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/releng/org.gemoc.siriusanimation.repository/pom.xml b/releng/org.gemoc.siriusanimation.repository/pom.xml index 71e2a99a9..34000d7c3 100644 --- a/releng/org.gemoc.siriusanimation.repository/pom.xml +++ b/releng/org.gemoc.siriusanimation.repository/pom.xml @@ -25,12 +25,12 @@ org.gemoc.siriusanimation.root org.gemoc - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../pom.xml org.gemoc org.gemoc.siriusanimation.repository - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-repository diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/META-INF/MANIFEST.MF index 30ec5940e..6e1f28edd 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.obeo.dsl.debug.edit;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Activator: fr.obeo.dsl.debug.provider.DebugEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/pom.xml b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/pom.xml index b2dfd9c45..89264f05d 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/pom.xml +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/pom.xml @@ -15,11 +15,11 @@ Contributors: fr.obeo.dsl.debug.parent DSLDebugger - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../ DSLDebugger fr.obeo.dsl.debug.edit - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF index 8bed68e89..04774b775 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.obeo.dsl.debug.ide.sirius.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %providerName Require-Bundle: org.eclipse.debug.ui;bundle-version="3.7.0", diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/pom.xml b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/pom.xml index d58894df8..59cd6580d 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/pom.xml +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/pom.xml @@ -15,11 +15,11 @@ Contributors: fr.obeo.dsl.debug.parent DSLDebugger - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../ DSLDebugger fr.obeo.dsl.debug.ide.sirius.ui - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/META-INF/MANIFEST.MF index 02f088525..46265329a 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.obeo.dsl.debug.ide.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.debug.ui;bundle-version="3.7.0", diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/pom.xml b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/pom.xml index 064697c54..181d21eb9 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/pom.xml +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/pom.xml @@ -15,11 +15,11 @@ Contributors: fr.obeo.dsl.debug.parent DSLDebugger - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../ DSLDebugger fr.obeo.dsl.debug.ide.ui - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF index edf20abe5..6f323fcc0 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.obeo.dsl.debug.ide;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/pom.xml b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/pom.xml index 108dc1ec6..df3694c09 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/pom.xml +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/pom.xml @@ -15,11 +15,11 @@ Contributors: fr.obeo.dsl.debug.parent DSLDebugger - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../ DSLDebugger fr.obeo.dsl.debug.ide - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/fr.obeo.dsl.debug/META-INF/MANIFEST.MF index 688775b36..6993dcdbe 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.obeo.dsl.debug;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/pom.xml b/simulationmodelanimation/plugins/fr.obeo.dsl.debug/pom.xml index 4fffa8dbc..69e72d503 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/pom.xml +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug/pom.xml @@ -15,11 +15,11 @@ Contributors: fr.obeo.dsl.debug.parent DSLDebugger - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../ DSLDebugger fr.obeo.dsl.debug - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin diff --git a/simulationmodelanimation/pom.xml b/simulationmodelanimation/pom.xml index d0bd793d5..8163616fa 100644 --- a/simulationmodelanimation/pom.xml +++ b/simulationmodelanimation/pom.xml @@ -18,7 +18,7 @@ Contributors: DSLDebugger fr.obeo.dsl.debug.parent - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT pom DSL Debugger Parent diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/feature.xml b/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/feature.xml index 7a754b1f5..cb6761c2c 100644 --- a/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/feature.xml +++ b/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/pom.xml b/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/pom.xml index 9eb60ba25..65d830be0 100644 --- a/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/pom.xml +++ b/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/pom.xml @@ -15,12 +15,12 @@ Contributors: fr.obeo.dsl.debug.parent DSLDebugger - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../ DSLDebugger fr.obeo.dsl.debug.feature - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-feature DSL Debugger Feature diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/feature.xml b/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/feature.xml index 08270c7c0..2487ddedf 100644 --- a/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/feature.xml +++ b/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/pom.xml b/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/pom.xml index bf2b1677a..e0d069ca1 100644 --- a/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/pom.xml +++ b/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/pom.xml @@ -15,12 +15,12 @@ Contributors: fr.obeo.dsl.debug.parent DSLDebugger - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../ DSLDebugger fr.obeo.dsl.debug.sirius.ui.feature - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-feature DSL Debugger Sirius UI Feature diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/feature.xml b/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/feature.xml index dda2747ed..cfd62f90d 100644 --- a/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/feature.xml +++ b/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/pom.xml b/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/pom.xml index bc574eaae..2f0203bb9 100644 --- a/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/pom.xml +++ b/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/pom.xml @@ -15,12 +15,12 @@ Contributors: fr.obeo.dsl.debug.parent DSLDebugger - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../ DSLDebugger fr.obeo.dsl.debug.ui.feature - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-feature DSL Debugger UI Feature diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/META-INF/MANIFEST.MF b/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/META-INF/MANIFEST.MF index 072e002ba..e27e50116 100644 --- a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.obeo.dsl.debug.ide.tests -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Require-Bundle: fr.obeo.dsl.debug.ide;bundle-version="1.0.0", diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/pom.xml b/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/pom.xml index d1a1e0abf..428f42364 100644 --- a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/pom.xml +++ b/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/pom.xml @@ -15,12 +15,12 @@ Contributors: fr.obeo.dsl.debug.parent DSLDebugger - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../ DSLDebugger fr.obeo.dsl.debug.ide.tests - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-test-plugin diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/META-INF/MANIFEST.MF b/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/META-INF/MANIFEST.MF index 584d0ac64..6f5bbec61 100644 --- a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.obeo.dsl.debug.tests;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/pom.xml b/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/pom.xml index 4652fa8b5..3b819815a 100644 --- a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/pom.xml +++ b/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/pom.xml @@ -15,12 +15,12 @@ Contributors: fr.obeo.dsl.debug.parent DSLDebugger - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../ DSLDebugger fr.obeo.dsl.debug.tests - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-test-plugin diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/META-INF/MANIFEST.MF b/trace/commons/plugins/fr.inria.diverse.trace.api/META-INF/MANIFEST.MF index deb423045..d8b0c9d65 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/fr.inria.diverse.trace.api/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.inria.diverse.trace.api;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/pom.xml b/trace/commons/plugins/fr.inria.diverse.trace.api/pom.xml index 287e90a1c..6ecf57a4a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/pom.xml +++ b/trace/commons/plugins/fr.inria.diverse.trace.api/pom.xml @@ -4,13 +4,13 @@ 4.0.0 org.gemoc.modeldebugging.trace.commons fr.inria.diverse.trace.api - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.commons org.gemoc.modeldebugging.trace.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF index e42d5bffd..615b8d584 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.inria.diverse.trace.commons.model;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: INRIA Bundle-Localization: plugin diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/pom.xml b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/pom.xml index 919bed42a..741e0bd06 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/pom.xml +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/pom.xml @@ -6,10 +6,10 @@ ../.. org.gemoc.modeldebugging.trace.commons org.gemoc.modeldebugging.trace.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT fr.inria.diverse.trace.commons.model eclipse-plugin - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT \ No newline at end of file diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/META-INF/MANIFEST.MF b/trace/commons/plugins/fr.inria.diverse.trace.commons/META-INF/MANIFEST.MF index 6858ea513..ef7d02b61 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Util Bundle-SymbolicName: fr.inria.diverse.trace.commons -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Export-Package: fr.inria.diverse.trace.commons, fr.inria.diverse.trace.commons.tracemetamodel, org.jdom2, diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/pom.xml b/trace/commons/plugins/fr.inria.diverse.trace.commons/pom.xml index c3edcc51f..ef23a82e3 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons/pom.xml +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.gemoc.modeldebugging.trace.commons fr.inria.diverse.trace.commons - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin @@ -14,7 +14,7 @@ org.gemoc.modeldebugging.trace.commons org.gemoc.modeldebugging.trace.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF index d24049caa..49c5f4f9b 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Api Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.api -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.ecore;bundle-version="2.10.2", diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/pom.xml b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/pom.xml index 7272f4197..a8a9ec580 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/pom.xml +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.gemoc.modeldebugging.trace.commons fr.inria.diverse.trace.gemoc.api - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.commons org.gemoc.modeldebugging.trace.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/commons/pom.xml b/trace/commons/pom.xml index 4d2afae7c..6af8bba52 100644 --- a/trace/commons/pom.xml +++ b/trace/commons/pom.xml @@ -4,13 +4,13 @@ 4.0.0 org.gemoc.modeldebugging.trace.commons org.gemoc.modeldebugging.trace.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT pom org.gemoc org.gemoc.siriusanimation.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/commons/releng/fr.inria.diverse.trace.commons.feature/feature.xml b/trace/commons/releng/fr.inria.diverse.trace.commons.feature/feature.xml index 7a6367ed5..69c142d5d 100644 --- a/trace/commons/releng/fr.inria.diverse.trace.commons.feature/feature.xml +++ b/trace/commons/releng/fr.inria.diverse.trace.commons.feature/feature.xml @@ -2,7 +2,7 @@ + version="2.3.0.qualifier"> [Enter Feature Description here.] diff --git a/trace/commons/releng/fr.inria.diverse.trace.commons.feature/pom.xml b/trace/commons/releng/fr.inria.diverse.trace.commons.feature/pom.xml index 765f9d637..b46f27c1e 100644 --- a/trace/commons/releng/fr.inria.diverse.trace.commons.feature/pom.xml +++ b/trace/commons/releng/fr.inria.diverse.trace.commons.feature/pom.xml @@ -5,13 +5,13 @@ org.gemoc.modeldebugging.trace.commons org.gemoc.modeldebugging.trace.commons.feature - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-feature org.gemoc.modeldebugging.trace.commons org.gemoc.modeldebugging.trace.commons.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.ecorext/META-INF/MANIFEST.MF index acaaa00f9..da605a690 100644 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.ecorext/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.inria.diverse.ecorext;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/pom.xml b/trace/generator/plugins/fr.inria.diverse.ecorext/pom.xml index eb0dbd2c9..2baa9fd8c 100644 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.ecorext/pom.xml @@ -4,13 +4,13 @@ 4.0.0 fr.inria.diverse.ecorext fr.inria.diverse.ecorext - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/META-INF/MANIFEST.MF index 4d47918e8..b4a09013a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.inria.diverse.trace.annotations.edit;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Activator: tracingannotations.provider.TracingannotationsEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/pom.xml index c4b676007..9c6aa5dae 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.gemoc.multidimensional_trace_management fr.inria.diverse.trace.annotations.edit - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/META-INF/MANIFEST.MF index f7bd071dc..c4637fb48 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.inria.diverse.trace.annotations.editor;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Activator: tracingannotations.presentation.TracingannotationsEditorPlugin$Implementation Bundle-Vendor: %providerName diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/pom.xml index 5933a2e6e..fef76e9c0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.gemoc.multidimensional_trace_management fr.inria.diverse.trace.annotations.editor - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.annotations/META-INF/MANIFEST.MF index 2f7a5cc1c..03a635e7e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.inria.diverse.trace.annotations;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.annotations/pom.xml index 304c72425..e507cf57e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.gemoc.multidimensional_trace_management fr.inria.diverse.trace.annotations - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/META-INF/MANIFEST.MF index 9358ea09e..4ceb96d27 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: K3 Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.generator.k3;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.xtend.lib, fr.inria.diverse.trace.gemoc.generator, diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/pom.xml index a6bcf510d..ef779c63b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.gemoc.multidimensional_trace_management fr.inria.diverse.trace.gemoc.generator.k3 - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF index bffb976b5..11283d532 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: fr.inria.diverse.tracemm.k3al.generator Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.generator;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/pom.xml index dc0b24070..4220b7057 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.gemoc.multidimensional_trace_management fr.inria.diverse.trace.gemoc.generator - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF index 6478094dd..480b5e7ef 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: fr.inria.diverse.trace.gemoc.wizards Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.ui, diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/pom.xml index 8ae9fe747..6a0c88078 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/pom.xml @@ -4,13 +4,13 @@ 4.0.0 org.gemoc.multidimensional_trace_management fr.inria.diverse.trace.gemoc.ui - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF index 5cb478088..14aab078a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: fr.inria.diverse.tracemm.gemoctrace Bundle-SymbolicName: fr.inria.diverse.trace.gemoc -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", org.gemoc.xdsmlframework.api;bundle-version="0.1.0", diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/pom.xml index c04aacb46..bd4663374 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.gemoc.multidimensional_trace_management fr.inria.diverse.trace.gemoc - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF index cc4fbc604..34f83c70e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.inria.diverse.trace.metamodel.generator;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, com.google.guava, diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/pom.xml index f376a77e1..cff28bc47 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.gemoc.multidimensional_trace_management fr.inria.diverse.trace.metamodel.generator - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/META-INF/MANIFEST.MF index fa5195266..924517666 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: fr.inria.diverse.trace.metamodel.generator.k3al Bundle-SymbolicName: fr.inria.diverse.trace.plaink3.tracematerialextractor -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.emf.ecore, org.eclipse.xtend.core, org.eclipse.xtext, diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/pom.xml index 37d25f86d..35c889f6f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.gemoc.multidimensional_trace_management fr.inria.diverse.trace.plaink3.tracematerialextractor - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF index 848b1fd6d..3b044e37d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Generator Bundle-SymbolicName: fr.inria.diverse.trace.plugin.generator -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/pom.xml index 7f1b02715..c97f3dfa0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/pom.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.gemoc.multidimensional_trace_management fr.inria.diverse.trace.plugin.generator - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/pom.xml b/trace/generator/pom.xml index f6a85c222..6828441e0 100644 --- a/trace/generator/pom.xml +++ b/trace/generator/pom.xml @@ -4,13 +4,13 @@ 4.0.0 org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT pom org.gemoc org.gemoc.siriusanimation.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml index 7d7bc3ca8..51ba6aae9 100644 --- a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml +++ b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml @@ -2,7 +2,7 @@ + version="2.3.0.qualifier"> [Enter Feature Description here.] diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/pom.xml b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/pom.xml index c4eee3bbd..dd1a24383 100644 --- a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/pom.xml +++ b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/pom.xml @@ -5,13 +5,13 @@ org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.feature - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-feature org.gemoc.modeldebugging.trace.generator org.gemoc.modeldebugging.trace.generator.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF index 2d99e3349..818f324f8 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Diffviewer Bundle-SymbolicName: org.gemoc.sequential_addons.diffviewer;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.sequential_addons.diffviewer.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/pom.xml b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/pom.xml index ba18153ba..7692a947c 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/pom.xml +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/pom.xml @@ -5,11 +5,11 @@ org.gemoc.modeldebugging.trace.manager org.gemoc.modeldebugging.trace.manager.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. org.gemoc.sequential_addons.diffviewer eclipse-plugin - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT \ No newline at end of file diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF index 494fa04e6..dcaee6c29 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc MultiDimensional Timeline Addon Bundle-SymbolicName: org.gemoc.sequential_addons.multidimensional.timeline;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.sequential_addons.multidimensional.timeline.Activator Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", org.gemoc.executionframework.engine, diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/pom.xml b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/pom.xml index 22c789f6f..5fa87b250 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/pom.xml +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/pom.xml @@ -5,11 +5,11 @@ org.gemoc.modeldebugging.trace.manager org.gemoc.modeldebugging.trace.manager.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. org.gemoc.sequential_addons.multidimensional.timeline eclipse-plugin - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT \ No newline at end of file diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF index 55c311be7..02934593a 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gemoc.sequential_addons.stategraph;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/pom.xml b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/pom.xml index 514831895..c1530bf15 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/pom.xml +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/pom.xml @@ -5,11 +5,11 @@ org.gemoc.modeldebugging.trace.manager org.gemoc.modeldebugging.trace.manager.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. org.gemoc.sequential_addons.stategraph eclipse-plugin - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT \ No newline at end of file diff --git a/trace/manager/pom.xml b/trace/manager/pom.xml index 3bf06c2ca..311f653e6 100644 --- a/trace/manager/pom.xml +++ b/trace/manager/pom.xml @@ -4,13 +4,13 @@ 4.0.0 org.gemoc.modeldebugging.trace.manager org.gemoc.modeldebugging.trace.manager.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT pom org.gemoc org.gemoc.siriusanimation.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml index be918ecc2..da86a0d36 100644 --- a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml +++ b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml @@ -2,7 +2,7 @@ + version="2.3.0.qualifier"> [Enter Feature Description here.] diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/pom.xml b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/pom.xml index 022124eb4..095f42c03 100644 --- a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/pom.xml +++ b/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/pom.xml @@ -5,13 +5,13 @@ org.gemoc.modeldebugging.trace.manager org.gemoc.modeldebugging.trace.manager.feature - 1.0.0-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-feature org.gemoc.modeldebugging.trace.manager org.gemoc.modeldebugging.trace.manager.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../.. diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF index 458c68e00..2a338496f 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: fr.inria.diverse.trace.benchmark Bundle-SymbolicName: fr.inria.diverse.trace.benchmark -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/META-INF/MANIFEST.MF index 2f738c45b..bda2f9706 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Moliz-models Bundle-SymbolicName: moliz-models -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: moliz_models.Activator Require-Bundle: org.eclipse.core.runtime, org.modelexecution.operationalsemantics.gemoc.sequential.dynamic;bundle-version="1.0.0" diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF index 9faf11902..9dd5ed236 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: fr.inria.diverse.trace.commons.test Bundle-SymbolicName: fr.inria.diverse.trace.commons.testutil -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/META-INF/MANIFEST.MF index c31628c1a..3f8dd7cf6 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: fr.inria.diverse.trace.gemoc.generator.test Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.generator.test -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/META-INF/MANIFEST.MF index f6b39f483..39aa35c16 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test Bundle-SymbolicName: fr.inria.diverse.trace.metamodel.generator.test -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF index 3be87e293..3354d383b 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: fr.inria.diverse.trace.plaink3.tracematerialextractor.test Bundle-SymbolicName: fr.inria.diverse.trace.plaink3.tracematerialextractor.test -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF index 3dfc46de2..5c8b79f06 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.gemoc.sample.tfsm.plaink3.dsa Bundle-SymbolicName: org.gemoc.sample.tfsm.plaink3.dsa;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.xtend2.lib;bundle-version="2.4.3", org.eclipse.emf.ecore;bundle-version="2.9.1";visibility:=reexport, org.eclipse.core.runtime, diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/pom.xml b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/pom.xml index d45432082..e6499002e 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/pom.xml +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/pom.xml @@ -8,13 +8,13 @@ org.gemoc.sample.robotml org.gemoc.sample.robotml.root - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT ../../../RobotML/Language/org.gemoc.sample.robotml.root org.gemoc.sample.tfsm.k3dsa eclipse-plugin - 0.1.0-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/META-INF/MANIFEST.MF index 87b402cdf..71db67864 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: fr.inria.diverse.trace.plugin.generator.test Bundle-SymbolicName: fr.inria.diverse.trace.plugin.generator.test -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/META-INF/MANIFEST.MF index 86a7c1726..7773ccf2a 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: TraceEvaluation Bundle-SymbolicName: fr.inria.diverse.tracemm.semdiff.eval -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.modelexecution.xmof;bundle-version="1.0.0", org.modelexecution.xmof.vm;bundle-version="1.0.0", From 3edf4d9420a4f56e1289b921c194eeb950dc7850 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 23 Jan 2017 17:21:24 +0100 Subject: [PATCH 077/267] sharing a simple checkstyle configuration file It verifies the header for some IP and warn about missing javadocs --- .../GemocCheckstyle6Configuration-Light.xml | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml diff --git a/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml b/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml new file mode 100644 index 000000000..50f872969 --- /dev/null +++ b/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 64fbcf61e208103702427f1ff1063704c2452c31 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 23 Jan 2017 17:41:05 +0100 Subject: [PATCH 078/267] enabling checkstyle to verify IP header --- .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../.checkstyle | 15 +++++++++++++++ .../org.gemoc.executionframework.engine/.project | 6 ++++++ .../.checkstyle | 15 +++++++++++++++ .../.project | 6 ++++++ .../.checkstyle | 15 +++++++++++++++ .../.project | 6 ++++++ .../org.gemoc.executionframework.ui/.checkstyle | 15 +++++++++++++++ .../org.gemoc.executionframework.ui/.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../org.gemoc.xdsmlframework.api/.checkstyle | 13 +++++++++++++ .../plugins/org.gemoc.xdsmlframework.api/.project | 6 ++++++ .../org.gemoc.xdsmlframework.commons/.checkstyle | 13 +++++++++++++ .../org.gemoc.xdsmlframework.commons/.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../pages/DebugRepresentationSelectionPage.java | 2 +- .../org.gemoc.xdsmlframework.ide.ui/.checkstyle | 13 +++++++++++++ .../org.gemoc.xdsmlframework.ide.ui/.project | 6 ++++++ .../org.gemoc.xdsmlframework.ui.utils/.checkstyle | 13 +++++++++++++ .../org.gemoc.xdsmlframework.ui.utils/.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../fr.inria.diverse.trace.api/.checkstyle | 13 +++++++++++++ .../plugins/fr.inria.diverse.trace.api/.project | 6 ++++++ .../fr.inria.diverse.trace.commons/.checkstyle | 13 +++++++++++++ .../fr.inria.diverse.trace.commons/.project | 6 ++++++ .../fr.inria.diverse.trace.gemoc.api/.checkstyle | 13 +++++++++++++ .../fr.inria.diverse.trace.gemoc.api/.project | 6 ++++++ .../plugins/fr.inria.diverse.ecorext/.checkstyle | 13 +++++++++++++ .../plugins/fr.inria.diverse.ecorext/.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../fr.inria.diverse.trace.annotations/.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../fr.inria.diverse.trace.gemoc.ui/.checkstyle | 13 +++++++++++++ .../fr.inria.diverse.trace.gemoc.ui/.project | 6 ++++++ .../fr.inria.diverse.trace.gemoc/.checkstyle | 13 +++++++++++++ .../plugins/fr.inria.diverse.trace.gemoc/.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ .../.checkstyle | 13 +++++++++++++ .../.project | 6 ++++++ 59 files changed, 560 insertions(+), 1 deletion(-) create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.checkstyle create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.engine/.checkstyle create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.checkstyle create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.checkstyle create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.ui/.checkstyle create mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.checkstyle create mode 100644 framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.checkstyle create mode 100644 framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/.checkstyle create mode 100644 framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.checkstyle create mode 100644 framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.checkstyle create mode 100644 framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.checkstyle create mode 100644 java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.checkstyle create mode 100644 java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.checkstyle create mode 100644 java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.checkstyle create mode 100644 java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.checkstyle create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/.checkstyle create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons/.checkstyle create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.annotations/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.checkstyle b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.project b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.project index a1b91a0b9..72dc08dd8 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.project +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.project @@ -30,11 +30,17 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature net.sourceforge.metrics.nature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.checkstyle b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.checkstyle new file mode 100644 index 000000000..a16590b7c --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.checkstyle @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.project b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.project index 9c853d539..7ed2ff703 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.project +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.project @@ -30,11 +30,17 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature net.sourceforge.metrics.nature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.checkstyle b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.checkstyle new file mode 100644 index 000000000..a16590b7c --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.checkstyle @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.project b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.project index 9402dc2ff..93a9bcddf 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.project +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.checkstyle b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.checkstyle new file mode 100644 index 000000000..a16590b7c --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.checkstyle @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.project b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.project index 4660f6755..a1f4f7741 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.project +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.checkstyle b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.checkstyle new file mode 100644 index 000000000..a16590b7c --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.checkstyle @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.project b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.project index 1d8560ef9..0657c0a39 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.project +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.checkstyle b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.project b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.project index df3aef49c..a8e457155 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.project +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.checkstyle b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.project b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.project index a3cd1130e..1c0f0a1ec 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.project +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/.checkstyle b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/.project b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/.project index 09d6198de..0c7977961 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/.project +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.checkstyle b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.project b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.project index 8745d8b71..2eed44cc9 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.project +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java index e338546bf..9c2755eec 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java @@ -44,7 +44,7 @@ public class DebugRepresentationSelectionPage extends WizardPage { public static final int ADD_DEBUG_LAYER = 2; - private final Button radio[] = new Button[3]; + private final Button[] radio = new Button[3]; private int selected = -1; diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.checkstyle b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.project b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.project index a8c95ee9a..475e1e5fb 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.project +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.checkstyle b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.project b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.project index 3be71689c..471ceba53 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.project +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.checkstyle b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.project b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.project index c69f228ab..85b3cf361 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.project +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.checkstyle b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.project b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.project index 150dada7c..d6facc159 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.project +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.checkstyle b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.project b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.project index f28f47fa2..422ebf1e5 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.project +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.checkstyle b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.project b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.project index 7b5f1ecf4..a33595749 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.project +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/.checkstyle b/trace/commons/plugins/fr.inria.diverse.trace.api/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.api/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/.project b/trace/commons/plugins/fr.inria.diverse.trace.api/.project index f22c10743..8427f0797 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/.project +++ b/trace/commons/plugins/fr.inria.diverse.trace.api/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/.checkstyle b/trace/commons/plugins/fr.inria.diverse.trace.commons/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/.project b/trace/commons/plugins/fr.inria.diverse.trace.commons/.project index 46c666b54..1df09ed5d 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons/.project +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.checkstyle b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project index 3fa612cf5..60e7deeb2 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle b/trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/.project b/trace/generator/plugins/fr.inria.diverse.ecorext/.project index d8be99cc7..cdc3a0854 100644 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/.project +++ b/trace/generator/plugins/fr.inria.diverse.ecorext/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.project b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.project index 1a77bdba1..15b07e4f2 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.project b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.project index 302fe0ceb..f7abaa72d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.annotations/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/.project b/trace/generator/plugins/fr.inria.diverse.trace.annotations/.project index ccece5e69..f6ae7a41d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.project b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.project index 14e147876..678f97180 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.project b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.project index 5e3fb6521..75712fb3b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.project b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.project index 3b6a23cce..ec689a054 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.project b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.project index 57803987f..ee8d1d290 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.project b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.project index 698f50837..e728ad2b1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.project b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.project index 1bb109f57..e99db4b56 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.project b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.project index 7dfa1d1ea..4e622ac06 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.project @@ -25,10 +25,16 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature From bf04860e459913e61893984c51f1645480286e3b Mon Sep 17 00:00:00 2001 From: d-leroy Date: Wed, 25 Jan 2017 11:17:22 +0100 Subject: [PATCH 079/267] Updated trace metamodel --- .../model/GenericTrace.aird | 2860 +++++++++++++++++ .../model/GenericTrace.ecore | 197 +- .../model/GenericTrace.genmodel | 52 +- .../model/trace/BooleanAttributeValue.java | 50 + .../trace/commons/model/trace/Dimension.java | 41 + .../model/trace/GenericAttributeValue.java | 17 + .../commons/model/trace/GenericDimension.java | 50 + .../model/trace/GenericReferenceValue.java | 49 + .../commons/model/trace/GenericState.java | 17 + .../commons/model/trace/GenericTrace.java | 16 + .../model/trace/GenericTracedObject.java | 19 + .../model/trace/IntegerAttributevalue.java | 49 + .../model/trace/LaunchConfiguration.java | 15 +- .../trace/LaunchConfigurationParameter.java | 32 - .../trace/RepresentationURIParameter.java | 17 - .../trace/commons/model/trace/State.java | 43 + .../model/trace/StringAttributeValue.java | 49 + .../trace/commons/model/trace/Trace.java | 40 +- .../commons/model/trace/TraceFactory.java | 106 +- .../commons/model/trace/TracePackage.java | 1514 +++++++-- .../commons/model/trace/TracedObject.java | 41 + .../trace/commons/model/trace/Value.java | 43 + .../trace/impl/BooleanAttributeValueImpl.java | 162 + .../model/trace/impl/DimensionImpl.java | 152 + .../trace/impl/GenericAttributeValueImpl.java | 37 + .../trace/impl/GenericDimensionImpl.java | 156 + .../model/trace/impl/GenericMSEImpl.java | 18 +- .../trace/impl/GenericReferenceValueImpl.java | 157 + .../model/trace/impl/GenericStateImpl.java | 37 + .../model/trace/impl/GenericTraceImpl.java | 83 + .../trace/impl/GenericTracedObjectImpl.java | 57 + .../trace/impl/IntegerAttributevalueImpl.java | 162 + .../trace/impl/LaunchConfigurationImpl.java | 47 +- .../LaunchConfigurationParameterImpl.java | 124 - .../commons/model/trace/impl/StateImpl.java | 163 + .../trace/impl/StringAttributeValueImpl.java | 162 + .../model/trace/impl/TraceFactoryImpl.java | 127 +- .../commons/model/trace/impl/TraceImpl.java | 82 +- .../model/trace/impl/TracePackageImpl.java | 513 ++- .../model/trace/impl/TracedObjectImpl.java | 150 + .../commons/model/trace/impl/ValueImpl.java | 162 + .../model/trace/util/TraceAdapterFactory.java | 294 +- .../commons/model/trace/util/TraceSwitch.java | 441 ++- .../META-INF/MANIFEST.MF | 11 +- .../build.properties | 7 +- .../model/base.aird | 1142 +++++++ .../model/base.ecore | 46 +- .../plugin.properties | 4 + .../plugin.xml | 33 + .../src/base/BaseFactory.java | 42 + .../src/base/BasePackage.java | 169 + .../src/base/SpecificTrace.java | 27 + .../base/States/SpecificAttributeValue.java | 40 + .../src/base/States/SpecificDimension.java | 18 + .../base/States/SpecificReferenceValue.java | 40 + .../src/base/States/SpecificState.java | 65 + .../src/base/States/SpecificTracedObject.java | 18 + .../src/base/States/SpecificValue.java | 19 + .../src/base/States/StatesFactory.java | 42 + .../src/base/States/StatesPackage.java | 541 ++++ .../States/impl/SpecificDimensionImpl.java | 54 + .../base/States/impl/SpecificStateImpl.java | 207 ++ .../States/impl/SpecificTracedObjectImpl.java | 57 + .../base/States/impl/SpecificValueImpl.java | 39 + .../base/States/impl/StatesFactoryImpl.java | 95 + .../base/States/impl/StatesPackageImpl.java | 358 +++ .../States/util/StatesAdapterFactory.java | 287 ++ .../src/base/States/util/StatesSwitch.java | 288 ++ .../src/base/Steps/RootImplicitStep.java | 18 + .../src/base/Steps/SpecificStep.java | 83 + .../src/base/Steps/StepsFactory.java | 42 + .../src/base/Steps/StepsPackage.java | 256 ++ .../base/Steps/impl/RootImplicitStepImpl.java | 39 + .../src/base/Steps/impl/StepsFactoryImpl.java | 95 + .../src/base/Steps/impl/StepsPackageImpl.java | 233 ++ .../base/Steps/util/StepsAdapterFactory.java | 177 + .../src/base/Steps/util/StepsSwitch.java | 167 + .../src/base/impl/BaseFactoryImpl.java | 95 + .../src/base/impl/BasePackageImpl.java | 213 ++ .../src/base/impl/SpecificTraceImpl.java | 90 + .../src/base/util/BaseAdapterFactory.java | 140 + .../src/base/util/BaseSwitch.java | 128 + .../metamodel/generator/TraceMMExplorer.xtend | 33 +- .../generator/TraceMMGeneratorStates.xtend | 60 +- .../metamodel/generator/TraceMMStrings.xtend | 20 +- 85 files changed, 13330 insertions(+), 811 deletions(-) create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BooleanAttributeValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericAttributeValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericDimension.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/IntegerAttributevalue.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/RepresentationURIParameter.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/StringAttributeValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BooleanAttributeValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/IntegerAttributevalueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StringAttributeValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.properties create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.xml create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BaseFactory.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificDimension.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesFactory.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesFactoryImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsFactory.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BaseFactoryImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseSwitch.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird new file mode 100644 index 000000000..f7e146a76 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird @@ -0,0 +1,2860 @@ + + + + GenericTrace.ecore + platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore + http://www.eclipse.org/emf/2002/Ecore + + + + + + + + + + + + + + + + + + + + bold + + + + + + + bold + + + + + + + + + + + + + + + + + + + bold + + + + + + + + + + + + + + bold + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + + + + + + + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + bold + + + + + + + + + + + + + + + + + + + + + + + + + + labelSize + bold + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + bold + + + labelSize + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + + italic + + + + + + + + + + + + + italic + + + + + + + + + + + + + italic + + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + labelSize + + + labelSize + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + routingStyle + + + italic + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + italic + + + + + + + + + + italic + + + + + + + + + + italic + + + + + + + + + + + + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + routingStyle + + + italic + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + labelSize + + + labelSize + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + labelSize + + + labelSize + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + bold + + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index 077904440..55a083a0e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -1,104 +1,167 @@ - + - - - - - - - + + + - - - - - - - - + + + - - - - - - - - - - - - - - - + + + + + + + - + - + - + - - + + - + - + - - + + - + - - + + - - + + - - + + - - + + - - + + + + + + + + + + - + - - - - + + + + + + + + + + + + - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel index aa2156806..afdcfb171 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel @@ -46,18 +46,48 @@ + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BooleanAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BooleanAttributeValue.java new file mode 100644 index 000000000..2e0d31bbd --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BooleanAttributeValue.java @@ -0,0 +1,50 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + + +/** + * + * A representation of the model object 'Boolean Attribute Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue#isAttributeValue Attribute Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getBooleanAttributeValue() + * @model + * @generated + */ +public interface BooleanAttributeValue extends GenericAttributeValue { + /** + * Returns the value of the 'Attribute Value' attribute. + * The default value is "false". + * + *

+ * If the meaning of the 'Attribute Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Attribute Value' attribute. + * @see #setAttributeValue(boolean) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getBooleanAttributeValue_AttributeValue() + * @model default="false" + * @generated + */ + boolean isAttributeValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue#isAttributeValue Attribute Value}' attribute. + * + * + * @param value the new value of the 'Attribute Value' attribute. + * @see #isAttributeValue() + * @generated + */ + void setAttributeValue(boolean value); + +} // BooleanAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java new file mode 100644 index 000000000..3de42296f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java @@ -0,0 +1,41 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Dimension'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Dimension#getValues Values}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getDimension() + * @model abstract="true" + * @generated + */ +public interface Dimension extends EObject { + /** + * Returns the value of the 'Values' containment reference list. + * + *

+ * If the meaning of the 'Values' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Values' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getDimension_Values() + * @model containment="true" + * @generated + */ + EList getValues(); + +} // Dimension diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericAttributeValue.java new file mode 100644 index 000000000..df089b6f8 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericAttributeValue.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + + +/** + * + * A representation of the model object 'Generic Attribute Value'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericAttributeValue() + * @model abstract="true" + * @generated + */ +public interface GenericAttributeValue extends Value { +} // GenericAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericDimension.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericDimension.java new file mode 100644 index 000000000..2dd1a9ab2 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericDimension.java @@ -0,0 +1,50 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.ecore.EStructuralFeature; + +/** + * + * A representation of the model object 'Generic Dimension'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericDimension#getDynamicProperty Dynamic Property}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericDimension() + * @model + * @generated + */ +public interface GenericDimension extends Dimension { + /** + * Returns the value of the 'Dynamic Property' reference. + * + *

+ * If the meaning of the 'Dynamic Property' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Dynamic Property' reference. + * @see #setDynamicProperty(EStructuralFeature) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericDimension_DynamicProperty() + * @model + * @generated + */ + EStructuralFeature getDynamicProperty(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericDimension#getDynamicProperty Dynamic Property}' reference. + * + * + * @param value the new value of the 'Dynamic Property' reference. + * @see #getDynamicProperty() + * @generated + */ + void setDynamicProperty(EStructuralFeature value); + +} // GenericDimension diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java new file mode 100644 index 000000000..87632948f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java @@ -0,0 +1,49 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + + +/** + * + * A representation of the model object 'Generic Reference Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue#getReferenceValue Reference Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericReferenceValue() + * @model + * @generated + */ +public interface GenericReferenceValue extends Value { + /** + * Returns the value of the 'Reference Value' reference. + * + *

+ * If the meaning of the 'Reference Value' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Reference Value' reference. + * @see #setReferenceValue(Object) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericReferenceValue_ReferenceValue() + * @model kind="reference" + * @generated + */ + T getReferenceValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue#getReferenceValue Reference Value}' reference. + * + * + * @param value the new value of the 'Reference Value' reference. + * @see #getReferenceValue() + * @generated + */ + void setReferenceValue(T value); + +} // GenericReferenceValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java new file mode 100644 index 000000000..2ece4b923 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + + +/** + * + * A representation of the model object 'Generic State'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState() + * @model + * @generated + */ +public interface GenericState extends State { +} // GenericState diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java new file mode 100644 index 000000000..95f625885 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java @@ -0,0 +1,16 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +/** + * + * A representation of the model object 'Generic Trace'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericTrace() + * @model + * @generated + */ +public interface GenericTrace extends Trace, GenericState> { +} // GenericTrace diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java new file mode 100644 index 000000000..54a1f40cb --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java @@ -0,0 +1,19 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.ecore.EObject; + + +/** + * + * A representation of the model object 'Generic Traced Object'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericTracedObject() + * @model + * @generated + */ +public interface GenericTracedObject extends TracedObject { +} // GenericTracedObject diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/IntegerAttributevalue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/IntegerAttributevalue.java new file mode 100644 index 000000000..cee126784 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/IntegerAttributevalue.java @@ -0,0 +1,49 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + + +/** + * + * A representation of the model object 'Integer Attributevalue'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue#getAttributeValue Attribute Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getIntegerAttributevalue() + * @model + * @generated + */ +public interface IntegerAttributevalue extends GenericAttributeValue { + /** + * Returns the value of the 'Attribute Value' attribute. + * + *

+ * If the meaning of the 'Attribute Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Attribute Value' attribute. + * @see #setAttributeValue(int) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getIntegerAttributevalue_AttributeValue() + * @model + * @generated + */ + int getAttributeValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue#getAttributeValue Attribute Value}' attribute. + * + * + * @param value the new value of the 'Attribute Value' attribute. + * @see #getAttributeValue() + * @generated + */ + void setAttributeValue(int value); + +} // IntegerAttributevalue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java index fadb3951e..fcaf17a29 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java @@ -15,7 +15,7 @@ * The following features are supported: *

*
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getParameters Parameters}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getLaunchconfigurationparameter Launchconfigurationparameter}
    • *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getType Type}
    • *
* @@ -25,24 +25,23 @@ */ public interface LaunchConfiguration extends EObject { /** - * Returns the value of the 'Parameters' containment reference list. + * Returns the value of the 'Launchconfigurationparameter' containment reference list. * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter}. * *

- * If the meaning of the 'Parameters' containment reference list isn't clear, + * If the meaning of the 'Launchconfigurationparameter' containment reference list isn't clear, * there really should be more of a description here... *

* - * @return the value of the 'Parameters' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfiguration_Parameters() + * @return the value of the 'Launchconfigurationparameter' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfiguration_Launchconfigurationparameter() * @model containment="true" * @generated */ - EList getParameters(); + EList getLaunchconfigurationparameter(); /** * Returns the value of the 'Type' attribute. - * The default value is "". * *

* If the meaning of the 'Type' attribute isn't clear, @@ -52,7 +51,7 @@ public interface LaunchConfiguration extends EObject { * @return the value of the 'Type' attribute. * @see #setType(String) * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfiguration_Type() - * @model default="" required="true" + * @model required="true" * @generated */ String getType(); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java index eade4106d..87db548b6 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java @@ -9,42 +9,10 @@ * A representation of the model object 'Launch Configuration Parameter'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue Value}
    • - *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfigurationParameter() * @model abstract="true" * @generated */ public interface LaunchConfigurationParameter extends EObject { - /** - * Returns the value of the 'Value' attribute. - * - *

- * If the meaning of the 'Value' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Value' attribute. - * @see #setValue(String) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfigurationParameter_Value() - * @model - * @generated - */ - String getValue(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue Value}' attribute. - * - * - * @param value the new value of the 'Value' attribute. - * @see #getValue() - * @generated - */ - void setValue(String value); - } // LaunchConfigurationParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/RepresentationURIParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/RepresentationURIParameter.java deleted file mode 100644 index 9d7e05acb..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/RepresentationURIParameter.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Representation URI Parameter'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getRepresentationURIParameter() - * @model - * @generated - */ -public interface RepresentationURIParameter extends LaunchConfigurationParameter { -} // RepresentationURIParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java new file mode 100644 index 000000000..70e9dfac2 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java @@ -0,0 +1,43 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'State'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getValue Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState() + * @model abstract="true" + * @generated + */ +public interface State extends EObject { + /** + * Returns the value of the 'Value' reference list. + * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.Value}. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Value#getState State}'. + * + *

+ * If the meaning of the 'Value' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Value' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_Value() + * @see fr.inria.diverse.trace.commons.model.trace.Value#getState + * @model opposite="state" + * @generated + */ + EList getValue(); + +} // State diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/StringAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/StringAttributeValue.java new file mode 100644 index 000000000..a22a8476a --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/StringAttributeValue.java @@ -0,0 +1,49 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + + +/** + * + * A representation of the model object 'String Attribute Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.StringAttributeValue#getAttributeValue Attribute Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStringAttributeValue() + * @model + * @generated + */ +public interface StringAttributeValue extends GenericAttributeValue { + /** + * Returns the value of the 'Attribute Value' attribute. + * + *

+ * If the meaning of the 'Attribute Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Attribute Value' attribute. + * @see #setAttributeValue(String) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStringAttributeValue_AttributeValue() + * @model + * @generated + */ + String getAttributeValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.StringAttributeValue#getAttributeValue Attribute Value}' attribute. + * + * + * @param value the new value of the 'Attribute Value' attribute. + * @see #getAttributeValue() + * @generated + */ + void setAttributeValue(String value); + +} // StringAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java index f95d7dfa3..1d0da5d57 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java @@ -2,6 +2,8 @@ */ package fr.inria.diverse.trace.commons.model.trace; +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EObject; /** @@ -14,14 +16,16 @@ *

*
    *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects Traced Objects}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getStates States}
    • *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}
    • *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace() - * @model + * @model abstract="true" * @generated */ -public interface Trace extends EObject { +public interface Trace extends EObject { /** * Returns the value of the 'Root Step' containment reference. * @@ -48,11 +52,41 @@ public interface Trace extends EObject { */ void setRootStep(StepSubType value); + /** + * Returns the value of the 'Traced Objects' containment reference list. + * + *

+ * If the meaning of the 'Traced Objects' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Traced Objects' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_TracedObjects() + * @model kind="reference" containment="true" + * @generated + */ + EList getTracedObjects(); + + /** + * Returns the value of the 'States' containment reference list. + * + *

+ * If the meaning of the 'States' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'States' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_States() + * @model kind="reference" containment="true" + * @generated + */ + EList getStates(); + /** * Returns the value of the 'Launchconfiguration' containment reference. * *

- * If the meaning of the 'Launchconfiguration' containment reference isn't clear, + * If the meaning of the 'Launchconfiguration' containment reference list isn't clear, * there really should be more of a description here... *

* diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java index fffb8760c..c14ca6277 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java @@ -3,6 +3,7 @@ package fr.inria.diverse.trace.commons.model.trace; import org.eclipse.emf.ecore.EFactory; +import org.eclipse.emf.ecore.EObject; /** * @@ -94,13 +95,76 @@ public interface TraceFactory extends EFactory { GenericSmallStep createGenericSmallStep(); /** - * Returns a new object of class 'Trace'. + * Returns a new object of class 'Generic Reference Value'. * * - * @return a new object of class 'Trace'. + * @return a new object of class 'Generic Reference Value'. * @generated */ - Trace createTrace(); + GenericReferenceValue createGenericReferenceValue(); + + /** + * Returns a new object of class 'Generic Dimension'. + * + * + * @return a new object of class 'Generic Dimension'. + * @generated + */ + GenericDimension createGenericDimension(); + + /** + * Returns a new object of class 'Generic Traced Object'. + * + * + * @return a new object of class 'Generic Traced Object'. + * @generated + */ + GenericTracedObject createGenericTracedObject(); + + /** + * Returns a new object of class 'Generic State'. + * + * + * @return a new object of class 'Generic State'. + * @generated + */ + GenericState createGenericState(); + + /** + * Returns a new object of class 'Generic Trace'. + * + * + * @return a new object of class 'Generic Trace'. + * @generated + */ + GenericTrace createGenericTrace(); + + /** + * Returns a new object of class 'Boolean Attribute Value'. + * + * + * @return a new object of class 'Boolean Attribute Value'. + * @generated + */ + BooleanAttributeValue createBooleanAttributeValue(); + + /** + * Returns a new object of class 'Integer Attributevalue'. + * + * + * @return a new object of class 'Integer Attributevalue'. + * @generated + */ + IntegerAttributevalue createIntegerAttributevalue(); + + /** + * Returns a new object of class 'String Attribute Value'. + * + * + * @return a new object of class 'String Attribute Value'. + * @generated + */ + StringAttributeValue createStringAttributeValue(); /** * Returns a new object of class 'Launch Configuration'. @@ -120,6 +184,15 @@ public interface TraceFactory extends EFactory { */ LanguageNameParameter createLanguageNameParameter(); + /** + * Returns a new object of class 'Addon Extension Parameter'. + * + * + * @return a new object of class 'Addon Extension Parameter'. + * @generated + */ + AddonExtensionParameter createAddonExtensionParameter(); + /** * Returns a new object of class 'Model URI Parameter'. * @@ -148,40 +221,31 @@ public interface TraceFactory extends EFactory { EntryPointParameter createEntryPointParameter(); /** - * Returns a new object of class 'Model Root Parameter'. - * - * - * @return a new object of class 'Model Root Parameter'. - * @generated - */ - ModelRootParameter createModelRootParameter(); - - /** - * Returns a new object of class 'Initialization Method Parameter'. + * Returns a new object of class 'Initialization Arguments Parameter'. * * - * @return a new object of class 'Initialization Method Parameter'. + * @return a new object of class 'Initialization Arguments Parameter'. * @generated */ - InitializationMethodParameter createInitializationMethodParameter(); + InitializationArgumentsParameter createInitializationArgumentsParameter(); /** - * Returns a new object of class 'Initialization Arguments Parameter'. + * Returns a new object of class 'Model Root Parameter'. * * - * @return a new object of class 'Initialization Arguments Parameter'. + * @return a new object of class 'Model Root Parameter'. * @generated */ - InitializationArgumentsParameter createInitializationArgumentsParameter(); + ModelRootParameter createModelRootParameter(); /** - * Returns a new object of class 'Addon Extension Parameter'. + * Returns a new object of class 'Initialization Method Parameter'. * * - * @return a new object of class 'Addon Extension Parameter'. + * @return a new object of class 'Initialization Method Parameter'. * @generated */ - AddonExtensionParameter createAddonExtensionParameter(); + InitializationMethodParameter createInitializationMethodParameter(); /** * Returns the package supported by this factory. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java index a72c5e786..b43692620 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java @@ -675,6 +675,24 @@ public interface TracePackage extends EPackage { */ int TRACE__ROOT_STEP = 0; + /** + * The feature id for the 'Traced Objects' containment reference list. + * + * + * @generated + * @ordered + */ + int TRACE__TRACED_OBJECTS = 1; + + /** + * The feature id for the 'States' containment reference list. + * + * + * @generated + * @ordered + */ + int TRACE__STATES = 2; + /** * The feature id for the 'Launchconfiguration' containment reference. * @@ -682,7 +700,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int TRACE__LAUNCHCONFIGURATION = 1; + int TRACE__LAUNCHCONFIGURATION = 3; /** * The number of structural features of the 'Trace' class. @@ -691,7 +709,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int TRACE_FEATURE_COUNT = 2; + int TRACE_FEATURE_COUNT = 4; /** * The number of operations of the 'Trace' class. @@ -703,673 +721,1396 @@ public interface TracePackage extends EPackage { int TRACE_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl Launch Configuration}' class. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl Traced Object}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLaunchConfiguration() + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTracedObject() * @generated */ - int LAUNCH_CONFIGURATION = 13; + int TRACED_OBJECT = 13; /** - * The feature id for the 'Parameters' containment reference list. + * The feature id for the 'Dimensions' containment reference list. * * * @generated * @ordered */ - int LAUNCH_CONFIGURATION__PARAMETERS = 0; + int TRACED_OBJECT__DIMENSIONS = 0; /** - * The feature id for the 'Type' attribute. + * The number of structural features of the 'Traced Object' class. * * * @generated * @ordered */ - int LAUNCH_CONFIGURATION__TYPE = 1; + int TRACED_OBJECT_FEATURE_COUNT = 1; /** - * The number of structural features of the 'Launch Configuration' class. + * The number of operations of the 'Traced Object' class. * * * @generated * @ordered */ - int LAUNCH_CONFIGURATION_FEATURE_COUNT = 2; + int TRACED_OBJECT_OPERATION_COUNT = 0; /** - * The number of operations of the 'Launch Configuration' class. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getDimension() + * @generated + */ + int DIMENSION = 14; + + /** + * The feature id for the 'Values' containment reference list. * * * @generated * @ordered */ - int LAUNCH_CONFIGURATION_OPERATION_COUNT = 0; + int DIMENSION__VALUES = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl Launch Configuration Parameter}' class. + * The number of structural features of the 'Dimension' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLaunchConfigurationParameter() * @generated + * @ordered */ - int LAUNCH_CONFIGURATION_PARAMETER = 14; + int DIMENSION_FEATURE_COUNT = 1; /** - * The feature id for the 'Value' attribute. + * The number of operations of the 'Dimension' class. * * * @generated * @ordered */ - int LAUNCH_CONFIGURATION_PARAMETER__VALUE = 0; + int DIMENSION_OPERATION_COUNT = 0; /** - * The number of structural features of the 'Launch Configuration Parameter' class. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getValue() + * @generated + */ + int VALUE = 15; + + /** + * The feature id for the 'State' reference list. * * * @generated * @ordered */ - int LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT = 1; + int VALUE__STATE = 0; /** - * The number of operations of the 'Launch Configuration Parameter' class. + * The number of structural features of the 'Value' class. * * * @generated * @ordered */ - int LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT = 0; + int VALUE_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl Language Name Parameter}' class. + * The number of operations of the 'Value' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLanguageNameParameter() + * @generated + * @ordered + */ + int VALUE_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.StateImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getState() * @generated */ - int LANGUAGE_NAME_PARAMETER = 15; + int STATE = 16; /** - * The feature id for the 'Value' attribute. + * The feature id for the 'Value' reference list. * * * @generated * @ordered */ - int LANGUAGE_NAME_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + int STATE__VALUE = 0; /** - * The number of structural features of the 'Language Name Parameter' class. + * The number of structural features of the 'State' class. * * * @generated * @ordered */ - int LANGUAGE_NAME_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + int STATE_FEATURE_COUNT = 1; /** - * The number of operations of the 'Language Name Parameter' class. + * The number of operations of the 'State' class. * * * @generated * @ordered */ - int LANGUAGE_NAME_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + int STATE_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ModelURIParameterImpl Model URI Parameter}' class. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl Generic Reference Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ModelURIParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getModelURIParameter() + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericReferenceValue() * @generated */ - int MODEL_URI_PARAMETER = 16; + int GENERIC_REFERENCE_VALUE = 17; /** - * The feature id for the 'Value' attribute. + * The feature id for the 'State' reference list. * * * @generated * @ordered */ - int MODEL_URI_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + int GENERIC_REFERENCE_VALUE__STATE = VALUE__STATE; /** - * The number of structural features of the 'Model URI Parameter' class. + * The feature id for the 'Reference Value' reference. * * * @generated * @ordered */ - int MODEL_URI_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + int GENERIC_REFERENCE_VALUE__REFERENCE_VALUE = VALUE_FEATURE_COUNT + 0; /** - * The number of operations of the 'Model URI Parameter' class. + * The number of structural features of the 'Generic Reference Value' class. * * * @generated * @ordered */ - int MODEL_URI_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + int GENERIC_REFERENCE_VALUE_FEATURE_COUNT = VALUE_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.AnimatorURIParameterImpl Animator URI Parameter}' class. + * The number of operations of the 'Generic Reference Value' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.AnimatorURIParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getAnimatorURIParameter() + * @generated + * @ordered + */ + int GENERIC_REFERENCE_VALUE_OPERATION_COUNT = VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl Generic Dimension}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericDimension() * @generated */ - int ANIMATOR_URI_PARAMETER = 17; + int GENERIC_DIMENSION = 18; /** - * The feature id for the 'Value' attribute. + * The feature id for the 'Values' containment reference list. * * * @generated * @ordered */ - int ANIMATOR_URI_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + int GENERIC_DIMENSION__VALUES = DIMENSION__VALUES; /** - * The number of structural features of the 'Animator URI Parameter' class. + * The feature id for the 'Dynamic Property' reference. * * * @generated * @ordered */ - int ANIMATOR_URI_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + int GENERIC_DIMENSION__DYNAMIC_PROPERTY = DIMENSION_FEATURE_COUNT + 0; /** - * The number of operations of the 'Animator URI Parameter' class. + * The number of structural features of the 'Generic Dimension' class. * * * @generated * @ordered */ - int ANIMATOR_URI_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + int GENERIC_DIMENSION_FEATURE_COUNT = DIMENSION_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.EntryPointParameterImpl Entry Point Parameter}' class. + * The number of operations of the 'Generic Dimension' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.EntryPointParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getEntryPointParameter() + * @generated + * @ordered + */ + int GENERIC_DIMENSION_OPERATION_COUNT = DIMENSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTracedObjectImpl Generic Traced Object}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericTracedObjectImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericTracedObject() * @generated */ - int ENTRY_POINT_PARAMETER = 18; + int GENERIC_TRACED_OBJECT = 19; /** - * The feature id for the 'Value' attribute. + * The feature id for the 'Dimensions' containment reference list. * * * @generated * @ordered */ - int ENTRY_POINT_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + int GENERIC_TRACED_OBJECT__DIMENSIONS = TRACED_OBJECT__DIMENSIONS; /** - * The number of structural features of the 'Entry Point Parameter' class. + * The number of structural features of the 'Generic Traced Object' class. * * * @generated * @ordered */ - int ENTRY_POINT_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + int GENERIC_TRACED_OBJECT_FEATURE_COUNT = TRACED_OBJECT_FEATURE_COUNT + 0; /** - * The number of operations of the 'Entry Point Parameter' class. + * The number of operations of the 'Generic Traced Object' class. * * * @generated * @ordered */ - int ENTRY_POINT_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + int GENERIC_TRACED_OBJECT_OPERATION_COUNT = TRACED_OBJECT_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ModelRootParameterImpl Model Root Parameter}' class. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl Generic State}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ModelRootParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getModelRootParameter() + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericState() * @generated */ - int MODEL_ROOT_PARAMETER = 19; + int GENERIC_STATE = 20; /** - * The feature id for the 'Value' attribute. + * The feature id for the 'Value' reference list. * * * @generated * @ordered */ - int MODEL_ROOT_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + int GENERIC_STATE__VALUE = STATE__VALUE; /** - * The number of structural features of the 'Model Root Parameter' class. + * The number of structural features of the 'Generic State' class. * * * @generated * @ordered */ - int MODEL_ROOT_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + int GENERIC_STATE_FEATURE_COUNT = STATE_FEATURE_COUNT + 0; /** - * The number of operations of the 'Model Root Parameter' class. + * The number of operations of the 'Generic State' class. * * * @generated * @ordered */ - int MODEL_ROOT_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + int GENERIC_STATE_OPERATION_COUNT = STATE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.InitializationMethodParameterImpl Initialization Method Parameter}' class. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl Generic Trace}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.InitializationMethodParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getInitializationMethodParameter() + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericTrace() * @generated */ - int INITIALIZATION_METHOD_PARAMETER = 20; + int GENERIC_TRACE = 21; /** - * The feature id for the 'Value' attribute. + * The feature id for the 'Root Step' containment reference. * * * @generated * @ordered */ - int INITIALIZATION_METHOD_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + int GENERIC_TRACE__ROOT_STEP = TRACE__ROOT_STEP; /** - * The number of structural features of the 'Initialization Method Parameter' class. + * The feature id for the 'Traced Objects' containment reference list. * * * @generated * @ordered */ - int INITIALIZATION_METHOD_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + int GENERIC_TRACE__TRACED_OBJECTS = TRACE__TRACED_OBJECTS; /** - * The number of operations of the 'Initialization Method Parameter' class. + * The feature id for the 'States' containment reference list. * * * @generated * @ordered */ - int INITIALIZATION_METHOD_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + int GENERIC_TRACE__STATES = TRACE__STATES; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. + * The feature id for the 'Launchconfiguration' containment reference. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getInitializationArgumentsParameter() * @generated + * @ordered */ - int INITIALIZATION_ARGUMENTS_PARAMETER = 21; + int GENERIC_TRACE__LAUNCHCONFIGURATION = TRACE__LAUNCHCONFIGURATION; /** - * The feature id for the 'Value' attribute. + * The number of structural features of the 'Generic Trace' class. * * * @generated * @ordered */ - int INITIALIZATION_ARGUMENTS_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + int GENERIC_TRACE_FEATURE_COUNT = TRACE_FEATURE_COUNT + 0; /** - * The number of structural features of the 'Initialization Arguments Parameter' class. + * The number of operations of the 'Generic Trace' class. * * * @generated * @ordered */ - int INITIALIZATION_ARGUMENTS_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + int GENERIC_TRACE_OPERATION_COUNT = TRACE_OPERATION_COUNT + 0; /** - * The number of operations of the 'Initialization Arguments Parameter' class. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericAttributeValueImpl Generic Attribute Value}' class. * * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericAttributeValue() * @generated - * @ordered */ - int INITIALIZATION_ARGUMENTS_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + int GENERIC_ATTRIBUTE_VALUE = 22; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. + * The feature id for the 'State' reference list. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getAddonExtensionParameter() * @generated + * @ordered */ - int ADDON_EXTENSION_PARAMETER = 22; + int GENERIC_ATTRIBUTE_VALUE__STATE = VALUE__STATE; /** - * The feature id for the 'Value' attribute. + * The number of structural features of the 'Generic Attribute Value' class. * * * @generated * @ordered */ - int ADDON_EXTENSION_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + int GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT = VALUE_FEATURE_COUNT + 0; /** - * The number of structural features of the 'Addon Extension Parameter' class. + * The number of operations of the 'Generic Attribute Value' class. * * * @generated * @ordered */ - int ADDON_EXTENSION_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + int GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT = VALUE_OPERATION_COUNT + 0; /** - * The number of operations of the 'Addon Extension Parameter' class. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. * * + * @see fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getBooleanAttributeValue() * @generated - * @ordered */ - int ADDON_EXTENSION_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + int BOOLEAN_ATTRIBUTE_VALUE = 23; /** - * The meta object id for the 'ISerializable' data type. + * The feature id for the 'State' reference list. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() * @generated + * @ordered */ - int ISERIALIZABLE = 23; + int BOOLEAN_ATTRIBUTE_VALUE__STATE = GENERIC_ATTRIBUTE_VALUE__STATE; + /** + * The feature id for the 'Attribute Value' attribute. + * + * + * @generated + * @ordered + */ + int BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence MSE Occurrence}'. + * The number of structural features of the 'Boolean Attribute Value' class. * * - * @return the meta object for class 'MSE Occurrence'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence * @generated + * @ordered */ - EClass getMSEOccurrence(); + int BOOLEAN_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}'. + * The number of operations of the 'Boolean Attribute Value' class. * * - * @return the meta object for the reference 'Mse'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse() - * @see #getMSEOccurrence() * @generated + * @ordered */ - EReference getMSEOccurrence_Mse(); + int BOOLEAN_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** - * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters Parameters}'. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.IntegerAttributevalueImpl Integer Attributevalue}' class. * * - * @return the meta object for the attribute list 'Parameters'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters() - * @see #getMSEOccurrence() + * @see fr.inria.diverse.trace.commons.model.trace.impl.IntegerAttributevalueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getIntegerAttributevalue() * @generated */ - EAttribute getMSEOccurrence_Parameters(); + int INTEGER_ATTRIBUTEVALUE = 24; /** - * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult Result}'. + * The feature id for the 'State' reference list. * * - * @return the meta object for the attribute list 'Result'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult() - * @see #getMSEOccurrence() * @generated + * @ordered */ - EAttribute getMSEOccurrence_Result(); + int INTEGER_ATTRIBUTEVALUE__STATE = GENERIC_ATTRIBUTE_VALUE__STATE; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSE MSE}'. + * The feature id for the 'Attribute Value' attribute. * * - * @return the meta object for class 'MSE'. - * @see fr.inria.diverse.trace.commons.model.trace.MSE * @generated + * @ordered */ - EClass getMSE(); + int INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.MSE#getCaller() Get Caller}' operation. + * The number of structural features of the 'Integer Attributevalue' class. * * - * @return the meta object for the 'Get Caller' operation. - * @see fr.inria.diverse.trace.commons.model.trace.MSE#getCaller() * @generated + * @ordered */ - EOperation getMSE__GetCaller(); + int INTEGER_ATTRIBUTEVALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.MSE#getAction() Get Action}' operation. + * The number of operations of the 'Integer Attributevalue' class. * * - * @return the meta object for the 'Get Action' operation. - * @see fr.inria.diverse.trace.commons.model.trace.MSE#getAction() * @generated + * @ordered */ - EOperation getMSE__GetAction(); + int INTEGER_ATTRIBUTEVALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel MSE Model}'. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StringAttributeValueImpl String Attribute Value}' class. * * - * @return the meta object for class 'MSE Model'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEModel + * @see fr.inria.diverse.trace.commons.model.trace.impl.StringAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getStringAttributeValue() * @generated */ - EClass getMSEModel(); + int STRING_ATTRIBUTE_VALUE = 25; /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs Owned MS Es}'. + * The feature id for the 'State' reference list. * * - * @return the meta object for the containment reference list 'Owned MS Es'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs() - * @see #getMSEModel() * @generated + * @ordered */ - EReference getMSEModel_OwnedMSEs(); + int STRING_ATTRIBUTE_VALUE__STATE = GENERIC_ATTRIBUTE_VALUE__STATE; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE Generic MSE}'. + * The feature id for the 'Attribute Value' attribute. * * - * @return the meta object for class 'Generic MSE'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE * @generated + * @ordered */ - EClass getGenericMSE(); + int STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}'. + * The number of structural features of the 'String Attribute Value' class. * * - * @return the meta object for the reference 'Caller Reference'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference() - * @see #getGenericMSE() * @generated + * @ordered */ - EReference getGenericMSE_CallerReference(); + int STRING_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}'. + * The number of operations of the 'String Attribute Value' class. * * - * @return the meta object for the reference 'Action Reference'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference() - * @see #getGenericMSE() * @generated + * @ordered */ - EReference getGenericMSE_ActionReference(); + int STRING_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCaller() Get Caller}' operation. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl Launch Configuration}' class. * * - * @return the meta object for the 'Get Caller' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCaller() + * @see fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLaunchConfiguration() * @generated */ - EOperation getGenericMSE__GetCaller(); + int LAUNCH_CONFIGURATION = 26; /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getAction() Get Action}' operation. + * The feature id for the 'Launchconfigurationparameter' containment reference list. * * - * @return the meta object for the 'Get Action' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getAction() * @generated + * @ordered */ - EOperation getGenericMSE__GetAction(); + int LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER = 0; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. + * The feature id for the 'Type' attribute. * * - * @return the meta object for class 'Step'. - * @see fr.inria.diverse.trace.commons.model.trace.Step * @generated + * @ordered */ - EClass getStep(); + int LAUNCH_CONFIGURATION__TYPE = 1; /** - * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}'. + * The number of structural features of the 'Launch Configuration' class. * * - * @return the meta object for the containment reference 'Mseoccurrence'. - * @see fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence() - * @see #getStep() * @generated + * @ordered */ - EReference getStep_Mseoccurrence(); + int LAUNCH_CONFIGURATION_FEATURE_COUNT = 2; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. + * The number of operations of the 'Launch Configuration' class. * * - * @return the meta object for class 'Big Step'. - * @see fr.inria.diverse.trace.commons.model.trace.BigStep * @generated + * @ordered */ - EClass getBigStep(); + int LAUNCH_CONFIGURATION_OPERATION_COUNT = 0; /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps Sub Steps}'. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl Launch Configuration Parameter}' class. * * - * @return the meta object for the containment reference list 'Sub Steps'. - * @see fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps() - * @see #getBigStep() + * @see fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLaunchConfigurationParameter() * @generated */ - EReference getBigStep_SubSteps(); + int LAUNCH_CONFIGURATION_PARAMETER = 27; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. + * The number of structural features of the 'Launch Configuration Parameter' class. * * - * @return the meta object for class 'Small Step'. - * @see fr.inria.diverse.trace.commons.model.trace.SmallStep * @generated + * @ordered */ - EClass getSmallStep(); + int LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT = 0; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. + * The number of operations of the 'Launch Configuration Parameter' class. * * - * @return the meta object for class 'Sequential Step'. - * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep * @generated + * @ordered */ - EClass getSequentialStep(); + int LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT = 0; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.ParallelStep Parallel Step}'. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl Language Name Parameter}' class. * * - * @return the meta object for class 'Parallel Step'. + * @see fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLanguageNameParameter() + * @generated + */ + int LANGUAGE_NAME_PARAMETER = 28; + + /** + * The number of structural features of the 'Language Name Parameter' class. + * + * + * @generated + * @ordered + */ + int LANGUAGE_NAME_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Language Name Parameter' class. + * + * + * @generated + * @ordered + */ + int LANGUAGE_NAME_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getAddonExtensionParameter() + * @generated + */ + int ADDON_EXTENSION_PARAMETER = 29; + + /** + * The number of structural features of the 'Addon Extension Parameter' class. + * + * + * @generated + * @ordered + */ + int ADDON_EXTENSION_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Addon Extension Parameter' class. + * + * + * @generated + * @ordered + */ + int ADDON_EXTENSION_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ModelURIParameterImpl Model URI Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.ModelURIParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getModelURIParameter() + * @generated + */ + int MODEL_URI_PARAMETER = 30; + + /** + * The number of structural features of the 'Model URI Parameter' class. + * + * + * @generated + * @ordered + */ + int MODEL_URI_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Model URI Parameter' class. + * + * + * @generated + * @ordered + */ + int MODEL_URI_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.AnimatorURIParameterImpl Animator URI Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.AnimatorURIParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getAnimatorURIParameter() + * @generated + */ + int ANIMATOR_URI_PARAMETER = 31; + + /** + * The number of structural features of the 'Animator URI Parameter' class. + * + * + * @generated + * @ordered + */ + int ANIMATOR_URI_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Animator URI Parameter' class. + * + * + * @generated + * @ordered + */ + int ANIMATOR_URI_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.EntryPointParameterImpl Entry Point Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.EntryPointParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getEntryPointParameter() + * @generated + */ + int ENTRY_POINT_PARAMETER = 32; + + /** + * The number of structural features of the 'Entry Point Parameter' class. + * + * + * @generated + * @ordered + */ + int ENTRY_POINT_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Entry Point Parameter' class. + * + * + * @generated + * @ordered + */ + int ENTRY_POINT_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getInitializationArgumentsParameter() + * @generated + */ + int INITIALIZATION_ARGUMENTS_PARAMETER = 33; + + /** + * The number of structural features of the 'Initialization Arguments Parameter' class. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_ARGUMENTS_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Initialization Arguments Parameter' class. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_ARGUMENTS_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ModelRootParameterImpl Model Root Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.ModelRootParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getModelRootParameter() + * @generated + */ + int MODEL_ROOT_PARAMETER = 34; + + /** + * The number of structural features of the 'Model Root Parameter' class. + * + * + * @generated + * @ordered + */ + int MODEL_ROOT_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Model Root Parameter' class. + * + * + * @generated + * @ordered + */ + int MODEL_ROOT_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.InitializationMethodParameterImpl Initialization Method Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.InitializationMethodParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getInitializationMethodParameter() + * @generated + */ + int INITIALIZATION_METHOD_PARAMETER = 35; + + /** + * The number of structural features of the 'Initialization Method Parameter' class. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_METHOD_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Initialization Method Parameter' class. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_METHOD_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the 'ISerializable' data type. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() + * @generated + */ + int ISERIALIZABLE = 36; + + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence MSE Occurrence}'. + * + * + * @return the meta object for class 'MSE Occurrence'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence + * @generated + */ + EClass getMSEOccurrence(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}'. + * + * + * @return the meta object for the reference 'Mse'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse() + * @see #getMSEOccurrence() + * @generated + */ + EReference getMSEOccurrence_Mse(); + + /** + * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters Parameters}'. + * + * + * @return the meta object for the attribute list 'Parameters'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters() + * @see #getMSEOccurrence() + * @generated + */ + EAttribute getMSEOccurrence_Parameters(); + + /** + * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult Result}'. + * + * + * @return the meta object for the attribute list 'Result'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult() + * @see #getMSEOccurrence() + * @generated + */ + EAttribute getMSEOccurrence_Result(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSE MSE}'. + * + * + * @return the meta object for class 'MSE'. + * @see fr.inria.diverse.trace.commons.model.trace.MSE + * @generated + */ + EClass getMSE(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.MSE#getCaller() Get Caller}' operation. + * + * + * @return the meta object for the 'Get Caller' operation. + * @see fr.inria.diverse.trace.commons.model.trace.MSE#getCaller() + * @generated + */ + EOperation getMSE__GetCaller(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.MSE#getAction() Get Action}' operation. + * + * + * @return the meta object for the 'Get Action' operation. + * @see fr.inria.diverse.trace.commons.model.trace.MSE#getAction() + * @generated + */ + EOperation getMSE__GetAction(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel MSE Model}'. + * + * + * @return the meta object for class 'MSE Model'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEModel + * @generated + */ + EClass getMSEModel(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs Owned MS Es}'. + * + * + * @return the meta object for the containment reference list 'Owned MS Es'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs() + * @see #getMSEModel() + * @generated + */ + EReference getMSEModel_OwnedMSEs(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE Generic MSE}'. + * + * + * @return the meta object for class 'Generic MSE'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE + * @generated + */ + EClass getGenericMSE(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}'. + * + * + * @return the meta object for the reference 'Caller Reference'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference() + * @see #getGenericMSE() + * @generated + */ + EReference getGenericMSE_CallerReference(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}'. + * + * + * @return the meta object for the reference 'Action Reference'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference() + * @see #getGenericMSE() + * @generated + */ + EReference getGenericMSE_ActionReference(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCaller() Get Caller}' operation. + * + * + * @return the meta object for the 'Get Caller' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCaller() + * @generated + */ + EOperation getGenericMSE__GetCaller(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getAction() Get Action}' operation. + * + * + * @return the meta object for the 'Get Action' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getAction() + * @generated + */ + EOperation getGenericMSE__GetAction(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. + * + * + * @return the meta object for class 'Step'. + * @see fr.inria.diverse.trace.commons.model.trace.Step + * @generated + */ + EClass getStep(); + + /** + * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}'. + * + * + * @return the meta object for the containment reference 'Mseoccurrence'. + * @see fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence() + * @see #getStep() + * @generated + */ + EReference getStep_Mseoccurrence(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. + * + * + * @return the meta object for class 'Big Step'. + * @see fr.inria.diverse.trace.commons.model.trace.BigStep + * @generated + */ + EClass getBigStep(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps Sub Steps}'. + * + * + * @return the meta object for the containment reference list 'Sub Steps'. + * @see fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps() + * @see #getBigStep() + * @generated + */ + EReference getBigStep_SubSteps(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. + * + * + * @return the meta object for class 'Small Step'. + * @see fr.inria.diverse.trace.commons.model.trace.SmallStep + * @generated + */ + EClass getSmallStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. + * + * + * @return the meta object for class 'Sequential Step'. + * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep + * @generated + */ + EClass getSequentialStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.ParallelStep Parallel Step}'. + * + * + * @return the meta object for class 'Parallel Step'. * @see fr.inria.diverse.trace.commons.model.trace.ParallelStep * @generated */ - EClass getParallelStep(); + EClass getParallelStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep Generic Sequential Step}'. + * + * + * @return the meta object for class 'Generic Sequential Step'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep + * @generated + */ + EClass getGenericSequentialStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericParallelStep Generic Parallel Step}'. + * + * + * @return the meta object for class 'Generic Parallel Step'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericParallelStep + * @generated + */ + EClass getGenericParallelStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericSmallStep Generic Small Step}'. + * + * + * @return the meta object for class 'Generic Small Step'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericSmallStep + * @generated + */ + EClass getGenericSmallStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. + * + * + * @return the meta object for class 'Trace'. + * @see fr.inria.diverse.trace.commons.model.trace.Trace + * @generated + */ + EClass getTrace(); + + /** + * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}'. + * + * + * @return the meta object for the containment reference 'Root Step'. + * @see fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep() + * @see #getTrace() + * @generated + */ + EReference getTrace_RootStep(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects Traced Objects}'. + * + * + * @return the meta object for the containment reference list 'Traced Objects'. + * @see fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects() + * @see #getTrace() + * @generated + */ + EReference getTrace_TracedObjects(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getStates States}'. + * + * + * @return the meta object for the containment reference list 'States'. + * @see fr.inria.diverse.trace.commons.model.trace.Trace#getStates() + * @see #getTrace() + * @generated + */ + EReference getTrace_States(); + + /** + * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}'. + * + * + * @return the meta object for the containment reference 'Launchconfiguration'. + * @see fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration() + * @see #getTrace() + * @generated + */ + EReference getTrace_Launchconfiguration(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. + * + * + * @return the meta object for class 'Traced Object'. + * @see fr.inria.diverse.trace.commons.model.trace.TracedObject + * @generated + */ + EClass getTracedObject(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions Dimensions}'. + * + * + * @return the meta object for the containment reference list 'Dimensions'. + * @see fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions() + * @see #getTracedObject() + * @generated + */ + EReference getTracedObject_Dimensions(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. + * + * + * @return the meta object for class 'Dimension'. + * @see fr.inria.diverse.trace.commons.model.trace.Dimension + * @generated + */ + EClass getDimension(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Dimension#getValues Values}'. + * + * + * @return the meta object for the containment reference list 'Values'. + * @see fr.inria.diverse.trace.commons.model.trace.Dimension#getValues() + * @see #getDimension() + * @generated + */ + EReference getDimension_Values(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. + * + * + * @return the meta object for class 'Value'. + * @see fr.inria.diverse.trace.commons.model.trace.Value + * @generated + */ + EClass getValue(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.Value#getState State}'. + * + * + * @return the meta object for the reference list 'State'. + * @see fr.inria.diverse.trace.commons.model.trace.Value#getState() + * @see #getValue() + * @generated + */ + EReference getValue_State(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. + * + * + * @return the meta object for class 'State'. + * @see fr.inria.diverse.trace.commons.model.trace.State + * @generated + */ + EClass getState(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getValue Value}'. + * + * + * @return the meta object for the reference list 'Value'. + * @see fr.inria.diverse.trace.commons.model.trace.State#getValue() + * @see #getState() + * @generated + */ + EReference getState_Value(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue Generic Reference Value}'. + * + * + * @return the meta object for class 'Generic Reference Value'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue + * @generated + */ + EClass getGenericReferenceValue(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue#getReferenceValue Reference Value}'. + * + * + * @return the meta object for the reference 'Reference Value'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue#getReferenceValue() + * @see #getGenericReferenceValue() + * @generated + */ + EReference getGenericReferenceValue_ReferenceValue(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericDimension Generic Dimension}'. + * + * + * @return the meta object for class 'Generic Dimension'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericDimension + * @generated + */ + EClass getGenericDimension(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericDimension#getDynamicProperty Dynamic Property}'. + * + * + * @return the meta object for the reference 'Dynamic Property'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericDimension#getDynamicProperty() + * @see #getGenericDimension() + * @generated + */ + EReference getGenericDimension_DynamicProperty(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericTracedObject Generic Traced Object}'. + * + * + * @return the meta object for class 'Generic Traced Object'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericTracedObject + * @generated + */ + EClass getGenericTracedObject(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericState Generic State}'. + * + * + * @return the meta object for class 'Generic State'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericState + * @generated + */ + EClass getGenericState(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericTrace Generic Trace}'. + * + * + * @return the meta object for class 'Generic Trace'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericTrace + * @generated + */ + EClass getGenericTrace(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue Generic Attribute Value}'. + * + * + * @return the meta object for class 'Generic Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue + * @generated + */ + EClass getGenericAttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep Generic Sequential Step}'. + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue Boolean Attribute Value}'. * * - * @return the meta object for class 'Generic Sequential Step'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep + * @return the meta object for class 'Boolean Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue * @generated */ - EClass getGenericSequentialStep(); + EClass getBooleanAttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericParallelStep Generic Parallel Step}'. + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue#isAttributeValue Attribute Value}'. * * - * @return the meta object for class 'Generic Parallel Step'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericParallelStep + * @return the meta object for the attribute 'Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue#isAttributeValue() + * @see #getBooleanAttributeValue() * @generated */ - EClass getGenericParallelStep(); + EAttribute getBooleanAttributeValue_AttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericSmallStep Generic Small Step}'. + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue Integer Attributevalue}'. * * - * @return the meta object for class 'Generic Small Step'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericSmallStep + * @return the meta object for class 'Integer Attributevalue'. + * @see fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue * @generated */ - EClass getGenericSmallStep(); + EClass getIntegerAttributevalue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue#getAttributeValue Attribute Value}'. * * - * @return the meta object for class 'Trace'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace + * @return the meta object for the attribute 'Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue#getAttributeValue() + * @see #getIntegerAttributevalue() * @generated */ - EClass getTrace(); + EAttribute getIntegerAttributevalue_AttributeValue(); /** - * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}'. + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.StringAttributeValue String Attribute Value}'. * * - * @return the meta object for the containment reference 'Root Step'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep() - * @see #getTrace() + * @return the meta object for class 'String Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.trace.StringAttributeValue * @generated */ - EReference getTrace_RootStep(); + EClass getStringAttributeValue(); /** - * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}'. + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.StringAttributeValue#getAttributeValue Attribute Value}'. * * - * @return the meta object for the containment reference 'Launchconfiguration'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration() - * @see #getTrace() + * @return the meta object for the attribute 'Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.trace.StringAttributeValue#getAttributeValue() + * @see #getStringAttributeValue() * @generated */ - EReference getTrace_Launchconfiguration(); + EAttribute getStringAttributeValue_AttributeValue(); /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration Launch Configuration}'. @@ -1382,15 +2123,15 @@ public interface TracePackage extends EPackage { EClass getLaunchConfiguration(); /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getParameters Parameters}'. + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getLaunchconfigurationparameter Launchconfigurationparameter}'. * * - * @return the meta object for the containment reference list 'Parameters'. - * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getParameters() + * @return the meta object for the containment reference list 'Launchconfigurationparameter'. + * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getLaunchconfigurationparameter() * @see #getLaunchConfiguration() * @generated */ - EReference getLaunchConfiguration_Parameters(); + EReference getLaunchConfiguration_Launchconfigurationparameter(); /** * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getType Type}'. @@ -1414,25 +2155,24 @@ public interface TracePackage extends EPackage { EClass getLaunchConfigurationParameter(); /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue Value}'. + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter Language Name Parameter}'. * * - * @return the meta object for the attribute 'Value'. - * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue() - * @see #getLaunchConfigurationParameter() + * @return the meta object for class 'Language Name Parameter'. + * @see fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter * @generated */ - EAttribute getLaunchConfigurationParameter_Value(); + EClass getLanguageNameParameter(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter Language Name Parameter}'. + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter Addon Extension Parameter}'. * * - * @return the meta object for class 'Language Name Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter + * @return the meta object for class 'Addon Extension Parameter'. + * @see fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter * @generated */ - EClass getLanguageNameParameter(); + EClass getAddonExtensionParameter(); /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.ModelURIParameter Model URI Parameter}'. @@ -1464,6 +2204,16 @@ public interface TracePackage extends EPackage { */ EClass getEntryPointParameter(); + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter Initialization Arguments Parameter}'. + * + * + * @return the meta object for class 'Initialization Arguments Parameter'. + * @see fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter + * @generated + */ + EClass getInitializationArgumentsParameter(); + /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.ModelRootParameter Model Root Parameter}'. * @@ -1484,26 +2234,6 @@ public interface TracePackage extends EPackage { */ EClass getInitializationMethodParameter(); - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter Initialization Arguments Parameter}'. - * - * - * @return the meta object for class 'Initialization Arguments Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter - * @generated - */ - EClass getInitializationArgumentsParameter(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter Addon Extension Parameter}'. - * - * - * @return the meta object for class 'Addon Extension Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter - * @generated - */ - EClass getAddonExtensionParameter(); - /** * Returns the meta object for data type 'ISerializable'. * @@ -1771,6 +2501,22 @@ interface Literals { */ EReference TRACE__ROOT_STEP = eINSTANCE.getTrace_RootStep(); + /** + * The meta object literal for the 'Traced Objects' containment reference list feature. + * + * + * @generated + */ + EReference TRACE__TRACED_OBJECTS = eINSTANCE.getTrace_TracedObjects(); + + /** + * The meta object literal for the 'States' containment reference list feature. + * + * + * @generated + */ + EReference TRACE__STATES = eINSTANCE.getTrace_States(); + /** * The meta object literal for the 'Launchconfiguration' containment reference feature. * @@ -1779,6 +2525,208 @@ interface Literals { */ EReference TRACE__LAUNCHCONFIGURATION = eINSTANCE.getTrace_Launchconfiguration(); + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl Traced Object}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTracedObject() + * @generated + */ + EClass TRACED_OBJECT = eINSTANCE.getTracedObject(); + + /** + * The meta object literal for the 'Dimensions' containment reference list feature. + * + * + * @generated + */ + EReference TRACED_OBJECT__DIMENSIONS = eINSTANCE.getTracedObject_Dimensions(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getDimension() + * @generated + */ + EClass DIMENSION = eINSTANCE.getDimension(); + + /** + * The meta object literal for the 'Values' containment reference list feature. + * + * + * @generated + */ + EReference DIMENSION__VALUES = eINSTANCE.getDimension_Values(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getValue() + * @generated + */ + EClass VALUE = eINSTANCE.getValue(); + + /** + * The meta object literal for the 'State' reference list feature. + * + * + * @generated + */ + EReference VALUE__STATE = eINSTANCE.getValue_State(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.StateImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getState() + * @generated + */ + EClass STATE = eINSTANCE.getState(); + + /** + * The meta object literal for the 'Value' reference list feature. + * + * + * @generated + */ + EReference STATE__VALUE = eINSTANCE.getState_Value(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl Generic Reference Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericReferenceValue() + * @generated + */ + EClass GENERIC_REFERENCE_VALUE = eINSTANCE.getGenericReferenceValue(); + + /** + * The meta object literal for the 'Reference Value' reference feature. + * + * + * @generated + */ + EReference GENERIC_REFERENCE_VALUE__REFERENCE_VALUE = eINSTANCE.getGenericReferenceValue_ReferenceValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl Generic Dimension}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericDimension() + * @generated + */ + EClass GENERIC_DIMENSION = eINSTANCE.getGenericDimension(); + + /** + * The meta object literal for the 'Dynamic Property' reference feature. + * + * + * @generated + */ + EReference GENERIC_DIMENSION__DYNAMIC_PROPERTY = eINSTANCE.getGenericDimension_DynamicProperty(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTracedObjectImpl Generic Traced Object}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericTracedObjectImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericTracedObject() + * @generated + */ + EClass GENERIC_TRACED_OBJECT = eINSTANCE.getGenericTracedObject(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl Generic State}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericState() + * @generated + */ + EClass GENERIC_STATE = eINSTANCE.getGenericState(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl Generic Trace}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericTrace() + * @generated + */ + EClass GENERIC_TRACE = eINSTANCE.getGenericTrace(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericAttributeValueImpl Generic Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericAttributeValue() + * @generated + */ + EClass GENERIC_ATTRIBUTE_VALUE = eINSTANCE.getGenericAttributeValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getBooleanAttributeValue() + * @generated + */ + EClass BOOLEAN_ATTRIBUTE_VALUE = eINSTANCE.getBooleanAttributeValue(); + + /** + * The meta object literal for the 'Attribute Value' attribute feature. + * + * + * @generated + */ + EAttribute BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getBooleanAttributeValue_AttributeValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.IntegerAttributevalueImpl Integer Attributevalue}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.IntegerAttributevalueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getIntegerAttributevalue() + * @generated + */ + EClass INTEGER_ATTRIBUTEVALUE = eINSTANCE.getIntegerAttributevalue(); + + /** + * The meta object literal for the 'Attribute Value' attribute feature. + * + * + * @generated + */ + EAttribute INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE = eINSTANCE.getIntegerAttributevalue_AttributeValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StringAttributeValueImpl String Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.StringAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getStringAttributeValue() + * @generated + */ + EClass STRING_ATTRIBUTE_VALUE = eINSTANCE.getStringAttributeValue(); + + /** + * The meta object literal for the 'Attribute Value' attribute feature. + * + * + * @generated + */ + EAttribute STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getStringAttributeValue_AttributeValue(); + /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl Launch Configuration}' class. * @@ -1790,12 +2738,12 @@ interface Literals { EClass LAUNCH_CONFIGURATION = eINSTANCE.getLaunchConfiguration(); /** - * The meta object literal for the 'Parameters' containment reference list feature. + * The meta object literal for the 'Launchconfigurationparameter' containment reference list feature. * * * @generated */ - EReference LAUNCH_CONFIGURATION__PARAMETERS = eINSTANCE.getLaunchConfiguration_Parameters(); + EReference LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER = eINSTANCE.getLaunchConfiguration_Launchconfigurationparameter(); /** * The meta object literal for the 'Type' attribute feature. @@ -1816,22 +2764,24 @@ interface Literals { EClass LAUNCH_CONFIGURATION_PARAMETER = eINSTANCE.getLaunchConfigurationParameter(); /** - * The meta object literal for the 'Value' attribute feature. + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl Language Name Parameter}' class. * * + * @see fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLanguageNameParameter() * @generated */ - EAttribute LAUNCH_CONFIGURATION_PARAMETER__VALUE = eINSTANCE.getLaunchConfigurationParameter_Value(); + EClass LANGUAGE_NAME_PARAMETER = eINSTANCE.getLanguageNameParameter(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl Language Name Parameter}' class. + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLanguageNameParameter() + * @see fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getAddonExtensionParameter() * @generated */ - EClass LANGUAGE_NAME_PARAMETER = eINSTANCE.getLanguageNameParameter(); + EClass ADDON_EXTENSION_PARAMETER = eINSTANCE.getAddonExtensionParameter(); /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ModelURIParameterImpl Model URI Parameter}' class. @@ -1863,6 +2813,16 @@ interface Literals { */ EClass ENTRY_POINT_PARAMETER = eINSTANCE.getEntryPointParameter(); + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getInitializationArgumentsParameter() + * @generated + */ + EClass INITIALIZATION_ARGUMENTS_PARAMETER = eINSTANCE.getInitializationArgumentsParameter(); + /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ModelRootParameterImpl Model Root Parameter}' class. * @@ -1883,26 +2843,6 @@ interface Literals { */ EClass INITIALIZATION_METHOD_PARAMETER = eINSTANCE.getInitializationMethodParameter(); - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getInitializationArgumentsParameter() - * @generated - */ - EClass INITIALIZATION_ARGUMENTS_PARAMETER = eINSTANCE.getInitializationArgumentsParameter(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getAddonExtensionParameter() - * @generated - */ - EClass ADDON_EXTENSION_PARAMETER = eINSTANCE.getAddonExtensionParameter(); - /** * The meta object literal for the 'ISerializable' data type. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java new file mode 100644 index 000000000..4fc3fe478 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java @@ -0,0 +1,41 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Traced Object'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions Dimensions}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTracedObject() + * @model abstract="true" + * @generated + */ +public interface TracedObject extends EObject { + /** + * Returns the value of the 'Dimensions' containment reference list. + * + *

+ * If the meaning of the 'Dimensions' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Dimensions' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTracedObject_Dimensions() + * @model kind="reference" containment="true" + * @generated + */ + EList getDimensions(); + +} // TracedObject diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java new file mode 100644 index 000000000..dc357a8bd --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java @@ -0,0 +1,43 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Value#getState State}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue() + * @model abstract="true" + * @generated + */ +public interface Value extends EObject { + /** + * Returns the value of the 'State' reference list. + * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.State}. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getValue Value}'. + * + *

+ * If the meaning of the 'State' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'State' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue_State() + * @see fr.inria.diverse.trace.commons.model.trace.State#getValue + * @model opposite="value" + * @generated + */ + EList getState(); + +} // Value diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BooleanAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BooleanAttributeValueImpl.java new file mode 100644 index 000000000..b7106ac59 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BooleanAttributeValueImpl.java @@ -0,0 +1,162 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Boolean Attribute Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl#isAttributeValue Attribute Value}
    • + *
+ * + * @generated + */ +public class BooleanAttributeValueImpl extends GenericAttributeValueImpl implements BooleanAttributeValue { + /** + * The default value of the '{@link #isAttributeValue() Attribute Value}' attribute. + * + * + * @see #isAttributeValue() + * @generated + * @ordered + */ + protected static final boolean ATTRIBUTE_VALUE_EDEFAULT = false; + + /** + * The cached value of the '{@link #isAttributeValue() Attribute Value}' attribute. + * + * + * @see #isAttributeValue() + * @generated + * @ordered + */ + protected boolean attributeValue = ATTRIBUTE_VALUE_EDEFAULT; + + /** + * + * + * @generated + */ + protected BooleanAttributeValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.BOOLEAN_ATTRIBUTE_VALUE; + } + + /** + * + * + * @generated + */ + public boolean isAttributeValue() { + return attributeValue; + } + + /** + * + * + * @generated + */ + public void setAttributeValue(boolean newAttributeValue) { + boolean oldAttributeValue = attributeValue; + attributeValue = newAttributeValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return isAttributeValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + setAttributeValue((Boolean)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return attributeValue != ATTRIBUTE_VALUE_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeValue: "); + result.append(attributeValue); + result.append(')'); + return result.toString(); + } + +} //BooleanAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java new file mode 100644 index 000000000..d10d2064c --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java @@ -0,0 +1,152 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import fr.inria.diverse.trace.commons.model.trace.Value; +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Dimension'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl#getValues Values}
    • + *
+ * + * @generated + */ +public abstract class DimensionImpl extends MinimalEObjectImpl.Container implements Dimension { + /** + * The cached value of the '{@link #getValues() Values}' containment reference list. + * + * + * @see #getValues() + * @generated + * @ordered + */ + protected EList values; + + /** + * + * + * @generated + */ + protected DimensionImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.DIMENSION; + } + + /** + * + * + * @generated + */ + public EList getValues() { + if (values == null) { + values = new EObjectContainmentEList(Value.class, this, TracePackage.DIMENSION__VALUES); + } + return values; + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.DIMENSION__VALUES: + return ((InternalEList)getValues()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.DIMENSION__VALUES: + return getValues(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.DIMENSION__VALUES: + getValues().clear(); + getValues().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.DIMENSION__VALUES: + getValues().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.DIMENSION__VALUES: + return values != null && !values.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //DimensionImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java new file mode 100644 index 000000000..aa47b602b --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Generic Attribute Value'. + * + * + * @generated + */ +public abstract class GenericAttributeValueImpl extends ValueImpl implements GenericAttributeValue { + /** + * + * + * @generated + */ + protected GenericAttributeValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.GENERIC_ATTRIBUTE_VALUE; + } + +} //GenericAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java new file mode 100644 index 000000000..3c57d0489 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java @@ -0,0 +1,156 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.GenericDimension; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Generic Dimension'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl#getDynamicProperty Dynamic Property}
    • + *
+ * + * @generated + */ +public class GenericDimensionImpl extends DimensionImpl implements GenericDimension { + /** + * The cached value of the '{@link #getDynamicProperty() Dynamic Property}' reference. + * + * + * @see #getDynamicProperty() + * @generated + * @ordered + */ + protected EStructuralFeature dynamicProperty; + + /** + * + * + * @generated + */ + protected GenericDimensionImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.GENERIC_DIMENSION; + } + + /** + * + * + * @generated + */ + public EStructuralFeature getDynamicProperty() { + if (dynamicProperty != null && dynamicProperty.eIsProxy()) { + InternalEObject oldDynamicProperty = (InternalEObject)dynamicProperty; + dynamicProperty = (EStructuralFeature)eResolveProxy(oldDynamicProperty); + if (dynamicProperty != oldDynamicProperty) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY, oldDynamicProperty, dynamicProperty)); + } + } + return dynamicProperty; + } + + /** + * + * + * @generated + */ + public EStructuralFeature basicGetDynamicProperty() { + return dynamicProperty; + } + + /** + * + * + * @generated + */ + public void setDynamicProperty(EStructuralFeature newDynamicProperty) { + EStructuralFeature oldDynamicProperty = dynamicProperty; + dynamicProperty = newDynamicProperty; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY, oldDynamicProperty, dynamicProperty)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: + if (resolve) return getDynamicProperty(); + return basicGetDynamicProperty(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: + setDynamicProperty((EStructuralFeature)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: + setDynamicProperty((EStructuralFeature)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: + return dynamicProperty != null; + } + return super.eIsSet(featureID); + } + +} //GenericDimensionImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java index 85e737e50..c7ed3e4c4 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java @@ -6,10 +6,12 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.common.notify.Notification; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.InternalEObject; + import org.eclipse.emf.ecore.impl.ENotificationImpl; /** @@ -212,20 +214,4 @@ public boolean eIsSet(int featureID) { return super.eIsSet(featureID); } - /** - * @generated not - */ - @Override - public EOperation getAction() { - return actionReference; - } - - /** - * @generated not - */ - @Override - public EObject getCaller() { - return callerReference; - } - } //GenericMSEImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java new file mode 100644 index 000000000..614ed5393 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java @@ -0,0 +1,157 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Generic Reference Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl#getReferenceValue Reference Value}
    • + *
+ * + * @generated + */ +public class GenericReferenceValueImpl extends ValueImpl implements GenericReferenceValue { + /** + * The cached value of the '{@link #getReferenceValue() Reference Value}' reference. + * + * + * @see #getReferenceValue() + * @generated + * @ordered + */ + protected T referenceValue; + /** + * + * + * @generated + */ + protected GenericReferenceValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.GENERIC_REFERENCE_VALUE; + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + public T getReferenceValue() { + if (referenceValue != null && ((EObject)referenceValue).eIsProxy()) { + InternalEObject oldReferenceValue = (InternalEObject)referenceValue; + referenceValue = (T)eResolveProxy(oldReferenceValue); + if (referenceValue != oldReferenceValue) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); + } + } + return referenceValue; + } + + /** + * + * + * @generated + */ + public T basicGetReferenceValue() { + return referenceValue; + } + + /** + * + * + * @generated + */ + public void setReferenceValue(T newReferenceValue) { + T oldReferenceValue = referenceValue; + referenceValue = newReferenceValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: + if (resolve) return getReferenceValue(); + return basicGetReferenceValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: + setReferenceValue((T)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: + setReferenceValue((T)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: + return referenceValue != null; + } + return super.eIsSet(featureID); + } + +} //GenericReferenceValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java new file mode 100644 index 000000000..fe36f4775 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Generic State'. + * + * + * @generated + */ +public class GenericStateImpl extends StateImpl implements GenericState { + /** + * + * + * @generated + */ + protected GenericStateImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.GENERIC_STATE; + } + +} //GenericStateImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java new file mode 100644 index 000000000..76c07d0e3 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java @@ -0,0 +1,83 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericTrace; +import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; + +/** + * + * An implementation of the model object 'Generic Trace'. + * + * + * @generated + */ +public class GenericTraceImpl extends TraceImpl, GenericState> implements GenericTrace { + /** + * + * + * @generated + */ + protected GenericTraceImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.GENERIC_TRACE; + } + + /** + * + * + * This is specialized for the more specific type known in this context. + * @generated + */ + @Override + public NotificationChain basicSetRootStep(StepSubType newRootStep, NotificationChain msgs) { + return super.basicSetRootStep(newRootStep, msgs); + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList> getTracedObjects() { + if (tracedObjects == null) { + tracedObjects = new EObjectContainmentEList>(GenericTracedObject.class, this, TracePackage.GENERIC_TRACE__TRACED_OBJECTS); + } + return tracedObjects; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getStates() { + if (states == null) { + states = new EObjectContainmentEList(GenericState.class, this, TracePackage.GENERIC_TRACE__STATES); + } + return states; + } + +} //GenericTraceImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java new file mode 100644 index 000000000..b94c681d7 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java @@ -0,0 +1,57 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.GenericDimension; +import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; + +/** + * + * An implementation of the model object 'Generic Traced Object'. + * + * + * @generated + */ +public class GenericTracedObjectImpl extends TracedObjectImpl implements GenericTracedObject { + /** + * + * + * @generated + */ + protected GenericTracedObjectImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.GENERIC_TRACED_OBJECT; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getDimensions() { + if (dimensions == null) { + dimensions = new EObjectContainmentEList(GenericDimension.class, this, TracePackage.GENERIC_TRACED_OBJECT__DIMENSIONS); + } + return dimensions; + } + +} //GenericTracedObjectImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/IntegerAttributevalueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/IntegerAttributevalueImpl.java new file mode 100644 index 000000000..8a539fb26 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/IntegerAttributevalueImpl.java @@ -0,0 +1,162 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Integer Attributevalue'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.IntegerAttributevalueImpl#getAttributeValue Attribute Value}
    • + *
+ * + * @generated + */ +public class IntegerAttributevalueImpl extends GenericAttributeValueImpl implements IntegerAttributevalue { + /** + * The default value of the '{@link #getAttributeValue() Attribute Value}' attribute. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected static final int ATTRIBUTE_VALUE_EDEFAULT = 0; + + /** + * The cached value of the '{@link #getAttributeValue() Attribute Value}' attribute. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected int attributeValue = ATTRIBUTE_VALUE_EDEFAULT; + + /** + * + * + * @generated + */ + protected IntegerAttributevalueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.INTEGER_ATTRIBUTEVALUE; + } + + /** + * + * + * @generated + */ + public int getAttributeValue() { + return attributeValue; + } + + /** + * + * + * @generated + */ + public void setAttributeValue(int newAttributeValue) { + int oldAttributeValue = attributeValue; + attributeValue = newAttributeValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + return getAttributeValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + setAttributeValue((Integer)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + return attributeValue != ATTRIBUTE_VALUE_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeValue: "); + result.append(attributeValue); + result.append(')'); + return result.toString(); + } + +} //IntegerAttributevalueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java index c3e3afe44..463c30d22 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java @@ -5,14 +5,20 @@ import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter; import fr.inria.diverse.trace.commons.model.trace.TracePackage; + import java.util.Collection; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; + import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; @@ -24,7 +30,7 @@ * The following features are implemented: *

*
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl#getParameters Parameters}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl#getLaunchconfigurationparameter Launchconfigurationparameter}
    • *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl#getType Type}
    • *
* @@ -32,14 +38,14 @@ */ public class LaunchConfigurationImpl extends MinimalEObjectImpl.Container implements LaunchConfiguration { /** - * The cached value of the '{@link #getParameters() Parameters}' containment reference list. + * The cached value of the '{@link #getLaunchconfigurationparameter() Launchconfigurationparameter}' containment reference list. * * - * @see #getParameters() + * @see #getLaunchconfigurationparameter() * @generated * @ordered */ - protected EList parameters; + protected EList launchconfigurationparameter; /** * The default value of the '{@link #getType() Type}' attribute. @@ -49,7 +55,8 @@ public class LaunchConfigurationImpl extends MinimalEObjectImpl.Container implem * @generated * @ordered */ - protected static final String TYPE_EDEFAULT = ""; + protected static final String TYPE_EDEFAULT = null; + /** * The cached value of the '{@link #getType() Type}' attribute. * @@ -84,11 +91,11 @@ protected EClass eStaticClass() { * * @generated */ - public EList getParameters() { - if (parameters == null) { - parameters = new EObjectContainmentEList(LaunchConfigurationParameter.class, this, TracePackage.LAUNCH_CONFIGURATION__PARAMETERS); + public EList getLaunchconfigurationparameter() { + if (launchconfigurationparameter == null) { + launchconfigurationparameter = new EObjectContainmentEList(LaunchConfigurationParameter.class, this, TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER); } - return parameters; + return launchconfigurationparameter; } /** @@ -120,8 +127,8 @@ public void setType(String newType) { @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: - return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs); + case TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER: + return ((InternalEList)getLaunchconfigurationparameter()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -134,8 +141,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: - return getParameters(); + case TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER: + return getLaunchconfigurationparameter(); case TracePackage.LAUNCH_CONFIGURATION__TYPE: return getType(); } @@ -151,9 +158,9 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: - getParameters().clear(); - getParameters().addAll((Collection)newValue); + case TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER: + getLaunchconfigurationparameter().clear(); + getLaunchconfigurationparameter().addAll((Collection)newValue); return; case TracePackage.LAUNCH_CONFIGURATION__TYPE: setType((String)newValue); @@ -170,8 +177,8 @@ public void eSet(int featureID, Object newValue) { @Override public void eUnset(int featureID) { switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: - getParameters().clear(); + case TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER: + getLaunchconfigurationparameter().clear(); return; case TracePackage.LAUNCH_CONFIGURATION__TYPE: setType(TYPE_EDEFAULT); @@ -188,8 +195,8 @@ public void eUnset(int featureID) { @Override public boolean eIsSet(int featureID) { switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: - return parameters != null && !parameters.isEmpty(); + case TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER: + return launchconfigurationparameter != null && !launchconfigurationparameter.isEmpty(); case TracePackage.LAUNCH_CONFIGURATION__TYPE: return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java index 6e0794083..58e3577a6 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java @@ -5,47 +5,18 @@ import fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter; import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; /** * * An implementation of the model object 'Launch Configuration Parameter'. * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl#getValue Value}
    • - *
* * @generated */ public abstract class LaunchConfigurationParameterImpl extends MinimalEObjectImpl.Container implements LaunchConfigurationParameter { - /** - * The default value of the '{@link #getValue() Value}' attribute. - * - * - * @see #getValue() - * @generated - * @ordered - */ - protected static final String VALUE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getValue() Value}' attribute. - * - * - * @see #getValue() - * @generated - * @ordered - */ - protected String value = VALUE_EDEFAULT; - /** * * @@ -65,99 +36,4 @@ protected EClass eStaticClass() { return TracePackage.Literals.LAUNCH_CONFIGURATION_PARAMETER; } - /** - * - * - * @generated - */ - public String getValue() { - return value; - } - - /** - * - * - * @generated - */ - public void setValue(String newValue) { - String oldValue = value; - value = newValue; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE, oldValue, value)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: - return getValue(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: - setValue((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: - setValue(VALUE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: - return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (value: "); - result.append(value); - result.append(')'); - return result.toString(); - } - } //LaunchConfigurationParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java new file mode 100644 index 000000000..e9e302fa7 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java @@ -0,0 +1,163 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.Value; + +import java.util.Collection; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'State'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getValue Value}
    • + *
+ * + * @generated + */ +public abstract class StateImpl extends MinimalEObjectImpl.Container implements State { + /** + * The cached value of the '{@link #getValue() Value}' reference list. + * + * + * @see #getValue() + * @generated + * @ordered + */ + protected EList value; + + /** + * + * + * @generated + */ + protected StateImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.STATE; + } + + /** + * + * + * @generated + */ + public EList getValue() { + if (value == null) { + value = new EObjectWithInverseResolvingEList.ManyInverse(Value.class, this, TracePackage.STATE__VALUE, TracePackage.VALUE__STATE); + } + return value; + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.STATE__VALUE: + return ((InternalEList)(InternalEList)getValue()).basicAdd(otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.STATE__VALUE: + return ((InternalEList)getValue()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.STATE__VALUE: + return getValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.STATE__VALUE: + getValue().clear(); + getValue().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.STATE__VALUE: + getValue().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.STATE__VALUE: + return value != null && !value.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //StateImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StringAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StringAttributeValueImpl.java new file mode 100644 index 000000000..be6e6065e --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StringAttributeValueImpl.java @@ -0,0 +1,162 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.StringAttributeValue; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'String Attribute Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StringAttributeValueImpl#getAttributeValue Attribute Value}
    • + *
+ * + * @generated + */ +public class StringAttributeValueImpl extends GenericAttributeValueImpl implements StringAttributeValue { + /** + * The default value of the '{@link #getAttributeValue() Attribute Value}' attribute. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected static final String ATTRIBUTE_VALUE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAttributeValue() Attribute Value}' attribute. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected String attributeValue = ATTRIBUTE_VALUE_EDEFAULT; + + /** + * + * + * @generated + */ + protected StringAttributeValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.STRING_ATTRIBUTE_VALUE; + } + + /** + * + * + * @generated + */ + public String getAttributeValue() { + return attributeValue; + } + + /** + * + * + * @generated + */ + public void setAttributeValue(String newAttributeValue) { + String oldAttributeValue = attributeValue; + attributeValue = newAttributeValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return getAttributeValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + setAttributeValue((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return ATTRIBUTE_VALUE_EDEFAULT == null ? attributeValue != null : !ATTRIBUTE_VALUE_EDEFAULT.equals(attributeValue); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeValue: "); + result.append(attributeValue); + result.append(')'); + return result.toString(); + } + +} //StringAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java index f9ebeed3b..475979b43 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java @@ -65,16 +65,23 @@ public EObject create(EClass eClass) { case TracePackage.GENERIC_SEQUENTIAL_STEP: return createGenericSequentialStep(); case TracePackage.GENERIC_PARALLEL_STEP: return createGenericParallelStep(); case TracePackage.GENERIC_SMALL_STEP: return createGenericSmallStep(); - case TracePackage.TRACE: return createTrace(); + case TracePackage.GENERIC_REFERENCE_VALUE: return createGenericReferenceValue(); + case TracePackage.GENERIC_DIMENSION: return createGenericDimension(); + case TracePackage.GENERIC_TRACED_OBJECT: return createGenericTracedObject(); + case TracePackage.GENERIC_STATE: return createGenericState(); + case TracePackage.GENERIC_TRACE: return createGenericTrace(); + case TracePackage.BOOLEAN_ATTRIBUTE_VALUE: return createBooleanAttributeValue(); + case TracePackage.INTEGER_ATTRIBUTEVALUE: return createIntegerAttributevalue(); + case TracePackage.STRING_ATTRIBUTE_VALUE: return createStringAttributeValue(); case TracePackage.LAUNCH_CONFIGURATION: return createLaunchConfiguration(); case TracePackage.LANGUAGE_NAME_PARAMETER: return createLanguageNameParameter(); + case TracePackage.ADDON_EXTENSION_PARAMETER: return createAddonExtensionParameter(); case TracePackage.MODEL_URI_PARAMETER: return createModelURIParameter(); case TracePackage.ANIMATOR_URI_PARAMETER: return createAnimatorURIParameter(); case TracePackage.ENTRY_POINT_PARAMETER: return createEntryPointParameter(); + case TracePackage.INITIALIZATION_ARGUMENTS_PARAMETER: return createInitializationArgumentsParameter(); case TracePackage.MODEL_ROOT_PARAMETER: return createModelRootParameter(); case TracePackage.INITIALIZATION_METHOD_PARAMETER: return createInitializationMethodParameter(); - case TracePackage.INITIALIZATION_ARGUMENTS_PARAMETER: return createInitializationArgumentsParameter(); - case TracePackage.ADDON_EXTENSION_PARAMETER: return createAddonExtensionParameter(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -195,9 +202,79 @@ public GenericSmallStep createGenericSmallStep() { * * @generated */ - public Trace createTrace() { - TraceImpl trace = new TraceImpl(); - return trace; + public GenericReferenceValue createGenericReferenceValue() { + GenericReferenceValueImpl genericReferenceValue = new GenericReferenceValueImpl(); + return genericReferenceValue; + } + + /** + * + * + * @generated + */ + public GenericDimension createGenericDimension() { + GenericDimensionImpl genericDimension = new GenericDimensionImpl(); + return genericDimension; + } + + /** + * + * + * @generated + */ + public GenericTracedObject createGenericTracedObject() { + GenericTracedObjectImpl genericTracedObject = new GenericTracedObjectImpl(); + return genericTracedObject; + } + + /** + * + * + * @generated + */ + public GenericState createGenericState() { + GenericStateImpl genericState = new GenericStateImpl(); + return genericState; + } + + /** + * + * + * @generated + */ + public GenericTrace createGenericTrace() { + GenericTraceImpl genericTrace = new GenericTraceImpl(); + return genericTrace; + } + + /** + * + * + * @generated + */ + public BooleanAttributeValue createBooleanAttributeValue() { + BooleanAttributeValueImpl booleanAttributeValue = new BooleanAttributeValueImpl(); + return booleanAttributeValue; + } + + /** + * + * + * @generated + */ + public IntegerAttributevalue createIntegerAttributevalue() { + IntegerAttributevalueImpl integerAttributevalue = new IntegerAttributevalueImpl(); + return integerAttributevalue; + } + + /** + * + * + * @generated + */ + public StringAttributeValue createStringAttributeValue() { + StringAttributeValueImpl stringAttributeValue = new StringAttributeValueImpl(); + return stringAttributeValue; } /** @@ -220,6 +297,16 @@ public LanguageNameParameter createLanguageNameParameter() { return languageNameParameter; } + /** + * + * + * @generated + */ + public AddonExtensionParameter createAddonExtensionParameter() { + AddonExtensionParameterImpl addonExtensionParameter = new AddonExtensionParameterImpl(); + return addonExtensionParameter; + } + /** * * @@ -255,19 +342,9 @@ public EntryPointParameter createEntryPointParameter() { * * @generated */ - public ModelRootParameter createModelRootParameter() { - ModelRootParameterImpl modelRootParameter = new ModelRootParameterImpl(); - return modelRootParameter; - } - - /** - * - * - * @generated - */ - public InitializationMethodParameter createInitializationMethodParameter() { - InitializationMethodParameterImpl initializationMethodParameter = new InitializationMethodParameterImpl(); - return initializationMethodParameter; + public InitializationArgumentsParameter createInitializationArgumentsParameter() { + InitializationArgumentsParameterImpl initializationArgumentsParameter = new InitializationArgumentsParameterImpl(); + return initializationArgumentsParameter; } /** @@ -275,9 +352,9 @@ public InitializationMethodParameter createInitializationMethodParameter() { * * @generated */ - public InitializationArgumentsParameter createInitializationArgumentsParameter() { - InitializationArgumentsParameterImpl initializationArgumentsParameter = new InitializationArgumentsParameterImpl(); - return initializationArgumentsParameter; + public ModelRootParameter createModelRootParameter() { + ModelRootParameterImpl modelRootParameter = new ModelRootParameterImpl(); + return modelRootParameter; } /** @@ -285,9 +362,9 @@ public InitializationArgumentsParameter createInitializationArgumentsParameter() * * @generated */ - public AddonExtensionParameter createAddonExtensionParameter() { - AddonExtensionParameterImpl addonExtensionParameter = new AddonExtensionParameterImpl(); - return addonExtensionParameter; + public InitializationMethodParameter createInitializationMethodParameter() { + InitializationMethodParameterImpl initializationMethodParameter = new InitializationMethodParameterImpl(); + return initializationMethodParameter; } /** diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java index a2d5669b3..f927b0736 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java @@ -6,15 +6,23 @@ import fr.inria.diverse.trace.commons.model.trace.Trace; import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import java.util.Collection; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + /** * * An implementation of the model object 'Trace'. @@ -24,12 +32,14 @@ *

*
    *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getRootStep Root Step}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getTracedObjects Traced Objects}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getStates States}
    • *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getLaunchconfiguration Launchconfiguration}
    • *
* * @generated */ -public class TraceImpl extends MinimalEObjectImpl.Container implements Trace { +public abstract class TraceImpl extends MinimalEObjectImpl.Container implements Trace { /** * The cached value of the '{@link #getRootStep() Root Step}' containment reference. * @@ -40,6 +50,26 @@ public class TraceImpl extends MinimalEObjectImpl.Container impleme */ protected StepSubType rootStep; + /** + * The cached value of the '{@link #getTracedObjects() Traced Objects}' containment reference list. + * + * + * @see #getTracedObjects() + * @generated + * @ordered + */ + protected EList tracedObjects; + + /** + * The cached value of the '{@link #getStates() States}' containment reference list. + * + * + * @see #getStates() + * @generated + * @ordered + */ + protected EList states; + /** * The cached value of the '{@link #getLaunchconfiguration() Launchconfiguration}' containment reference. * @@ -112,6 +142,30 @@ else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.TRACE__ROOT_STEP, newRootStep, newRootStep)); } + /** + * + * + * @generated + */ + public EList getTracedObjects() { + if (tracedObjects == null) { + tracedObjects = new EObjectContainmentEList(EObject.class, this, TracePackage.TRACE__TRACED_OBJECTS); + } + return tracedObjects; + } + + /** + * + * + * @generated + */ + public EList getStates() { + if (states == null) { + states = new EObjectContainmentEList(EObject.class, this, TracePackage.TRACE__STATES); + } + return states; + } + /** * * @@ -165,6 +219,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, switch (featureID) { case TracePackage.TRACE__ROOT_STEP: return basicSetRootStep(null, msgs); + case TracePackage.TRACE__TRACED_OBJECTS: + return ((InternalEList)getTracedObjects()).basicRemove(otherEnd, msgs); + case TracePackage.TRACE__STATES: + return ((InternalEList)getStates()).basicRemove(otherEnd, msgs); case TracePackage.TRACE__LAUNCHCONFIGURATION: return basicSetLaunchconfiguration(null, msgs); } @@ -181,6 +239,10 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case TracePackage.TRACE__ROOT_STEP: return getRootStep(); + case TracePackage.TRACE__TRACED_OBJECTS: + return getTracedObjects(); + case TracePackage.TRACE__STATES: + return getStates(); case TracePackage.TRACE__LAUNCHCONFIGURATION: return getLaunchconfiguration(); } @@ -199,6 +261,14 @@ public void eSet(int featureID, Object newValue) { case TracePackage.TRACE__ROOT_STEP: setRootStep((StepSubType)newValue); return; + case TracePackage.TRACE__TRACED_OBJECTS: + getTracedObjects().clear(); + getTracedObjects().addAll((Collection)newValue); + return; + case TracePackage.TRACE__STATES: + getStates().clear(); + getStates().addAll((Collection)newValue); + return; case TracePackage.TRACE__LAUNCHCONFIGURATION: setLaunchconfiguration((LaunchConfiguration)newValue); return; @@ -217,6 +287,12 @@ public void eUnset(int featureID) { case TracePackage.TRACE__ROOT_STEP: setRootStep((StepSubType)null); return; + case TracePackage.TRACE__TRACED_OBJECTS: + getTracedObjects().clear(); + return; + case TracePackage.TRACE__STATES: + getStates().clear(); + return; case TracePackage.TRACE__LAUNCHCONFIGURATION: setLaunchconfiguration((LaunchConfiguration)null); return; @@ -234,6 +310,10 @@ public boolean eIsSet(int featureID) { switch (featureID) { case TracePackage.TRACE__ROOT_STEP: return rootStep != null; + case TracePackage.TRACE__TRACED_OBJECTS: + return tracedObjects != null && !tracedObjects.isEmpty(); + case TracePackage.TRACE__STATES: + return states != null && !states.isEmpty(); case TracePackage.TRACE__LAUNCHCONFIGURATION: return launchconfiguration != null; } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java index 57cc4b52a..ea210826b 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java @@ -5,13 +5,22 @@ import fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter; import fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter; import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue; +import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.EntryPointParameter; +import fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue; +import fr.inria.diverse.trace.commons.model.trace.GenericDimension; import fr.inria.diverse.trace.commons.model.trace.GenericMSE; import fr.inria.diverse.trace.commons.model.trace.GenericParallelStep; +import fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue; import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; import fr.inria.diverse.trace.commons.model.trace.GenericSmallStep; +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericTrace; +import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter; import fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter; +import fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue; import fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter; @@ -22,10 +31,15 @@ import fr.inria.diverse.trace.commons.model.trace.ParallelStep; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.SmallStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.StringAttributeValue; import fr.inria.diverse.trace.commons.model.trace.Trace; import fr.inria.diverse.trace.commons.model.trace.TraceFactory; import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; + import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -35,6 +49,7 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.ETypeParameter; import org.eclipse.emf.ecore.EcorePackage; + import org.eclipse.emf.ecore.impl.EPackageImpl; /** @@ -135,6 +150,97 @@ public class TracePackageImpl extends EPackageImpl implements TracePackage { */ private EClass traceEClass = null; + /** + * + * + * @generated + */ + private EClass tracedObjectEClass = null; + + /** + * + * + * @generated + */ + private EClass dimensionEClass = null; + + /** + * + * + * @generated + */ + private EClass valueEClass = null; + + /** + * + * + * @generated + */ + private EClass stateEClass = null; + + /** + * + * + * @generated + */ + private EClass genericReferenceValueEClass = null; + + /** + * + * + * @generated + */ + private EClass genericDimensionEClass = null; + + /** + * + * + * @generated + */ + private EClass genericTracedObjectEClass = null; + + /** + * + * + * @generated + */ + private EClass genericStateEClass = null; + + /** + * + * + * @generated + */ + private EClass genericTraceEClass = null; + + /** + * + * + * @generated + */ + private EClass genericAttributeValueEClass = null; + + /** + * + * + * @generated + */ + private EClass booleanAttributeValueEClass = null; + + /** + * + * + * @generated + */ + private EClass integerAttributevalueEClass = null; + + /** + * + * + * @generated + */ + private EClass stringAttributeValueEClass = null; + /** * * @@ -161,49 +267,49 @@ public class TracePackageImpl extends EPackageImpl implements TracePackage { * * @generated */ - private EClass modelURIParameterEClass = null; + private EClass addonExtensionParameterEClass = null; /** * * * @generated */ - private EClass animatorURIParameterEClass = null; + private EClass modelURIParameterEClass = null; /** * * * @generated */ - private EClass entryPointParameterEClass = null; + private EClass animatorURIParameterEClass = null; /** * * * @generated */ - private EClass modelRootParameterEClass = null; + private EClass entryPointParameterEClass = null; /** * * * @generated */ - private EClass initializationMethodParameterEClass = null; + private EClass initializationArgumentsParameterEClass = null; /** * * * @generated */ - private EClass initializationArgumentsParameterEClass = null; + private EClass modelRootParameterEClass = null; /** * * * @generated */ - private EClass addonExtensionParameterEClass = null; + private EClass initializationMethodParameterEClass = null; /** * @@ -515,10 +621,226 @@ public EReference getTrace_RootStep() { * * @generated */ - public EReference getTrace_Launchconfiguration() { + public EReference getTrace_TracedObjects() { return (EReference)traceEClass.getEStructuralFeatures().get(1); } + /** + * + * + * @generated + */ + public EReference getTrace_States() { + return (EReference)traceEClass.getEStructuralFeatures().get(2); + } + + /** + * + * + * @generated + */ + public EReference getTrace_Launchconfiguration() { + return (EReference)traceEClass.getEStructuralFeatures().get(3); + } + + /** + * + * + * @generated + */ + public EClass getTracedObject() { + return tracedObjectEClass; + } + + /** + * + * + * @generated + */ + public EReference getTracedObject_Dimensions() { + return (EReference)tracedObjectEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getDimension() { + return dimensionEClass; + } + + /** + * + * + * @generated + */ + public EReference getDimension_Values() { + return (EReference)dimensionEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getValue() { + return valueEClass; + } + + /** + * + * + * @generated + */ + public EReference getValue_State() { + return (EReference)valueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getState() { + return stateEClass; + } + + /** + * + * + * @generated + */ + public EReference getState_Value() { + return (EReference)stateEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getGenericReferenceValue() { + return genericReferenceValueEClass; + } + + /** + * + * + * @generated + */ + public EReference getGenericReferenceValue_ReferenceValue() { + return (EReference)genericReferenceValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getGenericDimension() { + return genericDimensionEClass; + } + + /** + * + * + * @generated + */ + public EReference getGenericDimension_DynamicProperty() { + return (EReference)genericDimensionEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getGenericTracedObject() { + return genericTracedObjectEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericState() { + return genericStateEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericTrace() { + return genericTraceEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericAttributeValue() { + return genericAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EClass getBooleanAttributeValue() { + return booleanAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getBooleanAttributeValue_AttributeValue() { + return (EAttribute)booleanAttributeValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getIntegerAttributevalue() { + return integerAttributevalueEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getIntegerAttributevalue_AttributeValue() { + return (EAttribute)integerAttributevalueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getStringAttributeValue() { + return stringAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getStringAttributeValue_AttributeValue() { + return (EAttribute)stringAttributeValueEClass.getEStructuralFeatures().get(0); + } + /** * * @@ -533,7 +855,7 @@ public EClass getLaunchConfiguration() { * * @generated */ - public EReference getLaunchConfiguration_Parameters() { + public EReference getLaunchConfiguration_Launchconfigurationparameter() { return (EReference)launchConfigurationEClass.getEStructuralFeatures().get(0); } @@ -560,8 +882,8 @@ public EClass getLaunchConfigurationParameter() { * * @generated */ - public EAttribute getLaunchConfigurationParameter_Value() { - return (EAttribute)launchConfigurationParameterEClass.getEStructuralFeatures().get(0); + public EClass getLanguageNameParameter() { + return languageNameParameterEClass; } /** @@ -569,8 +891,8 @@ public EAttribute getLaunchConfigurationParameter_Value() { * * @generated */ - public EClass getLanguageNameParameter() { - return languageNameParameterEClass; + public EClass getAddonExtensionParameter() { + return addonExtensionParameterEClass; } /** @@ -605,17 +927,8 @@ public EClass getEntryPointParameter() { * * @generated */ - public EClass getModelRootParameter() { - return modelRootParameterEClass; - } - - /** - * - * - * @generated - */ - public EClass getInitializationMethodParameter() { - return initializationMethodParameterEClass; + public EClass getInitializationArgumentsParameter() { + return initializationArgumentsParameterEClass; } /** @@ -623,8 +936,8 @@ public EClass getInitializationMethodParameter() { * * @generated */ - public EClass getInitializationArgumentsParameter() { - return initializationArgumentsParameterEClass; + public EClass getModelRootParameter() { + return modelRootParameterEClass; } /** @@ -632,8 +945,8 @@ public EClass getInitializationArgumentsParameter() { * * @generated */ - public EClass getAddonExtensionParameter() { - return addonExtensionParameterEClass; + public EClass getInitializationMethodParameter() { + return initializationMethodParameterEClass; } /** @@ -711,31 +1024,67 @@ public void createPackageContents() { traceEClass = createEClass(TRACE); createEReference(traceEClass, TRACE__ROOT_STEP); + createEReference(traceEClass, TRACE__TRACED_OBJECTS); + createEReference(traceEClass, TRACE__STATES); createEReference(traceEClass, TRACE__LAUNCHCONFIGURATION); + tracedObjectEClass = createEClass(TRACED_OBJECT); + createEReference(tracedObjectEClass, TRACED_OBJECT__DIMENSIONS); + + dimensionEClass = createEClass(DIMENSION); + createEReference(dimensionEClass, DIMENSION__VALUES); + + valueEClass = createEClass(VALUE); + createEReference(valueEClass, VALUE__STATE); + + stateEClass = createEClass(STATE); + createEReference(stateEClass, STATE__VALUE); + + genericReferenceValueEClass = createEClass(GENERIC_REFERENCE_VALUE); + createEReference(genericReferenceValueEClass, GENERIC_REFERENCE_VALUE__REFERENCE_VALUE); + + genericDimensionEClass = createEClass(GENERIC_DIMENSION); + createEReference(genericDimensionEClass, GENERIC_DIMENSION__DYNAMIC_PROPERTY); + + genericTracedObjectEClass = createEClass(GENERIC_TRACED_OBJECT); + + genericStateEClass = createEClass(GENERIC_STATE); + + genericTraceEClass = createEClass(GENERIC_TRACE); + + genericAttributeValueEClass = createEClass(GENERIC_ATTRIBUTE_VALUE); + + booleanAttributeValueEClass = createEClass(BOOLEAN_ATTRIBUTE_VALUE); + createEAttribute(booleanAttributeValueEClass, BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + + integerAttributevalueEClass = createEClass(INTEGER_ATTRIBUTEVALUE); + createEAttribute(integerAttributevalueEClass, INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE); + + stringAttributeValueEClass = createEClass(STRING_ATTRIBUTE_VALUE); + createEAttribute(stringAttributeValueEClass, STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + launchConfigurationEClass = createEClass(LAUNCH_CONFIGURATION); - createEReference(launchConfigurationEClass, LAUNCH_CONFIGURATION__PARAMETERS); + createEReference(launchConfigurationEClass, LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER); createEAttribute(launchConfigurationEClass, LAUNCH_CONFIGURATION__TYPE); launchConfigurationParameterEClass = createEClass(LAUNCH_CONFIGURATION_PARAMETER); - createEAttribute(launchConfigurationParameterEClass, LAUNCH_CONFIGURATION_PARAMETER__VALUE); languageNameParameterEClass = createEClass(LANGUAGE_NAME_PARAMETER); + addonExtensionParameterEClass = createEClass(ADDON_EXTENSION_PARAMETER); + modelURIParameterEClass = createEClass(MODEL_URI_PARAMETER); animatorURIParameterEClass = createEClass(ANIMATOR_URI_PARAMETER); entryPointParameterEClass = createEClass(ENTRY_POINT_PARAMETER); + initializationArgumentsParameterEClass = createEClass(INITIALIZATION_ARGUMENTS_PARAMETER); + modelRootParameterEClass = createEClass(MODEL_ROOT_PARAMETER); initializationMethodParameterEClass = createEClass(INITIALIZATION_METHOD_PARAMETER); - initializationArgumentsParameterEClass = createEClass(INITIALIZATION_ARGUMENTS_PARAMETER); - - addonExtensionParameterEClass = createEClass(ADDON_EXTENSION_PARAMETER); - // Create data types iSerializableEDataType = createEDataType(ISERIALIZABLE); } @@ -771,6 +1120,13 @@ public void initializePackageContents() { ETypeParameter sequentialStepEClass_StepSubtype = addETypeParameter(sequentialStepEClass, "StepSubtype"); ETypeParameter parallelStepEClass_StepSubtype = addETypeParameter(parallelStepEClass, "StepSubtype"); ETypeParameter traceEClass_StepSubType = addETypeParameter(traceEClass, "StepSubType"); + ETypeParameter traceEClass_TracedObjectSubtype = addETypeParameter(traceEClass, "TracedObjectSubtype"); + ETypeParameter traceEClass_StateSubType = addETypeParameter(traceEClass, "StateSubType"); + ETypeParameter tracedObjectEClass_DimensionSubType = addETypeParameter(tracedObjectEClass, "DimensionSubType"); + ETypeParameter dimensionEClass_ValueSubType = addETypeParameter(dimensionEClass, "ValueSubType"); + ETypeParameter genericReferenceValueEClass_T = addETypeParameter(genericReferenceValueEClass, "T"); + ETypeParameter genericTracedObjectEClass_T = addETypeParameter(genericTracedObjectEClass, "T"); + ETypeParameter genericTraceEClass_StepSubType = addETypeParameter(genericTraceEClass, "StepSubType"); // Set bounds for type parameters EGenericType g1 = createEGenericType(this.getStep()); @@ -779,6 +1135,10 @@ public void initializePackageContents() { sequentialStepEClass_StepSubtype.getEBounds().add(g1); g1 = createEGenericType(this.getStep()); parallelStepEClass_StepSubtype.getEBounds().add(g1); + g1 = createEGenericType(this.getValue()); + dimensionEClass_ValueSubType.getEBounds().add(g1); + g1 = createEGenericType(ecorePackage.getEObject()); + genericTracedObjectEClass_T.getEBounds().add(g1); // Add supertypes to classes mseEClass.getESuperTypes().add(theEcorePackage.getENamedElement()); @@ -802,14 +1162,38 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); genericParallelStepEClass.getEGenericSuperTypes().add(g1); genericSmallStepEClass.getESuperTypes().add(this.getSmallStep()); + genericReferenceValueEClass.getESuperTypes().add(this.getValue()); + g1 = createEGenericType(this.getDimension()); + g2 = createEGenericType(this.getValue()); + g1.getETypeArguments().add(g2); + genericDimensionEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(this.getTracedObject()); + g2 = createEGenericType(this.getGenericDimension()); + g1.getETypeArguments().add(g2); + genericTracedObjectEClass.getEGenericSuperTypes().add(g1); + genericStateEClass.getESuperTypes().add(this.getState()); + g1 = createEGenericType(this.getTrace()); + g2 = createEGenericType(genericTraceEClass_StepSubType); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(this.getGenericTracedObject()); + g1.getETypeArguments().add(g2); + EGenericType g3 = createEGenericType(); + g2.getETypeArguments().add(g3); + g2 = createEGenericType(this.getGenericState()); + g1.getETypeArguments().add(g2); + genericTraceEClass.getEGenericSuperTypes().add(g1); + genericAttributeValueEClass.getESuperTypes().add(this.getValue()); + booleanAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); + integerAttributevalueEClass.getESuperTypes().add(this.getGenericAttributeValue()); + stringAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); languageNameParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + addonExtensionParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); modelURIParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); animatorURIParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); entryPointParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + initializationArgumentsParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); modelRootParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); initializationMethodParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - initializationArgumentsParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - addonExtensionParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); // Initialize classes, features, and operations; add parameters initEClass(mseOccurrenceEClass, MSEOccurrence.class, "MSEOccurrence", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -853,34 +1237,75 @@ public void initializePackageContents() { initEClass(genericSmallStepEClass, GenericSmallStep.class, "GenericSmallStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(traceEClass, Trace.class, "Trace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(traceEClass, Trace.class, "Trace", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); g1 = createEGenericType(traceEClass_StepSubType); initEReference(getTrace_RootStep(), g1, null, "rootStep", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(traceEClass_TracedObjectSubtype); + initEReference(getTrace_TracedObjects(), g1, null, "tracedObjects", null, 0, -1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(traceEClass_StateSubType); + initEReference(getTrace_States(), g1, null, "states", null, 0, -1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getTrace_Launchconfiguration(), this.getLaunchConfiguration(), null, "launchconfiguration", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(tracedObjectEClass, TracedObject.class, "TracedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + g1 = createEGenericType(tracedObjectEClass_DimensionSubType); + initEReference(getTracedObject_Dimensions(), g1, null, "dimensions", null, 0, -1, TracedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(dimensionEClass, Dimension.class, "Dimension", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + g1 = createEGenericType(dimensionEClass_ValueSubType); + initEReference(getDimension_Values(), g1, null, "values", null, 0, -1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(valueEClass, Value.class, "Value", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getValue_State(), this.getState(), this.getState_Value(), "state", null, 0, -1, Value.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(stateEClass, State.class, "State", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getState_Value(), this.getValue(), this.getValue_State(), "value", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(genericReferenceValueEClass, GenericReferenceValue.class, "GenericReferenceValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + g1 = createEGenericType(genericReferenceValueEClass_T); + initEReference(getGenericReferenceValue_ReferenceValue(), g1, null, "referenceValue", null, 0, 1, GenericReferenceValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(genericDimensionEClass, GenericDimension.class, "GenericDimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getGenericDimension_DynamicProperty(), theEcorePackage.getEStructuralFeature(), null, "dynamicProperty", null, 0, 1, GenericDimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(genericTracedObjectEClass, GenericTracedObject.class, "GenericTracedObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericStateEClass, GenericState.class, "GenericState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericTraceEClass, GenericTrace.class, "GenericTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericAttributeValueEClass, GenericAttributeValue.class, "GenericAttributeValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(booleanAttributeValueEClass, BooleanAttributeValue.class, "BooleanAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getBooleanAttributeValue_AttributeValue(), theEcorePackage.getEBoolean(), "attributeValue", "false", 0, 1, BooleanAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(integerAttributevalueEClass, IntegerAttributevalue.class, "IntegerAttributevalue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getIntegerAttributevalue_AttributeValue(), theEcorePackage.getEInt(), "attributeValue", null, 0, 1, IntegerAttributevalue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(stringAttributeValueEClass, StringAttributeValue.class, "StringAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getStringAttributeValue_AttributeValue(), theEcorePackage.getEString(), "attributeValue", null, 0, 1, StringAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(launchConfigurationEClass, LaunchConfiguration.class, "LaunchConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getLaunchConfiguration_Parameters(), this.getLaunchConfigurationParameter(), null, "parameters", null, 0, -1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getLaunchConfiguration_Type(), theEcorePackage.getEString(), "type", "", 1, 1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getLaunchConfiguration_Launchconfigurationparameter(), this.getLaunchConfigurationParameter(), null, "launchconfigurationparameter", null, 0, -1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getLaunchConfiguration_Type(), theEcorePackage.getEString(), "type", null, 1, 1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(launchConfigurationParameterEClass, LaunchConfigurationParameter.class, "LaunchConfigurationParameter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getLaunchConfigurationParameter_Value(), theEcorePackage.getEString(), "value", null, 0, 1, LaunchConfigurationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(languageNameParameterEClass, LanguageNameParameter.class, "LanguageNameParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(addonExtensionParameterEClass, AddonExtensionParameter.class, "AddonExtensionParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(modelURIParameterEClass, ModelURIParameter.class, "ModelURIParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(animatorURIParameterEClass, AnimatorURIParameter.class, "AnimatorURIParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(entryPointParameterEClass, EntryPointParameter.class, "EntryPointParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(initializationArgumentsParameterEClass, InitializationArgumentsParameter.class, "InitializationArgumentsParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(modelRootParameterEClass, ModelRootParameter.class, "ModelRootParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(initializationMethodParameterEClass, InitializationMethodParameter.class, "InitializationMethodParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(initializationArgumentsParameterEClass, InitializationArgumentsParameter.class, "InitializationArgumentsParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(addonExtensionParameterEClass, AddonExtensionParameter.class, "AddonExtensionParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - // Initialize data types initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java new file mode 100644 index 000000000..036da5c3d --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java @@ -0,0 +1,150 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; + +import java.util.Collection; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Traced Object'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl#getDimensions Dimensions}
    • + *
+ * + * @generated + */ +public abstract class TracedObjectImpl extends MinimalEObjectImpl.Container implements TracedObject { + /** + * The cached value of the '{@link #getDimensions() Dimensions}' containment reference list. + * + * + * @see #getDimensions() + * @generated + * @ordered + */ + protected EList dimensions; + + /** + * + * + * @generated + */ + protected TracedObjectImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.TRACED_OBJECT; + } + + /** + * + * + * @generated + */ + public EList getDimensions() { + if (dimensions == null) { + dimensions = new EObjectContainmentEList(EObject.class, this, TracePackage.TRACED_OBJECT__DIMENSIONS); + } + return dimensions; + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.TRACED_OBJECT__DIMENSIONS: + return ((InternalEList)getDimensions()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.TRACED_OBJECT__DIMENSIONS: + return getDimensions(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.TRACED_OBJECT__DIMENSIONS: + getDimensions().clear(); + getDimensions().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.TRACED_OBJECT__DIMENSIONS: + getDimensions().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.TRACED_OBJECT__DIMENSIONS: + return dimensions != null && !dimensions.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //TracedObjectImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java new file mode 100644 index 000000000..ffe663901 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java @@ -0,0 +1,162 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.Value; +import java.util.Collection; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl#getState State}
    • + *
+ * + * @generated + */ +public abstract class ValueImpl extends MinimalEObjectImpl.Container implements Value { + /** + * The cached value of the '{@link #getState() State}' reference list. + * + * + * @see #getState() + * @generated + * @ordered + */ + protected EList state; + + /** + * + * + * @generated + */ + protected ValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.VALUE; + } + + /** + * + * + * @generated + */ + public EList getState() { + if (state == null) { + state = new EObjectWithInverseResolvingEList.ManyInverse(State.class, this, TracePackage.VALUE__STATE, TracePackage.STATE__VALUE); + } + return state; + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.VALUE__STATE: + return ((InternalEList)(InternalEList)getState()).basicAdd(otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.VALUE__STATE: + return ((InternalEList)getState()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.VALUE__STATE: + return getState(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.VALUE__STATE: + getState().clear(); + getState().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.VALUE__STATE: + getState().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.VALUE__STATE: + return state != null && !state.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //ValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java index 57f67b3c2..687f1a151 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java @@ -118,10 +118,62 @@ public Adapter caseGenericSmallStep(GenericSmallStep object) { return createGenericSmallStepAdapter(); } @Override - public Adapter caseTrace(Trace object) { + public Adapter caseTrace(Trace object) { return createTraceAdapter(); } @Override + public Adapter caseTracedObject(TracedObject object) { + return createTracedObjectAdapter(); + } + @Override + public Adapter caseDimension(Dimension object) { + return createDimensionAdapter(); + } + @Override + public Adapter caseValue(Value object) { + return createValueAdapter(); + } + @Override + public Adapter caseState(State object) { + return createStateAdapter(); + } + @Override + public Adapter caseGenericReferenceValue(GenericReferenceValue object) { + return createGenericReferenceValueAdapter(); + } + @Override + public Adapter caseGenericDimension(GenericDimension object) { + return createGenericDimensionAdapter(); + } + @Override + public Adapter caseGenericTracedObject(GenericTracedObject object) { + return createGenericTracedObjectAdapter(); + } + @Override + public Adapter caseGenericState(GenericState object) { + return createGenericStateAdapter(); + } + @Override + public Adapter caseGenericTrace(GenericTrace object) { + return createGenericTraceAdapter(); + } + @Override + public Adapter caseGenericAttributeValue(GenericAttributeValue object) { + return createGenericAttributeValueAdapter(); + } + @Override + public Adapter caseBooleanAttributeValue(BooleanAttributeValue object) { + return createBooleanAttributeValueAdapter(); + } + @Override + public Adapter caseIntegerAttributevalue(IntegerAttributevalue object) { + return createIntegerAttributevalueAdapter(); + } + @Override + public Adapter caseStringAttributeValue(StringAttributeValue object) { + return createStringAttributeValueAdapter(); + } + @Override public Adapter caseLaunchConfiguration(LaunchConfiguration object) { return createLaunchConfigurationAdapter(); } @@ -134,6 +186,10 @@ public Adapter caseLanguageNameParameter(LanguageNameParameter object) { return createLanguageNameParameterAdapter(); } @Override + public Adapter caseAddonExtensionParameter(AddonExtensionParameter object) { + return createAddonExtensionParameterAdapter(); + } + @Override public Adapter caseModelURIParameter(ModelURIParameter object) { return createModelURIParameterAdapter(); } @@ -146,6 +202,10 @@ public Adapter caseEntryPointParameter(EntryPointParameter object) { return createEntryPointParameterAdapter(); } @Override + public Adapter caseInitializationArgumentsParameter(InitializationArgumentsParameter object) { + return createInitializationArgumentsParameterAdapter(); + } + @Override public Adapter caseModelRootParameter(ModelRootParameter object) { return createModelRootParameterAdapter(); } @@ -154,14 +214,6 @@ public Adapter caseInitializationMethodParameter(InitializationMethodParameter o return createInitializationMethodParameterAdapter(); } @Override - public Adapter caseInitializationArgumentsParameter(InitializationArgumentsParameter object) { - return createInitializationArgumentsParameterAdapter(); - } - @Override - public Adapter caseAddonExtensionParameter(AddonExtensionParameter object) { - return createAddonExtensionParameterAdapter(); - } - @Override public Adapter caseEModelElement(EModelElement object) { return createEModelElementAdapter(); } @@ -371,6 +423,188 @@ public Adapter createTraceAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.TracedObject + * @generated + */ + public Adapter createTracedObjectAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Dimension + * @generated + */ + public Adapter createDimensionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Value + * @generated + */ + public Adapter createValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.State + * @generated + */ + public Adapter createStateAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue Generic Reference Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue + * @generated + */ + public Adapter createGenericReferenceValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericDimension Generic Dimension}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.GenericDimension + * @generated + */ + public Adapter createGenericDimensionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericTracedObject Generic Traced Object}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.GenericTracedObject + * @generated + */ + public Adapter createGenericTracedObjectAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericState Generic State}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.GenericState + * @generated + */ + public Adapter createGenericStateAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericTrace Generic Trace}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.GenericTrace + * @generated + */ + public Adapter createGenericTraceAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue Generic Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue + * @generated + */ + public Adapter createGenericAttributeValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue Boolean Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue + * @generated + */ + public Adapter createBooleanAttributeValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue Integer Attributevalue}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue + * @generated + */ + public Adapter createIntegerAttributevalueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.StringAttributeValue String Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.StringAttributeValue + * @generated + */ + public Adapter createStringAttributeValueAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration Launch Configuration}'. * @@ -414,100 +648,100 @@ public Adapter createLanguageNameParameterAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ModelURIParameter Model URI Parameter}'. + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter Addon Extension Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.ModelURIParameter + * @see fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter * @generated */ - public Adapter createModelURIParameterAdapter() { + public Adapter createAddonExtensionParameterAdapter() { return null; } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter Animator URI Parameter}'. + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ModelURIParameter Model URI Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter + * @see fr.inria.diverse.trace.commons.model.trace.ModelURIParameter * @generated */ - public Adapter createAnimatorURIParameterAdapter() { + public Adapter createModelURIParameterAdapter() { return null; } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.EntryPointParameter Entry Point Parameter}'. + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter Animator URI Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.EntryPointParameter + * @see fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter * @generated */ - public Adapter createEntryPointParameterAdapter() { + public Adapter createAnimatorURIParameterAdapter() { return null; } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ModelRootParameter Model Root Parameter}'. + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.EntryPointParameter Entry Point Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.ModelRootParameter + * @see fr.inria.diverse.trace.commons.model.trace.EntryPointParameter * @generated */ - public Adapter createModelRootParameterAdapter() { + public Adapter createEntryPointParameterAdapter() { return null; } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter Initialization Method Parameter}'. + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter Initialization Arguments Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter + * @see fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter * @generated */ - public Adapter createInitializationMethodParameterAdapter() { + public Adapter createInitializationArgumentsParameterAdapter() { return null; } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter Initialization Arguments Parameter}'. + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ModelRootParameter Model Root Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter + * @see fr.inria.diverse.trace.commons.model.trace.ModelRootParameter * @generated */ - public Adapter createInitializationArgumentsParameterAdapter() { + public Adapter createModelRootParameterAdapter() { return null; } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter Addon Extension Parameter}'. + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter Initialization Method Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter + * @see fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter * @generated */ - public Adapter createAddonExtensionParameterAdapter() { + public Adapter createInitializationMethodParameterAdapter() { return null; } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java index 9f44759f2..68503c11f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java @@ -24,7 +24,7 @@ * @see fr.inria.diverse.trace.commons.model.trace.TracePackage * @generated */ -public class TraceSwitch extends Switch { +public class TraceSwitch extends Switch { /** * The cached model package * @@ -66,17 +66,17 @@ protected boolean isSwitchFor(EPackage ePackage) { * @generated */ @Override - protected T doSwitch(int classifierID, EObject theEObject) { + protected T1 doSwitch(int classifierID, EObject theEObject) { switch (classifierID) { case TracePackage.MSE_OCCURRENCE: { MSEOccurrence mseOccurrence = (MSEOccurrence)theEObject; - T result = caseMSEOccurrence(mseOccurrence); + T1 result = caseMSEOccurrence(mseOccurrence); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.MSE: { MSE mse = (MSE)theEObject; - T result = caseMSE(mse); + T1 result = caseMSE(mse); if (result == null) result = caseENamedElement(mse); if (result == null) result = caseEModelElement(mse); if (result == null) result = defaultCase(theEObject); @@ -84,13 +84,13 @@ protected T doSwitch(int classifierID, EObject theEObject) { } case TracePackage.MSE_MODEL: { MSEModel mseModel = (MSEModel)theEObject; - T result = caseMSEModel(mseModel); + T1 result = caseMSEModel(mseModel); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.GENERIC_MSE: { GenericMSE genericMSE = (GenericMSE)theEObject; - T result = caseGenericMSE(genericMSE); + T1 result = caseGenericMSE(genericMSE); if (result == null) result = caseMSE(genericMSE); if (result == null) result = caseENamedElement(genericMSE); if (result == null) result = caseEModelElement(genericMSE); @@ -99,27 +99,27 @@ protected T doSwitch(int classifierID, EObject theEObject) { } case TracePackage.STEP: { Step step = (Step)theEObject; - T result = caseStep(step); + T1 result = caseStep(step); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.BIG_STEP: { BigStep bigStep = (BigStep)theEObject; - T result = caseBigStep(bigStep); + T1 result = caseBigStep(bigStep); if (result == null) result = caseStep(bigStep); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.SMALL_STEP: { SmallStep smallStep = (SmallStep)theEObject; - T result = caseSmallStep(smallStep); + T1 result = caseSmallStep(smallStep); if (result == null) result = caseStep(smallStep); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.SEQUENTIAL_STEP: { SequentialStep sequentialStep = (SequentialStep)theEObject; - T result = caseSequentialStep(sequentialStep); + T1 result = caseSequentialStep(sequentialStep); if (result == null) result = caseBigStep(sequentialStep); if (result == null) result = caseStep(sequentialStep); if (result == null) result = defaultCase(theEObject); @@ -127,7 +127,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { } case TracePackage.PARALLEL_STEP: { ParallelStep parallelStep = (ParallelStep)theEObject; - T result = caseParallelStep(parallelStep); + T1 result = caseParallelStep(parallelStep); if (result == null) result = caseBigStep(parallelStep); if (result == null) result = caseStep(parallelStep); if (result == null) result = defaultCase(theEObject); @@ -135,7 +135,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { } case TracePackage.GENERIC_SEQUENTIAL_STEP: { GenericSequentialStep genericSequentialStep = (GenericSequentialStep)theEObject; - T result = caseGenericSequentialStep(genericSequentialStep); + T1 result = caseGenericSequentialStep(genericSequentialStep); if (result == null) result = caseSequentialStep(genericSequentialStep); if (result == null) result = caseBigStep(genericSequentialStep); if (result == null) result = caseStep(genericSequentialStep); @@ -144,7 +144,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { } case TracePackage.GENERIC_PARALLEL_STEP: { GenericParallelStep genericParallelStep = (GenericParallelStep)theEObject; - T result = caseGenericParallelStep(genericParallelStep); + T1 result = caseGenericParallelStep(genericParallelStep); if (result == null) result = caseParallelStep(genericParallelStep); if (result == null) result = caseBigStep(genericParallelStep); if (result == null) result = caseStep(genericParallelStep); @@ -153,86 +153,176 @@ protected T doSwitch(int classifierID, EObject theEObject) { } case TracePackage.GENERIC_SMALL_STEP: { GenericSmallStep genericSmallStep = (GenericSmallStep)theEObject; - T result = caseGenericSmallStep(genericSmallStep); + T1 result = caseGenericSmallStep(genericSmallStep); if (result == null) result = caseSmallStep(genericSmallStep); if (result == null) result = caseStep(genericSmallStep); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.TRACE: { - Trace trace = (Trace)theEObject; - T result = caseTrace(trace); + Trace trace = (Trace)theEObject; + T1 result = caseTrace(trace); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.TRACED_OBJECT: { + TracedObject tracedObject = (TracedObject)theEObject; + T1 result = caseTracedObject(tracedObject); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.DIMENSION: { + Dimension dimension = (Dimension)theEObject; + T1 result = caseDimension(dimension); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.VALUE: { + Value value = (Value)theEObject; + T1 result = caseValue(value); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.STATE: { + State state = (State)theEObject; + T1 result = caseState(state); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.GENERIC_REFERENCE_VALUE: { + GenericReferenceValue genericReferenceValue = (GenericReferenceValue)theEObject; + T1 result = caseGenericReferenceValue(genericReferenceValue); + if (result == null) result = caseValue(genericReferenceValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.GENERIC_DIMENSION: { + GenericDimension genericDimension = (GenericDimension)theEObject; + T1 result = caseGenericDimension(genericDimension); + if (result == null) result = caseDimension(genericDimension); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.GENERIC_TRACED_OBJECT: { + GenericTracedObject genericTracedObject = (GenericTracedObject)theEObject; + T1 result = caseGenericTracedObject(genericTracedObject); + if (result == null) result = caseTracedObject(genericTracedObject); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.GENERIC_STATE: { + GenericState genericState = (GenericState)theEObject; + T1 result = caseGenericState(genericState); + if (result == null) result = caseState(genericState); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.GENERIC_TRACE: { + GenericTrace genericTrace = (GenericTrace)theEObject; + T1 result = caseGenericTrace(genericTrace); + if (result == null) result = caseTrace(genericTrace); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.GENERIC_ATTRIBUTE_VALUE: { + GenericAttributeValue genericAttributeValue = (GenericAttributeValue)theEObject; + T1 result = caseGenericAttributeValue(genericAttributeValue); + if (result == null) result = caseValue(genericAttributeValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.BOOLEAN_ATTRIBUTE_VALUE: { + BooleanAttributeValue booleanAttributeValue = (BooleanAttributeValue)theEObject; + T1 result = caseBooleanAttributeValue(booleanAttributeValue); + if (result == null) result = caseGenericAttributeValue(booleanAttributeValue); + if (result == null) result = caseValue(booleanAttributeValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.INTEGER_ATTRIBUTEVALUE: { + IntegerAttributevalue integerAttributevalue = (IntegerAttributevalue)theEObject; + T1 result = caseIntegerAttributevalue(integerAttributevalue); + if (result == null) result = caseGenericAttributeValue(integerAttributevalue); + if (result == null) result = caseValue(integerAttributevalue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.STRING_ATTRIBUTE_VALUE: { + StringAttributeValue stringAttributeValue = (StringAttributeValue)theEObject; + T1 result = caseStringAttributeValue(stringAttributeValue); + if (result == null) result = caseGenericAttributeValue(stringAttributeValue); + if (result == null) result = caseValue(stringAttributeValue); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.LAUNCH_CONFIGURATION: { LaunchConfiguration launchConfiguration = (LaunchConfiguration)theEObject; - T result = caseLaunchConfiguration(launchConfiguration); + T1 result = caseLaunchConfiguration(launchConfiguration); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.LAUNCH_CONFIGURATION_PARAMETER: { LaunchConfigurationParameter launchConfigurationParameter = (LaunchConfigurationParameter)theEObject; - T result = caseLaunchConfigurationParameter(launchConfigurationParameter); + T1 result = caseLaunchConfigurationParameter(launchConfigurationParameter); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.LANGUAGE_NAME_PARAMETER: { LanguageNameParameter languageNameParameter = (LanguageNameParameter)theEObject; - T result = caseLanguageNameParameter(languageNameParameter); + T1 result = caseLanguageNameParameter(languageNameParameter); if (result == null) result = caseLaunchConfigurationParameter(languageNameParameter); if (result == null) result = defaultCase(theEObject); return result; } + case TracePackage.ADDON_EXTENSION_PARAMETER: { + AddonExtensionParameter addonExtensionParameter = (AddonExtensionParameter)theEObject; + T1 result = caseAddonExtensionParameter(addonExtensionParameter); + if (result == null) result = caseLaunchConfigurationParameter(addonExtensionParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } case TracePackage.MODEL_URI_PARAMETER: { ModelURIParameter modelURIParameter = (ModelURIParameter)theEObject; - T result = caseModelURIParameter(modelURIParameter); + T1 result = caseModelURIParameter(modelURIParameter); if (result == null) result = caseLaunchConfigurationParameter(modelURIParameter); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.ANIMATOR_URI_PARAMETER: { AnimatorURIParameter animatorURIParameter = (AnimatorURIParameter)theEObject; - T result = caseAnimatorURIParameter(animatorURIParameter); + T1 result = caseAnimatorURIParameter(animatorURIParameter); if (result == null) result = caseLaunchConfigurationParameter(animatorURIParameter); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.ENTRY_POINT_PARAMETER: { EntryPointParameter entryPointParameter = (EntryPointParameter)theEObject; - T result = caseEntryPointParameter(entryPointParameter); + T1 result = caseEntryPointParameter(entryPointParameter); if (result == null) result = caseLaunchConfigurationParameter(entryPointParameter); if (result == null) result = defaultCase(theEObject); return result; } + case TracePackage.INITIALIZATION_ARGUMENTS_PARAMETER: { + InitializationArgumentsParameter initializationArgumentsParameter = (InitializationArgumentsParameter)theEObject; + T1 result = caseInitializationArgumentsParameter(initializationArgumentsParameter); + if (result == null) result = caseLaunchConfigurationParameter(initializationArgumentsParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } case TracePackage.MODEL_ROOT_PARAMETER: { ModelRootParameter modelRootParameter = (ModelRootParameter)theEObject; - T result = caseModelRootParameter(modelRootParameter); + T1 result = caseModelRootParameter(modelRootParameter); if (result == null) result = caseLaunchConfigurationParameter(modelRootParameter); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.INITIALIZATION_METHOD_PARAMETER: { InitializationMethodParameter initializationMethodParameter = (InitializationMethodParameter)theEObject; - T result = caseInitializationMethodParameter(initializationMethodParameter); + T1 result = caseInitializationMethodParameter(initializationMethodParameter); if (result == null) result = caseLaunchConfigurationParameter(initializationMethodParameter); if (result == null) result = defaultCase(theEObject); return result; } - case TracePackage.INITIALIZATION_ARGUMENTS_PARAMETER: { - InitializationArgumentsParameter initializationArgumentsParameter = (InitializationArgumentsParameter)theEObject; - T result = caseInitializationArgumentsParameter(initializationArgumentsParameter); - if (result == null) result = caseLaunchConfigurationParameter(initializationArgumentsParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.ADDON_EXTENSION_PARAMETER: { - AddonExtensionParameter addonExtensionParameter = (AddonExtensionParameter)theEObject; - T result = caseAddonExtensionParameter(addonExtensionParameter); - if (result == null) result = caseLaunchConfigurationParameter(addonExtensionParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } default: return defaultCase(theEObject); } } @@ -248,7 +338,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseMSEOccurrence(MSEOccurrence object) { + public T1 caseMSEOccurrence(MSEOccurrence object) { return null; } @@ -263,7 +353,7 @@ public T caseMSEOccurrence(MSEOccurrence object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseMSE(MSE object) { + public T1 caseMSE(MSE object) { return null; } @@ -278,7 +368,7 @@ public T caseMSE(MSE object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseMSEModel(MSEModel object) { + public T1 caseMSEModel(MSEModel object) { return null; } @@ -293,7 +383,7 @@ public T caseMSEModel(MSEModel object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseGenericMSE(GenericMSE object) { + public T1 caseGenericMSE(GenericMSE object) { return null; } @@ -308,7 +398,7 @@ public T caseGenericMSE(GenericMSE object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseStep(Step object) { + public T1 caseStep(Step object) { return null; } @@ -323,7 +413,7 @@ public T caseStep(Step object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseBigStep(BigStep object) { + public T1 caseBigStep(BigStep object) { return null; } @@ -338,7 +428,7 @@ public T caseBigStep(BigStep object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseSmallStep(SmallStep object) { + public T1 caseSmallStep(SmallStep object) { return null; } @@ -353,7 +443,7 @@ public T caseSmallStep(SmallStep object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseSequentialStep(SequentialStep object) { + public T1 caseSequentialStep(SequentialStep object) { return null; } @@ -368,7 +458,7 @@ public T caseSequentialStep(SequentialStep T caseParallelStep(ParallelStep object) { + public T1 caseParallelStep(ParallelStep object) { return null; } @@ -383,7 +473,7 @@ public T caseParallelStep(ParallelStep o * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseGenericSequentialStep(GenericSequentialStep object) { + public T1 caseGenericSequentialStep(GenericSequentialStep object) { return null; } @@ -398,7 +488,7 @@ public T caseGenericSequentialStep(GenericSequentialStep object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseGenericParallelStep(GenericParallelStep object) { + public T1 caseGenericParallelStep(GenericParallelStep object) { return null; } @@ -413,7 +503,7 @@ public T caseGenericParallelStep(GenericParallelStep object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseGenericSmallStep(GenericSmallStep object) { + public T1 caseGenericSmallStep(GenericSmallStep object) { return null; } @@ -428,7 +518,202 @@ public T caseGenericSmallStep(GenericSmallStep object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseTrace(Trace object) { + public T1 caseTrace(Trace object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Traced Object'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Traced Object'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseTracedObject(TracedObject object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Dimension'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Dimension'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseDimension(Dimension object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseValue(Value object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'State'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'State'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseState(State object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Reference Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Reference Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseGenericReferenceValue(GenericReferenceValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Dimension'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Dimension'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseGenericDimension(GenericDimension object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Traced Object'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Traced Object'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseGenericTracedObject(GenericTracedObject object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic State'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic State'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseGenericState(GenericState object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Trace'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Trace'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseGenericTrace(GenericTrace object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseGenericAttributeValue(GenericAttributeValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Boolean Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Boolean Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseBooleanAttributeValue(BooleanAttributeValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Integer Attributevalue'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Integer Attributevalue'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseIntegerAttributevalue(IntegerAttributevalue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'String Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'String Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseStringAttributeValue(StringAttributeValue object) { return null; } @@ -443,7 +728,7 @@ public T caseTrace(Trace object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseLaunchConfiguration(LaunchConfiguration object) { + public T1 caseLaunchConfiguration(LaunchConfiguration object) { return null; } @@ -458,7 +743,7 @@ public T caseLaunchConfiguration(LaunchConfiguration object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseLaunchConfigurationParameter(LaunchConfigurationParameter object) { + public T1 caseLaunchConfigurationParameter(LaunchConfigurationParameter object) { return null; } @@ -473,112 +758,112 @@ public T caseLaunchConfigurationParameter(LaunchConfigurationParameter object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseLanguageNameParameter(LanguageNameParameter object) { + public T1 caseLanguageNameParameter(LanguageNameParameter object) { return null; } /** - * Returns the result of interpreting the object as an instance of 'Model URI Parameter'. + * Returns the result of interpreting the object as an instance of 'Addon Extension Parameter'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Model URI Parameter'. + * @return the result of interpreting the object as an instance of 'Addon Extension Parameter'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseModelURIParameter(ModelURIParameter object) { + public T1 caseAddonExtensionParameter(AddonExtensionParameter object) { return null; } /** - * Returns the result of interpreting the object as an instance of 'Animator URI Parameter'. + * Returns the result of interpreting the object as an instance of 'Model URI Parameter'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Animator URI Parameter'. + * @return the result of interpreting the object as an instance of 'Model URI Parameter'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseAnimatorURIParameter(AnimatorURIParameter object) { + public T1 caseModelURIParameter(ModelURIParameter object) { return null; } /** - * Returns the result of interpreting the object as an instance of 'Entry Point Parameter'. + * Returns the result of interpreting the object as an instance of 'Animator URI Parameter'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Entry Point Parameter'. + * @return the result of interpreting the object as an instance of 'Animator URI Parameter'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseEntryPointParameter(EntryPointParameter object) { + public T1 caseAnimatorURIParameter(AnimatorURIParameter object) { return null; } /** - * Returns the result of interpreting the object as an instance of 'Model Root Parameter'. + * Returns the result of interpreting the object as an instance of 'Entry Point Parameter'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Model Root Parameter'. + * @return the result of interpreting the object as an instance of 'Entry Point Parameter'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseModelRootParameter(ModelRootParameter object) { + public T1 caseEntryPointParameter(EntryPointParameter object) { return null; } /** - * Returns the result of interpreting the object as an instance of 'Initialization Method Parameter'. + * Returns the result of interpreting the object as an instance of 'Initialization Arguments Parameter'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Initialization Method Parameter'. + * @return the result of interpreting the object as an instance of 'Initialization Arguments Parameter'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseInitializationMethodParameter(InitializationMethodParameter object) { + public T1 caseInitializationArgumentsParameter(InitializationArgumentsParameter object) { return null; } /** - * Returns the result of interpreting the object as an instance of 'Initialization Arguments Parameter'. + * Returns the result of interpreting the object as an instance of 'Model Root Parameter'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Initialization Arguments Parameter'. + * @return the result of interpreting the object as an instance of 'Model Root Parameter'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseInitializationArgumentsParameter(InitializationArgumentsParameter object) { + public T1 caseModelRootParameter(ModelRootParameter object) { return null; } /** - * Returns the result of interpreting the object as an instance of 'Addon Extension Parameter'. + * Returns the result of interpreting the object as an instance of 'Initialization Method Parameter'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Addon Extension Parameter'. + * @return the result of interpreting the object as an instance of 'Initialization Method Parameter'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseAddonExtensionParameter(AddonExtensionParameter object) { + public T1 caseInitializationMethodParameter(InitializationMethodParameter object) { return null; } @@ -593,7 +878,7 @@ public T caseAddonExtensionParameter(AddonExtensionParameter object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseEModelElement(EModelElement object) { + public T1 caseEModelElement(EModelElement object) { return null; } @@ -608,7 +893,7 @@ public T caseEModelElement(EModelElement object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseENamedElement(ENamedElement object) { + public T1 caseENamedElement(ENamedElement object) { return null; } @@ -624,7 +909,7 @@ public T caseENamedElement(ENamedElement object) { * @generated */ @Override - public T defaultCase(EObject object) { + public T1 defaultCase(EObject object) { return null; } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF index cc4fbc604..dc97c74e6 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF @@ -15,7 +15,16 @@ Require-Bundle: org.eclipse.xtend.lib, org.eclipse.emf.ecore;visibility:=reexport, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0";visibility:=reexport Bundle-ActivationPolicy: lazy -Export-Package: fr.inria.diverse.trace.metamodel.generator +Export-Package: fr.inria.diverse.trace.metamodel.generator, + base, + base.States, + base.States.impl, + base.States.util, + base.Steps, + base.Steps.impl, + base.Steps.util, + base.impl, + base.util Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/build.properties b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/build.properties index 761d5f715..4465407fc 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/build.properties +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/build.properties @@ -2,8 +2,9 @@ bin.includes = .,\ model/,\ - META-INF/ + META-INF/,\ + plugin.xml,\ + plugin.properties jars.compile.order = . -source.. = src/,\ - xtend-gen/ +source.. = src/ output.. = bin/ diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird new file mode 100644 index 000000000..24657b714 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird @@ -0,0 +1,1142 @@ + + + + base.ecore + platform:/resource/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore + platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore + http://www.eclipse.org/emf/2002/Ecore + + + + + + + + + + + + + + + bold + + + + + + + + + + bold + + + + bold + + + + + + bold + + + + + + + bold + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + italic + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + italic + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + bold + + + bold + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + bold + + + + + + + + + + + + + + + + + + + + + + + + bold + + + + + + + + + + labelSize + bold + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + + + + + italic + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + routingStyle + + + italic + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + italic + + + + + + + + + + routingStyle + + + italic + + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore index c6eb013c7..fe9dc8f81 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore @@ -2,34 +2,64 @@ - + + + + + + + + + + - + eType="#//States/SpecificState" eOpposite="#//States/SpecificState/startedSteps"/> + - + - + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.properties b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.properties new file mode 100644 index 000000000..52ff7edbb --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.properties @@ -0,0 +1,4 @@ +# + +pluginName = Base Model +providerName = www.example.org diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.xml b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.xml new file mode 100644 index 000000000..cbe8ae31d --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BaseFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BaseFactory.java new file mode 100644 index 000000000..08f0de584 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BaseFactory.java @@ -0,0 +1,42 @@ +/** + */ +package base; + +import org.eclipse.emf.ecore.EFactory; + +/** + * + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + * + * @see base.BasePackage + * @generated + */ +public interface BaseFactory extends EFactory { + /** + * The singleton instance of the factory. + * + * + * @generated + */ + BaseFactory eINSTANCE = base.impl.BaseFactoryImpl.init(); + + /** + * Returns a new object of class 'Specific Trace'. + * + * + * @return a new object of class 'Specific Trace'. + * @generated + */ + SpecificTrace createSpecificTrace(); + + /** + * Returns the package supported by this factory. + * + * + * @return the package supported by this factory. + * @generated + */ + BasePackage getBasePackage(); + +} //BaseFactory diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java new file mode 100644 index 000000000..75456ea51 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java @@ -0,0 +1,169 @@ +/** + */ +package base; + +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; + +/** + * + * The Package for the model. + * It contains accessors for the meta objects to represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @see base.BaseFactory + * @model kind="package" + * @generated + */ +public interface BasePackage extends EPackage { + /** + * The package name. + * + * + * @generated + */ + String eNAME = "base"; + + /** + * The package namespace URI. + * + * + * @generated + */ + String eNS_URI = "http://base/1.0"; + + /** + * The package namespace name. + * + * + * @generated + */ + String eNS_PREFIX = "base"; + + /** + * The singleton instance of the package. + * + * + * @generated + */ + BasePackage eINSTANCE = base.impl.BasePackageImpl.init(); + + /** + * The meta object id for the '{@link base.impl.SpecificTraceImpl Specific Trace}' class. + * + * + * @see base.impl.SpecificTraceImpl + * @see base.impl.BasePackageImpl#getSpecificTrace() + * @generated + */ + int SPECIFIC_TRACE = 0; + + /** + * The feature id for the 'Root Step' containment reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACE__ROOT_STEP = TracePackage.TRACE__ROOT_STEP; + + /** + * The feature id for the 'Traced Objects' containment reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACE__TRACED_OBJECTS = TracePackage.TRACE__TRACED_OBJECTS; + + /** + * The feature id for the 'States' containment reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACE__STATES = TracePackage.TRACE__STATES; + + /** + * The feature id for the 'Launchconfiguration' containment reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACE__LAUNCHCONFIGURATION = TracePackage.TRACE__LAUNCHCONFIGURATION; + + /** + * The number of structural features of the 'Specific Trace' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACE_FEATURE_COUNT = TracePackage.TRACE_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Specific Trace' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACE_OPERATION_COUNT = TracePackage.TRACE_OPERATION_COUNT + 0; + + + /** + * Returns the meta object for class '{@link base.SpecificTrace Specific Trace}'. + * + * + * @return the meta object for class 'Specific Trace'. + * @see base.SpecificTrace + * @generated + */ + EClass getSpecificTrace(); + + /** + * Returns the factory that creates the instances of the model. + * + * + * @return the factory that creates the instances of the model. + * @generated + */ + BaseFactory getBaseFactory(); + + /** + * + * Defines literals for the meta objects that represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link base.impl.SpecificTraceImpl Specific Trace}' class. + * + * + * @see base.impl.SpecificTraceImpl + * @see base.impl.BasePackageImpl#getSpecificTrace() + * @generated + */ + EClass SPECIFIC_TRACE = eINSTANCE.getSpecificTrace(); + + } + +} //BasePackage diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java new file mode 100644 index 000000000..9d89788be --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java @@ -0,0 +1,27 @@ +/** + */ +package base; + +import base.States.SpecificDimension; +import base.States.SpecificState; +import base.States.SpecificTracedObject; + +import base.States.SpecificValue; +import base.Steps.SpecificStep; + +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.Trace; + +/** + * + * A representation of the model object 'Specific Trace'. + * + * + * + * @see base.BasePackage#getSpecificTrace() + * @model + * @generated + */ +public interface SpecificTrace extends Trace, SpecificTracedObject>, SpecificState> { + +} // SpecificTrace diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java new file mode 100644 index 000000000..cecfb315e --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java @@ -0,0 +1,40 @@ +/** + */ +package base.States; + +import org.eclipse.emf.common.util.EList; + +/** + * + * A representation of the model object 'Specific Attribute Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link base.States.SpecificAttributeValue#getStatesNoOpposite States No Opposite}
    • + *
+ * + * @see base.States.StatesPackage#getSpecificAttributeValue() + * @model interface="true" abstract="true" + * @generated + */ +public interface SpecificAttributeValue extends SpecificValue { + /** + * Returns the value of the 'States No Opposite' reference list. + * The list contents are of type {@link base.States.SpecificState}. + * + *

+ * If the meaning of the 'States No Opposite' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'States No Opposite' reference list. + * @see base.States.StatesPackage#getSpecificAttributeValue_StatesNoOpposite() + * @model required="true" transient="true" changeable="false" volatile="true" derived="true" + * @generated + */ + EList getStatesNoOpposite(); + +} // SpecificAttributeValue diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificDimension.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificDimension.java new file mode 100644 index 000000000..5585f155a --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificDimension.java @@ -0,0 +1,18 @@ +/** + */ +package base.States; + +import fr.inria.diverse.trace.commons.model.trace.Dimension; + +/** + * + * A representation of the model object 'Specific Dimension'. + * + * + * + * @see base.States.StatesPackage#getSpecificDimension() + * @model abstract="true" + * @generated + */ +public interface SpecificDimension extends Dimension { +} // SpecificDimension diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java new file mode 100644 index 000000000..f1a3504d3 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java @@ -0,0 +1,40 @@ +/** + */ +package base.States; + +import org.eclipse.emf.common.util.EList; + +/** + * + * A representation of the model object 'Specific Reference Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link base.States.SpecificReferenceValue#getStatesNoOpposite States No Opposite}
    • + *
+ * + * @see base.States.StatesPackage#getSpecificReferenceValue() + * @model interface="true" abstract="true" + * @generated + */ +public interface SpecificReferenceValue extends SpecificValue { + /** + * Returns the value of the 'States No Opposite' reference list. + * The list contents are of type {@link base.States.SpecificState}. + * + *

+ * If the meaning of the 'States No Opposite' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'States No Opposite' reference list. + * @see base.States.StatesPackage#getSpecificReferenceValue_StatesNoOpposite() + * @model required="true" transient="true" changeable="false" volatile="true" derived="true" + * @generated + */ + EList getStatesNoOpposite(); + +} // SpecificReferenceValue diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java new file mode 100644 index 000000000..dccd3ee86 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java @@ -0,0 +1,65 @@ +/** + */ +package base.States; + +import base.Steps.SpecificStep; + +import fr.inria.diverse.trace.commons.model.trace.State; + +import org.eclipse.emf.common.util.EList; + +/** + * + * A representation of the model object 'Specific State'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link base.States.SpecificState#getStartedSteps Started Steps}
    • + *
  • {@link base.States.SpecificState#getEndedSteps Ended Steps}
    • + *
+ * + * @see base.States.StatesPackage#getSpecificState() + * @model + * @generated + */ +public interface SpecificState extends State { + /** + * Returns the value of the 'Started Steps' reference list. + * The list contents are of type {@link base.Steps.SpecificStep}. + * It is bidirectional and its opposite is '{@link base.Steps.SpecificStep#getStartingState Starting State}'. + * + *

+ * If the meaning of the 'Started Steps' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Started Steps' reference list. + * @see base.States.StatesPackage#getSpecificState_StartedSteps() + * @see base.Steps.SpecificStep#getStartingState + * @model opposite="startingState" + * @generated + */ + EList getStartedSteps(); + + /** + * Returns the value of the 'Ended Steps' reference list. + * The list contents are of type {@link base.Steps.SpecificStep}. + * It is bidirectional and its opposite is '{@link base.Steps.SpecificStep#getEndingState Ending State}'. + * + *

+ * If the meaning of the 'Ended Steps' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Ended Steps' reference list. + * @see base.States.StatesPackage#getSpecificState_EndedSteps() + * @see base.Steps.SpecificStep#getEndingState + * @model opposite="endingState" + * @generated + */ + EList getEndedSteps(); + +} // SpecificState diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java new file mode 100644 index 000000000..576b70c5a --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java @@ -0,0 +1,18 @@ +/** + */ +package base.States; + +import fr.inria.diverse.trace.commons.model.trace.TracedObject; + +/** + * + * A representation of the model object 'Specific Traced Object'. + * + * + * + * @see base.States.StatesPackage#getSpecificTracedObject() + * @model abstract="true" + * @generated + */ +public interface SpecificTracedObject extends TracedObject> { +} // SpecificTracedObject diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java new file mode 100644 index 000000000..685390298 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java @@ -0,0 +1,19 @@ +/** + */ +package base.States; + +import fr.inria.diverse.trace.commons.model.trace.Value; + +/** + * + * A representation of the model object 'Specific Value'. + * + * + * + * @see base.States.StatesPackage#getSpecificValue() + * @model abstract="true" + * @generated + */ +public interface SpecificValue extends Value { + +} // SpecificValue diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesFactory.java new file mode 100644 index 000000000..f25c304a4 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesFactory.java @@ -0,0 +1,42 @@ +/** + */ +package base.States; + +import org.eclipse.emf.ecore.EFactory; + +/** + * + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + * + * @see base.States.StatesPackage + * @generated + */ +public interface StatesFactory extends EFactory { + /** + * The singleton instance of the factory. + * + * + * @generated + */ + StatesFactory eINSTANCE = base.States.impl.StatesFactoryImpl.init(); + + /** + * Returns a new object of class 'Specific State'. + * + * + * @return a new object of class 'Specific State'. + * @generated + */ + SpecificState createSpecificState(); + + /** + * Returns the package supported by this factory. + * + * + * @return the package supported by this factory. + * @generated + */ + StatesPackage getStatesPackage(); + +} //StatesFactory diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java new file mode 100644 index 000000000..a4414f026 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java @@ -0,0 +1,541 @@ +/** + */ +package base.States; + +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +/** + * + * The Package for the model. + * It contains accessors for the meta objects to represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @see base.States.StatesFactory + * @model kind="package" + * @generated + */ +public interface StatesPackage extends EPackage { + /** + * The package name. + * + * + * @generated + */ + String eNAME = "States"; + + /** + * The package namespace URI. + * + * + * @generated + */ + String eNS_URI = "http://tracedclasses/1.0"; + + /** + * The package namespace name. + * + * + * @generated + */ + String eNS_PREFIX = "tracedclasses"; + + /** + * The singleton instance of the package. + * + * + * @generated + */ + StatesPackage eINSTANCE = base.States.impl.StatesPackageImpl.init(); + + /** + * The meta object id for the '{@link base.States.impl.SpecificStateImpl Specific State}' class. + * + * + * @see base.States.impl.SpecificStateImpl + * @see base.States.impl.StatesPackageImpl#getSpecificState() + * @generated + */ + int SPECIFIC_STATE = 0; + + /** + * The feature id for the 'Value' reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STATE__VALUE = TracePackage.STATE__VALUE; + + /** + * The feature id for the 'Started Steps' reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STATE__STARTED_STEPS = TracePackage.STATE_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Ended Steps' reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STATE__ENDED_STEPS = TracePackage.STATE_FEATURE_COUNT + 1; + + /** + * The number of structural features of the 'Specific State' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STATE_FEATURE_COUNT = TracePackage.STATE_FEATURE_COUNT + 2; + + /** + * The number of operations of the 'Specific State' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link base.States.impl.SpecificValueImpl Specific Value}' class. + * + * + * @see base.States.impl.SpecificValueImpl + * @see base.States.impl.StatesPackageImpl#getSpecificValue() + * @generated + */ + int SPECIFIC_VALUE = 5; + + /** + * The feature id for the 'State' reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_VALUE__STATE = TracePackage.VALUE__STATE; + + /** + * The number of structural features of the 'Specific Value' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_VALUE_FEATURE_COUNT = TracePackage.VALUE_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Specific Value' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_VALUE_OPERATION_COUNT = TracePackage.VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link base.States.SpecificAttributeValue Specific Attribute Value}' class. + * + * + * @see base.States.SpecificAttributeValue + * @see base.States.impl.StatesPackageImpl#getSpecificAttributeValue() + * @generated + */ + int SPECIFIC_ATTRIBUTE_VALUE = 1; + + /** + * The feature id for the 'State' reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ATTRIBUTE_VALUE__STATE = SPECIFIC_VALUE__STATE; + + /** + * The feature id for the 'States No Opposite' reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ATTRIBUTE_VALUE__STATES_NO_OPPOSITE = SPECIFIC_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Specific Attribute Value' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ATTRIBUTE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Specific Attribute Value' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ATTRIBUTE_VALUE_OPERATION_COUNT = SPECIFIC_VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link base.States.impl.SpecificDimensionImpl Specific Dimension}' class. + * + * + * @see base.States.impl.SpecificDimensionImpl + * @see base.States.impl.StatesPackageImpl#getSpecificDimension() + * @generated + */ + int SPECIFIC_DIMENSION = 2; + + /** + * The feature id for the 'Values' containment reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_DIMENSION__VALUES = TracePackage.DIMENSION__VALUES; + + /** + * The number of structural features of the 'Specific Dimension' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_DIMENSION_FEATURE_COUNT = TracePackage.DIMENSION_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Specific Dimension' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_DIMENSION_OPERATION_COUNT = TracePackage.DIMENSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link base.States.impl.SpecificTracedObjectImpl Specific Traced Object}' class. + * + * + * @see base.States.impl.SpecificTracedObjectImpl + * @see base.States.impl.StatesPackageImpl#getSpecificTracedObject() + * @generated + */ + int SPECIFIC_TRACED_OBJECT = 3; + + /** + * The feature id for the 'Dimensions' containment reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACED_OBJECT__DIMENSIONS = TracePackage.TRACED_OBJECT__DIMENSIONS; + + /** + * The number of structural features of the 'Specific Traced Object' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACED_OBJECT_FEATURE_COUNT = TracePackage.TRACED_OBJECT_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Specific Traced Object' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACED_OBJECT_OPERATION_COUNT = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 0; + + + /** + * The meta object id for the '{@link base.States.SpecificReferenceValue Specific Reference Value}' class. + * + * + * @see base.States.SpecificReferenceValue + * @see base.States.impl.StatesPackageImpl#getSpecificReferenceValue() + * @generated + */ + int SPECIFIC_REFERENCE_VALUE = 4; + + /** + * The feature id for the 'State' reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_REFERENCE_VALUE__STATE = SPECIFIC_VALUE__STATE; + + /** + * The feature id for the 'States No Opposite' reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_REFERENCE_VALUE__STATES_NO_OPPOSITE = SPECIFIC_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Specific Reference Value' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_REFERENCE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Specific Reference Value' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_REFERENCE_VALUE_OPERATION_COUNT = SPECIFIC_VALUE_OPERATION_COUNT + 0; + + + /** + * Returns the meta object for class '{@link base.States.SpecificState Specific State}'. + * + * + * @return the meta object for class 'Specific State'. + * @see base.States.SpecificState + * @generated + */ + EClass getSpecificState(); + + /** + * Returns the meta object for the reference list '{@link base.States.SpecificState#getStartedSteps Started Steps}'. + * + * + * @return the meta object for the reference list 'Started Steps'. + * @see base.States.SpecificState#getStartedSteps() + * @see #getSpecificState() + * @generated + */ + EReference getSpecificState_StartedSteps(); + + /** + * Returns the meta object for the reference list '{@link base.States.SpecificState#getEndedSteps Ended Steps}'. + * + * + * @return the meta object for the reference list 'Ended Steps'. + * @see base.States.SpecificState#getEndedSteps() + * @see #getSpecificState() + * @generated + */ + EReference getSpecificState_EndedSteps(); + + /** + * Returns the meta object for class '{@link base.States.SpecificAttributeValue Specific Attribute Value}'. + * + * + * @return the meta object for class 'Specific Attribute Value'. + * @see base.States.SpecificAttributeValue + * @generated + */ + EClass getSpecificAttributeValue(); + + /** + * Returns the meta object for the reference list '{@link base.States.SpecificAttributeValue#getStatesNoOpposite States No Opposite}'. + * + * + * @return the meta object for the reference list 'States No Opposite'. + * @see base.States.SpecificAttributeValue#getStatesNoOpposite() + * @see #getSpecificAttributeValue() + * @generated + */ + EReference getSpecificAttributeValue_StatesNoOpposite(); + + /** + * Returns the meta object for class '{@link base.States.SpecificDimension Specific Dimension}'. + * + * + * @return the meta object for class 'Specific Dimension'. + * @see base.States.SpecificDimension + * @generated + */ + EClass getSpecificDimension(); + + /** + * Returns the meta object for class '{@link base.States.SpecificTracedObject Specific Traced Object}'. + * + * + * @return the meta object for class 'Specific Traced Object'. + * @see base.States.SpecificTracedObject + * @generated + */ + EClass getSpecificTracedObject(); + + /** + * Returns the meta object for class '{@link base.States.SpecificReferenceValue Specific Reference Value}'. + * + * + * @return the meta object for class 'Specific Reference Value'. + * @see base.States.SpecificReferenceValue + * @generated + */ + EClass getSpecificReferenceValue(); + + /** + * Returns the meta object for the reference list '{@link base.States.SpecificReferenceValue#getStatesNoOpposite States No Opposite}'. + * + * + * @return the meta object for the reference list 'States No Opposite'. + * @see base.States.SpecificReferenceValue#getStatesNoOpposite() + * @see #getSpecificReferenceValue() + * @generated + */ + EReference getSpecificReferenceValue_StatesNoOpposite(); + + /** + * Returns the meta object for class '{@link base.States.SpecificValue Specific Value}'. + * + * + * @return the meta object for class 'Specific Value'. + * @see base.States.SpecificValue + * @generated + */ + EClass getSpecificValue(); + + /** + * Returns the factory that creates the instances of the model. + * + * + * @return the factory that creates the instances of the model. + * @generated + */ + StatesFactory getStatesFactory(); + + /** + * + * Defines literals for the meta objects that represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link base.States.impl.SpecificStateImpl Specific State}' class. + * + * + * @see base.States.impl.SpecificStateImpl + * @see base.States.impl.StatesPackageImpl#getSpecificState() + * @generated + */ + EClass SPECIFIC_STATE = eINSTANCE.getSpecificState(); + + /** + * The meta object literal for the 'Started Steps' reference list feature. + * + * + * @generated + */ + EReference SPECIFIC_STATE__STARTED_STEPS = eINSTANCE.getSpecificState_StartedSteps(); + + /** + * The meta object literal for the 'Ended Steps' reference list feature. + * + * + * @generated + */ + EReference SPECIFIC_STATE__ENDED_STEPS = eINSTANCE.getSpecificState_EndedSteps(); + + /** + * The meta object literal for the '{@link base.States.SpecificAttributeValue Specific Attribute Value}' class. + * + * + * @see base.States.SpecificAttributeValue + * @see base.States.impl.StatesPackageImpl#getSpecificAttributeValue() + * @generated + */ + EClass SPECIFIC_ATTRIBUTE_VALUE = eINSTANCE.getSpecificAttributeValue(); + + /** + * The meta object literal for the 'States No Opposite' reference list feature. + * + * + * @generated + */ + EReference SPECIFIC_ATTRIBUTE_VALUE__STATES_NO_OPPOSITE = eINSTANCE.getSpecificAttributeValue_StatesNoOpposite(); + + /** + * The meta object literal for the '{@link base.States.impl.SpecificDimensionImpl Specific Dimension}' class. + * + * + * @see base.States.impl.SpecificDimensionImpl + * @see base.States.impl.StatesPackageImpl#getSpecificDimension() + * @generated + */ + EClass SPECIFIC_DIMENSION = eINSTANCE.getSpecificDimension(); + + /** + * The meta object literal for the '{@link base.States.impl.SpecificTracedObjectImpl Specific Traced Object}' class. + * + * + * @see base.States.impl.SpecificTracedObjectImpl + * @see base.States.impl.StatesPackageImpl#getSpecificTracedObject() + * @generated + */ + EClass SPECIFIC_TRACED_OBJECT = eINSTANCE.getSpecificTracedObject(); + + /** + * The meta object literal for the '{@link base.States.SpecificReferenceValue Specific Reference Value}' class. + * + * + * @see base.States.SpecificReferenceValue + * @see base.States.impl.StatesPackageImpl#getSpecificReferenceValue() + * @generated + */ + EClass SPECIFIC_REFERENCE_VALUE = eINSTANCE.getSpecificReferenceValue(); + + /** + * The meta object literal for the 'States No Opposite' reference list feature. + * + * + * @generated + */ + EReference SPECIFIC_REFERENCE_VALUE__STATES_NO_OPPOSITE = eINSTANCE.getSpecificReferenceValue_StatesNoOpposite(); + + /** + * The meta object literal for the '{@link base.States.impl.SpecificValueImpl Specific Value}' class. + * + * + * @see base.States.impl.SpecificValueImpl + * @see base.States.impl.StatesPackageImpl#getSpecificValue() + * @generated + */ + EClass SPECIFIC_VALUE = eINSTANCE.getSpecificValue(); + + } + +} //StatesPackage diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java new file mode 100644 index 000000000..82de2350d --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java @@ -0,0 +1,54 @@ +/** + */ +package base.States.impl; + +import base.States.SpecificDimension; +import base.States.SpecificValue; +import base.States.StatesPackage; +import fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; + +/** + * + * An implementation of the model object 'Specific Dimension'. + * + * + * @generated + */ +public abstract class SpecificDimensionImpl extends DimensionImpl implements SpecificDimension { + /** + * + * + * @generated + */ + protected SpecificDimensionImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return StatesPackage.Literals.SPECIFIC_DIMENSION; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getValues() { + if (values == null) { + values = new EObjectContainmentEList(SpecificValue.class, this, StatesPackage.SPECIFIC_DIMENSION__VALUES); + } + return values; + } + +} //SpecificDimensionImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java new file mode 100644 index 000000000..2869ee509 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java @@ -0,0 +1,207 @@ +/** + */ +package base.States.impl; + +import base.States.SpecificState; +import base.States.StatesPackage; + +import base.Steps.SpecificStep; +import base.Steps.StepsPackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.StateImpl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Specific State'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link base.States.impl.SpecificStateImpl#getStartedSteps Started Steps}
    • + *
  • {@link base.States.impl.SpecificStateImpl#getEndedSteps Ended Steps}
    • + *
+ * + * @generated + */ +public class SpecificStateImpl extends StateImpl implements SpecificState { + /** + * The cached value of the '{@link #getStartedSteps() Started Steps}' reference list. + * + * + * @see #getStartedSteps() + * @generated + * @ordered + */ + protected EList startedSteps; + + /** + * The cached value of the '{@link #getEndedSteps() Ended Steps}' reference list. + * + * + * @see #getEndedSteps() + * @generated + * @ordered + */ + protected EList endedSteps; + + /** + * + * + * @generated + */ + protected SpecificStateImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return StatesPackage.Literals.SPECIFIC_STATE; + } + + /** + * + * + * @generated + */ + public EList getStartedSteps() { + if (startedSteps == null) { + startedSteps = new EObjectWithInverseResolvingEList(SpecificStep.class, this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS, StepsPackage.SPECIFIC_STEP__STARTING_STATE); + } + return startedSteps; + } + + /** + * + * + * @generated + */ + public EList getEndedSteps() { + if (endedSteps == null) { + endedSteps = new EObjectWithInverseResolvingEList(SpecificStep.class, this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS, StepsPackage.SPECIFIC_STEP__ENDING_STATE); + } + return endedSteps; + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: + return ((InternalEList)(InternalEList)getStartedSteps()).basicAdd(otherEnd, msgs); + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: + return ((InternalEList)(InternalEList)getEndedSteps()).basicAdd(otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: + return ((InternalEList)getStartedSteps()).basicRemove(otherEnd, msgs); + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: + return ((InternalEList)getEndedSteps()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: + return getStartedSteps(); + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: + return getEndedSteps(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: + getStartedSteps().clear(); + getStartedSteps().addAll((Collection)newValue); + return; + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: + getEndedSteps().clear(); + getEndedSteps().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: + getStartedSteps().clear(); + return; + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: + getEndedSteps().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: + return startedSteps != null && !startedSteps.isEmpty(); + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: + return endedSteps != null && !endedSteps.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //SpecificStateImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java new file mode 100644 index 000000000..57ae32949 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java @@ -0,0 +1,57 @@ +/** + */ +package base.States.impl; + +import base.States.SpecificDimension; +import base.States.SpecificTracedObject; +import base.States.StatesPackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; + +/** + * + * An implementation of the model object 'Specific Traced Object'. + * + * + * @generated + */ +public abstract class SpecificTracedObjectImpl extends TracedObjectImpl> implements SpecificTracedObject { + /** + * + * + * @generated + */ + protected SpecificTracedObjectImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return StatesPackage.Literals.SPECIFIC_TRACED_OBJECT; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList> getDimensions() { + if (dimensions == null) { + dimensions = new EObjectContainmentEList>(SpecificDimension.class, this, StatesPackage.SPECIFIC_TRACED_OBJECT__DIMENSIONS); + } + return dimensions; + } + +} //SpecificTracedObjectImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java new file mode 100644 index 000000000..6b8372696 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java @@ -0,0 +1,39 @@ +/** + */ +package base.States.impl; + +import base.States.SpecificValue; +import base.States.StatesPackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Specific Value'. + * + * + * @generated + */ +public abstract class SpecificValueImpl extends ValueImpl implements SpecificValue { + /** + * + * + * @generated + */ + protected SpecificValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return StatesPackage.Literals.SPECIFIC_VALUE; + } + +} //SpecificValueImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesFactoryImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesFactoryImpl.java new file mode 100644 index 000000000..ac61aa122 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesFactoryImpl.java @@ -0,0 +1,95 @@ +/** + */ +package base.States.impl; + +import base.States.*; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; + +/** + * + * An implementation of the model Factory. + * + * @generated + */ +public class StatesFactoryImpl extends EFactoryImpl implements StatesFactory { + /** + * Creates the default factory implementation. + * + * + * @generated + */ + public static StatesFactory init() { + try { + StatesFactory theStatesFactory = (StatesFactory)EPackage.Registry.INSTANCE.getEFactory(StatesPackage.eNS_URI); + if (theStatesFactory != null) { + return theStatesFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new StatesFactoryImpl(); + } + + /** + * Creates an instance of the factory. + * + * + * @generated + */ + public StatesFactoryImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case StatesPackage.SPECIFIC_STATE: return createSpecificState(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + public SpecificState createSpecificState() { + SpecificStateImpl specificState = new SpecificStateImpl(); + return specificState; + } + + /** + * + * + * @generated + */ + public StatesPackage getStatesPackage() { + return (StatesPackage)getEPackage(); + } + + /** + * + * + * @deprecated + * @generated + */ + @Deprecated + public static StatesPackage getPackage() { + return StatesPackage.eINSTANCE; + } + +} //StatesFactoryImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java new file mode 100644 index 000000000..7c803b67f --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java @@ -0,0 +1,358 @@ +/** + */ +package base.States.impl; + +import base.BasePackage; + +import base.States.SpecificAttributeValue; +import base.States.SpecificDimension; +import base.States.SpecificReferenceValue; +import base.States.SpecificState; +import base.States.SpecificTracedObject; +import base.States.SpecificValue; +import base.States.StatesFactory; +import base.States.StatesPackage; + +import base.Steps.StepsPackage; + +import base.Steps.impl.StepsPackageImpl; + +import base.impl.BasePackageImpl; + +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EGenericType; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +import org.eclipse.emf.ecore.ETypeParameter; +import org.eclipse.emf.ecore.impl.EPackageImpl; + +/** + * + * An implementation of the model Package. + * + * @generated + */ +public class StatesPackageImpl extends EPackageImpl implements StatesPackage { + /** + * + * + * @generated + */ + private EClass specificStateEClass = null; + + /** + * + * + * @generated + */ + private EClass specificAttributeValueEClass = null; + + /** + * + * + * @generated + */ + private EClass specificDimensionEClass = null; + + /** + * + * + * @generated + */ + private EClass specificTracedObjectEClass = null; + + /** + * + * + * @generated + */ + private EClass specificReferenceValueEClass = null; + + /** + * + * + * @generated + */ + private EClass specificValueEClass = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + *

Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * + * + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see base.States.StatesPackage#eNS_URI + * @see #init() + * @generated + */ + private StatesPackageImpl() { + super(eNS_URI, StatesFactory.eINSTANCE); + } + + /** + * + * + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * + *

This method is used to initialize {@link StatesPackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * + * + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static StatesPackage init() { + if (isInited) return (StatesPackage)EPackage.Registry.INSTANCE.getEPackage(StatesPackage.eNS_URI); + + // Obtain or create and register package + StatesPackageImpl theStatesPackage = (StatesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StatesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StatesPackageImpl()); + + isInited = true; + + // Initialize simple dependencies + TracePackage.eINSTANCE.eClass(); + + // Obtain or create and register interdependencies + BasePackageImpl theBasePackage = (BasePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BasePackage.eNS_URI) instanceof BasePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BasePackage.eNS_URI) : BasePackage.eINSTANCE); + StepsPackageImpl theStepsPackage = (StepsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StepsPackage.eNS_URI) instanceof StepsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StepsPackage.eNS_URI) : StepsPackage.eINSTANCE); + + // Create package meta-data objects + theStatesPackage.createPackageContents(); + theBasePackage.createPackageContents(); + theStepsPackage.createPackageContents(); + + // Initialize created meta-data + theStatesPackage.initializePackageContents(); + theBasePackage.initializePackageContents(); + theStepsPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theStatesPackage.freeze(); + + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(StatesPackage.eNS_URI, theStatesPackage); + return theStatesPackage; + } + + /** + * + * + * @generated + */ + public EClass getSpecificState() { + return specificStateEClass; + } + + /** + * + * + * @generated + */ + public EReference getSpecificState_StartedSteps() { + return (EReference)specificStateEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getSpecificState_EndedSteps() { + return (EReference)specificStateEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EClass getSpecificAttributeValue() { + return specificAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EReference getSpecificAttributeValue_StatesNoOpposite() { + return (EReference)specificAttributeValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getSpecificDimension() { + return specificDimensionEClass; + } + + /** + * + * + * @generated + */ + public EClass getSpecificTracedObject() { + return specificTracedObjectEClass; + } + + /** + * + * + * @generated + */ + public EClass getSpecificReferenceValue() { + return specificReferenceValueEClass; + } + + /** + * + * + * @generated + */ + public EReference getSpecificReferenceValue_StatesNoOpposite() { + return (EReference)specificReferenceValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getSpecificValue() { + return specificValueEClass; + } + + /** + * + * + * @generated + */ + public StatesFactory getStatesFactory() { + return (StatesFactory)getEFactoryInstance(); + } + + /** + * + * + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + specificStateEClass = createEClass(SPECIFIC_STATE); + createEReference(specificStateEClass, SPECIFIC_STATE__STARTED_STEPS); + createEReference(specificStateEClass, SPECIFIC_STATE__ENDED_STEPS); + + specificAttributeValueEClass = createEClass(SPECIFIC_ATTRIBUTE_VALUE); + createEReference(specificAttributeValueEClass, SPECIFIC_ATTRIBUTE_VALUE__STATES_NO_OPPOSITE); + + specificDimensionEClass = createEClass(SPECIFIC_DIMENSION); + + specificTracedObjectEClass = createEClass(SPECIFIC_TRACED_OBJECT); + + specificReferenceValueEClass = createEClass(SPECIFIC_REFERENCE_VALUE); + createEReference(specificReferenceValueEClass, SPECIFIC_REFERENCE_VALUE__STATES_NO_OPPOSITE); + + specificValueEClass = createEClass(SPECIFIC_VALUE); + } + + /** + * + * + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + TracePackage theTracePackage = (TracePackage)EPackage.Registry.INSTANCE.getEPackage(TracePackage.eNS_URI); + StepsPackage theStepsPackage = (StepsPackage)EPackage.Registry.INSTANCE.getEPackage(StepsPackage.eNS_URI); + + // Create type parameters + ETypeParameter specificDimensionEClass_ValueSubType = addETypeParameter(specificDimensionEClass, "ValueSubType"); + addETypeParameter(specificTracedObjectEClass, "DimensionSubType"); + addETypeParameter(specificReferenceValueEClass, "T"); + + // Set bounds for type parameters + EGenericType g1 = createEGenericType(this.getSpecificValue()); + specificDimensionEClass_ValueSubType.getEBounds().add(g1); + + // Add supertypes to classes + specificStateEClass.getESuperTypes().add(theTracePackage.getState()); + specificAttributeValueEClass.getESuperTypes().add(this.getSpecificValue()); + g1 = createEGenericType(theTracePackage.getDimension()); + EGenericType g2 = createEGenericType(specificDimensionEClass_ValueSubType); + g1.getETypeArguments().add(g2); + specificDimensionEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theTracePackage.getTracedObject()); + g2 = createEGenericType(this.getSpecificDimension()); + g1.getETypeArguments().add(g2); + EGenericType g3 = createEGenericType(); + g2.getETypeArguments().add(g3); + specificTracedObjectEClass.getEGenericSuperTypes().add(g1); + specificReferenceValueEClass.getESuperTypes().add(this.getSpecificValue()); + specificValueEClass.getESuperTypes().add(theTracePackage.getValue()); + + // Initialize classes, features, and operations; add parameters + initEClass(specificStateEClass, SpecificState.class, "SpecificState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getSpecificState_StartedSteps(), theStepsPackage.getSpecificStep(), theStepsPackage.getSpecificStep_StartingState(), "startedSteps", null, 0, -1, SpecificState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSpecificState_EndedSteps(), theStepsPackage.getSpecificStep(), theStepsPackage.getSpecificStep_EndingState(), "endedSteps", null, 0, -1, SpecificState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(specificAttributeValueEClass, SpecificAttributeValue.class, "SpecificAttributeValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getSpecificAttributeValue_StatesNoOpposite(), this.getSpecificState(), null, "statesNoOpposite", null, 1, -1, SpecificAttributeValue.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + + initEClass(specificDimensionEClass, SpecificDimension.class, "SpecificDimension", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(specificTracedObjectEClass, SpecificTracedObject.class, "SpecificTracedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(specificReferenceValueEClass, SpecificReferenceValue.class, "SpecificReferenceValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getSpecificReferenceValue_StatesNoOpposite(), this.getSpecificState(), null, "statesNoOpposite", null, 1, -1, SpecificReferenceValue.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + + initEClass(specificValueEClass, SpecificValue.class, "SpecificValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + } + +} //StatesPackageImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java new file mode 100644 index 000000000..a6dcbd671 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java @@ -0,0 +1,287 @@ +/** + */ +package base.States.util; + +import base.States.*; + +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * The Adapter Factory for the model. + * It provides an adapter createXXX method for each class of the model. + * + * @see base.States.StatesPackage + * @generated + */ +public class StatesAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + * + * + * @generated + */ + protected static StatesPackage modelPackage; + + /** + * Creates an instance of the adapter factory. + * + * + * @generated + */ + public StatesAdapterFactory() { + if (modelPackage == null) { + modelPackage = StatesPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + * + * This implementation returns true if the object is either the model's package or is an instance object of the model. + * + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the createXXX methods. + * + * + * @generated + */ + protected StatesSwitch modelSwitch = + new StatesSwitch() { + @Override + public Adapter caseSpecificState(SpecificState object) { + return createSpecificStateAdapter(); + } + @Override + public Adapter caseSpecificAttributeValue(SpecificAttributeValue object) { + return createSpecificAttributeValueAdapter(); + } + @Override + public Adapter caseSpecificDimension(SpecificDimension object) { + return createSpecificDimensionAdapter(); + } + @Override + public Adapter caseSpecificTracedObject(SpecificTracedObject object) { + return createSpecificTracedObjectAdapter(); + } + @Override + public Adapter caseSpecificReferenceValue(SpecificReferenceValue object) { + return createSpecificReferenceValueAdapter(); + } + @Override + public Adapter caseSpecificValue(SpecificValue object) { + return createSpecificValueAdapter(); + } + @Override + public Adapter caseState(State object) { + return createStateAdapter(); + } + @Override + public Adapter caseValue(Value object) { + return createValueAdapter(); + } + @Override + public Adapter caseDimension(Dimension object) { + return createDimensionAdapter(); + } + @Override + public Adapter caseTracedObject(TracedObject object) { + return createTracedObjectAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the target. + * + * + * @param target the object to adapt. + * @return the adapter for the target. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link base.States.SpecificState Specific State}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see base.States.SpecificState + * @generated + */ + public Adapter createSpecificStateAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link base.States.SpecificAttributeValue Specific Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see base.States.SpecificAttributeValue + * @generated + */ + public Adapter createSpecificAttributeValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link base.States.SpecificDimension Specific Dimension}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see base.States.SpecificDimension + * @generated + */ + public Adapter createSpecificDimensionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link base.States.SpecificTracedObject Specific Traced Object}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see base.States.SpecificTracedObject + * @generated + */ + public Adapter createSpecificTracedObjectAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link base.States.SpecificReferenceValue Specific Reference Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see base.States.SpecificReferenceValue + * @generated + */ + public Adapter createSpecificReferenceValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link base.States.SpecificValue Specific Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see base.States.SpecificValue + * @generated + */ + public Adapter createSpecificValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.State + * @generated + */ + public Adapter createStateAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Value + * @generated + */ + public Adapter createValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Dimension + * @generated + */ + public Adapter createDimensionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.TracedObject + * @generated + */ + public Adapter createTracedObjectAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + * + * This default implementation returns null. + * + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //StatesAdapterFactory diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java new file mode 100644 index 000000000..af6b190b3 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java @@ -0,0 +1,288 @@ +/** + */ +package base.States.util; + +import base.States.*; + +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; + +/** + * + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the caseXXX method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * + * @see base.States.StatesPackage + * @generated + */ +public class StatesSwitch extends Switch { + /** + * The cached model package + * + * + * @generated + */ + protected static StatesPackage modelPackage; + + /** + * Creates an instance of the switch. + * + * + * @generated + */ + public StatesSwitch() { + if (modelPackage == null) { + modelPackage = StatesPackage.eINSTANCE; + } + } + + /** + * Checks whether this is a switch for the given package. + * + * + * @param ePackage the package in question. + * @return whether this is a switch for the given package. + * @generated + */ + @Override + protected boolean isSwitchFor(EPackage ePackage) { + return ePackage == modelPackage; + } + + /** + * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * + * + * @return the first non-null result returned by a caseXXX call. + * @generated + */ + @Override + protected T1 doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case StatesPackage.SPECIFIC_STATE: { + SpecificState specificState = (SpecificState)theEObject; + T1 result = caseSpecificState(specificState); + if (result == null) result = caseState(specificState); + if (result == null) result = defaultCase(theEObject); + return result; + } + case StatesPackage.SPECIFIC_ATTRIBUTE_VALUE: { + SpecificAttributeValue specificAttributeValue = (SpecificAttributeValue)theEObject; + T1 result = caseSpecificAttributeValue(specificAttributeValue); + if (result == null) result = caseSpecificValue(specificAttributeValue); + if (result == null) result = caseValue(specificAttributeValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case StatesPackage.SPECIFIC_DIMENSION: { + SpecificDimension specificDimension = (SpecificDimension)theEObject; + T1 result = caseSpecificDimension(specificDimension); + if (result == null) result = caseDimension(specificDimension); + if (result == null) result = defaultCase(theEObject); + return result; + } + case StatesPackage.SPECIFIC_TRACED_OBJECT: { + SpecificTracedObject specificTracedObject = (SpecificTracedObject)theEObject; + T1 result = caseSpecificTracedObject(specificTracedObject); + if (result == null) result = caseTracedObject(specificTracedObject); + if (result == null) result = defaultCase(theEObject); + return result; + } + case StatesPackage.SPECIFIC_REFERENCE_VALUE: { + SpecificReferenceValue specificReferenceValue = (SpecificReferenceValue)theEObject; + T1 result = caseSpecificReferenceValue(specificReferenceValue); + if (result == null) result = caseSpecificValue(specificReferenceValue); + if (result == null) result = caseValue(specificReferenceValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case StatesPackage.SPECIFIC_VALUE: { + SpecificValue specificValue = (SpecificValue)theEObject; + T1 result = caseSpecificValue(specificValue); + if (result == null) result = caseValue(specificValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'Specific State'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Specific State'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseSpecificState(SpecificState object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Specific Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Specific Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseSpecificAttributeValue(SpecificAttributeValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Specific Dimension'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Specific Dimension'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseSpecificDimension(SpecificDimension object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Specific Traced Object'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Specific Traced Object'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseSpecificTracedObject(SpecificTracedObject object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Specific Reference Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Specific Reference Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseSpecificReferenceValue(SpecificReferenceValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Specific Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Specific Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseSpecificValue(SpecificValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'State'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'State'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseState(State object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseValue(Value object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Dimension'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Dimension'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseDimension(Dimension object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Traced Object'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Traced Object'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseTracedObject(TracedObject object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + @Override + public T1 defaultCase(EObject object) { + return null; + } + +} //StatesSwitch diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java new file mode 100644 index 000000000..a6651d252 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java @@ -0,0 +1,18 @@ +/** + */ +package base.Steps; + +import fr.inria.diverse.trace.commons.model.trace.SmallStep; + +/** + * + * A representation of the model object 'Root Implicit Step'. + * + * + * + * @see base.Steps.StepsPackage#getRootImplicitStep() + * @model + * @generated + */ +public interface RootImplicitStep extends SmallStep { +} // RootImplicitStep diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java new file mode 100644 index 000000000..5ed441006 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java @@ -0,0 +1,83 @@ +/** + */ +package base.Steps; + +import base.States.SpecificState; + +import fr.inria.diverse.trace.commons.model.trace.Step; + +/** + * + * A representation of the model object 'Specific Step'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link base.Steps.SpecificStep#getStartingState Starting State}
    • + *
  • {@link base.Steps.SpecificStep#getEndingState Ending State}
    • + *
+ * + * @see base.Steps.StepsPackage#getSpecificStep() + * @model interface="true" abstract="true" + * @generated + */ +public interface SpecificStep extends Step { + /** + * Returns the value of the 'Starting State' reference. + * It is bidirectional and its opposite is '{@link base.States.SpecificState#getStartedSteps Started Steps}'. + * + *

+ * If the meaning of the 'Starting State' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Starting State' reference. + * @see #setStartingState(SpecificState) + * @see base.Steps.StepsPackage#getSpecificStep_StartingState() + * @see base.States.SpecificState#getStartedSteps + * @model opposite="startedSteps" required="true" + * @generated + */ + SpecificState getStartingState(); + + /** + * Sets the value of the '{@link base.Steps.SpecificStep#getStartingState Starting State}' reference. + * + * + * @param value the new value of the 'Starting State' reference. + * @see #getStartingState() + * @generated + */ + void setStartingState(SpecificState value); + + /** + * Returns the value of the 'Ending State' reference. + * It is bidirectional and its opposite is '{@link base.States.SpecificState#getEndedSteps Ended Steps}'. + * + *

+ * If the meaning of the 'Ending State' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Ending State' reference. + * @see #setEndingState(SpecificState) + * @see base.Steps.StepsPackage#getSpecificStep_EndingState() + * @see base.States.SpecificState#getEndedSteps + * @model opposite="endedSteps" + * @generated + */ + SpecificState getEndingState(); + + /** + * Sets the value of the '{@link base.Steps.SpecificStep#getEndingState Ending State}' reference. + * + * + * @param value the new value of the 'Ending State' reference. + * @see #getEndingState() + * @generated + */ + void setEndingState(SpecificState value); + +} // SpecificStep diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsFactory.java new file mode 100644 index 000000000..edba82266 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsFactory.java @@ -0,0 +1,42 @@ +/** + */ +package base.Steps; + +import org.eclipse.emf.ecore.EFactory; + +/** + * + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + * + * @see base.Steps.StepsPackage + * @generated + */ +public interface StepsFactory extends EFactory { + /** + * The singleton instance of the factory. + * + * + * @generated + */ + StepsFactory eINSTANCE = base.Steps.impl.StepsFactoryImpl.init(); + + /** + * Returns a new object of class 'Root Implicit Step'. + * + * + * @return a new object of class 'Root Implicit Step'. + * @generated + */ + RootImplicitStep createRootImplicitStep(); + + /** + * Returns the package supported by this factory. + * + * + * @return the package supported by this factory. + * @generated + */ + StepsPackage getStepsPackage(); + +} //StepsFactory diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java new file mode 100644 index 000000000..c01e2d23b --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java @@ -0,0 +1,256 @@ +/** + */ +package base.Steps; + +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +/** + * + * The Package for the model. + * It contains accessors for the meta objects to represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @see base.Steps.StepsFactory + * @model kind="package" + * @generated + */ +public interface StepsPackage extends EPackage { + /** + * The package name. + * + * + * @generated + */ + String eNAME = "Steps"; + + /** + * The package namespace URI. + * + * + * @generated + */ + String eNS_URI = "http://events/1.0"; + + /** + * The package namespace name. + * + * + * @generated + */ + String eNS_PREFIX = "events"; + + /** + * The singleton instance of the package. + * + * + * @generated + */ + StepsPackage eINSTANCE = base.Steps.impl.StepsPackageImpl.init(); + + /** + * The meta object id for the '{@link base.Steps.SpecificStep Specific Step}' class. + * + * + * @see base.Steps.SpecificStep + * @see base.Steps.impl.StepsPackageImpl#getSpecificStep() + * @generated + */ + int SPECIFIC_STEP = 0; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP__MSEOCCURRENCE = TracePackage.STEP__MSEOCCURRENCE; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP__STARTING_STATE = TracePackage.STEP_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP__ENDING_STATE = TracePackage.STEP_FEATURE_COUNT + 1; + + /** + * The number of structural features of the 'Specific Step' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP_FEATURE_COUNT = TracePackage.STEP_FEATURE_COUNT + 2; + + /** + * The number of operations of the 'Specific Step' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP_OPERATION_COUNT = TracePackage.STEP_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link base.Steps.impl.RootImplicitStepImpl Root Implicit Step}' class. + * + * + * @see base.Steps.impl.RootImplicitStepImpl + * @see base.Steps.impl.StepsPackageImpl#getRootImplicitStep() + * @generated + */ + int ROOT_IMPLICIT_STEP = 1; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int ROOT_IMPLICIT_STEP__MSEOCCURRENCE = TracePackage.SMALL_STEP__MSEOCCURRENCE; + + /** + * The number of structural features of the 'Root Implicit Step' class. + * + * + * @generated + * @ordered + */ + int ROOT_IMPLICIT_STEP_FEATURE_COUNT = TracePackage.SMALL_STEP_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Root Implicit Step' class. + * + * + * @generated + * @ordered + */ + int ROOT_IMPLICIT_STEP_OPERATION_COUNT = TracePackage.SMALL_STEP_OPERATION_COUNT + 0; + + + /** + * Returns the meta object for class '{@link base.Steps.SpecificStep Specific Step}'. + * + * + * @return the meta object for class 'Specific Step'. + * @see base.Steps.SpecificStep + * @generated + */ + EClass getSpecificStep(); + + /** + * Returns the meta object for the reference '{@link base.Steps.SpecificStep#getStartingState Starting State}'. + * + * + * @return the meta object for the reference 'Starting State'. + * @see base.Steps.SpecificStep#getStartingState() + * @see #getSpecificStep() + * @generated + */ + EReference getSpecificStep_StartingState(); + + /** + * Returns the meta object for the reference '{@link base.Steps.SpecificStep#getEndingState Ending State}'. + * + * + * @return the meta object for the reference 'Ending State'. + * @see base.Steps.SpecificStep#getEndingState() + * @see #getSpecificStep() + * @generated + */ + EReference getSpecificStep_EndingState(); + + /** + * Returns the meta object for class '{@link base.Steps.RootImplicitStep Root Implicit Step}'. + * + * + * @return the meta object for class 'Root Implicit Step'. + * @see base.Steps.RootImplicitStep + * @generated + */ + EClass getRootImplicitStep(); + + /** + * Returns the factory that creates the instances of the model. + * + * + * @return the factory that creates the instances of the model. + * @generated + */ + StepsFactory getStepsFactory(); + + /** + * + * Defines literals for the meta objects that represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link base.Steps.SpecificStep Specific Step}' class. + * + * + * @see base.Steps.SpecificStep + * @see base.Steps.impl.StepsPackageImpl#getSpecificStep() + * @generated + */ + EClass SPECIFIC_STEP = eINSTANCE.getSpecificStep(); + + /** + * The meta object literal for the 'Starting State' reference feature. + * + * + * @generated + */ + EReference SPECIFIC_STEP__STARTING_STATE = eINSTANCE.getSpecificStep_StartingState(); + + /** + * The meta object literal for the 'Ending State' reference feature. + * + * + * @generated + */ + EReference SPECIFIC_STEP__ENDING_STATE = eINSTANCE.getSpecificStep_EndingState(); + + /** + * The meta object literal for the '{@link base.Steps.impl.RootImplicitStepImpl Root Implicit Step}' class. + * + * + * @see base.Steps.impl.RootImplicitStepImpl + * @see base.Steps.impl.StepsPackageImpl#getRootImplicitStep() + * @generated + */ + EClass ROOT_IMPLICIT_STEP = eINSTANCE.getRootImplicitStep(); + + } + +} //StepsPackage diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java new file mode 100644 index 000000000..237cc9700 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java @@ -0,0 +1,39 @@ +/** + */ +package base.Steps.impl; + +import base.Steps.RootImplicitStep; +import base.Steps.StepsPackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Root Implicit Step'. + * + * + * @generated + */ +public class RootImplicitStepImpl extends SmallStepImpl implements RootImplicitStep { + /** + * + * + * @generated + */ + protected RootImplicitStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return StepsPackage.Literals.ROOT_IMPLICIT_STEP; + } + +} //RootImplicitStepImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java new file mode 100644 index 000000000..b1dd8baef --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java @@ -0,0 +1,95 @@ +/** + */ +package base.Steps.impl; + +import base.Steps.*; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; + +/** + * + * An implementation of the model Factory. + * + * @generated + */ +public class StepsFactoryImpl extends EFactoryImpl implements StepsFactory { + /** + * Creates the default factory implementation. + * + * + * @generated + */ + public static StepsFactory init() { + try { + StepsFactory theStepsFactory = (StepsFactory)EPackage.Registry.INSTANCE.getEFactory(StepsPackage.eNS_URI); + if (theStepsFactory != null) { + return theStepsFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new StepsFactoryImpl(); + } + + /** + * Creates an instance of the factory. + * + * + * @generated + */ + public StepsFactoryImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case StepsPackage.ROOT_IMPLICIT_STEP: return createRootImplicitStep(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + public RootImplicitStep createRootImplicitStep() { + RootImplicitStepImpl rootImplicitStep = new RootImplicitStepImpl(); + return rootImplicitStep; + } + + /** + * + * + * @generated + */ + public StepsPackage getStepsPackage() { + return (StepsPackage)getEPackage(); + } + + /** + * + * + * @deprecated + * @generated + */ + @Deprecated + public static StepsPackage getPackage() { + return StepsPackage.eINSTANCE; + } + +} //StepsFactoryImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java new file mode 100644 index 000000000..456161863 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java @@ -0,0 +1,233 @@ +/** + */ +package base.Steps.impl; + +import base.BasePackage; + +import base.States.StatesPackage; + +import base.States.impl.StatesPackageImpl; + +import base.Steps.RootImplicitStep; +import base.Steps.SpecificStep; +import base.Steps.StepsFactory; +import base.Steps.StepsPackage; + +import base.impl.BasePackageImpl; + +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +import org.eclipse.emf.ecore.impl.EPackageImpl; + +/** + * + * An implementation of the model Package. + * + * @generated + */ +public class StepsPackageImpl extends EPackageImpl implements StepsPackage { + /** + * + * + * @generated + */ + private EClass specificStepEClass = null; + + /** + * + * + * @generated + */ + private EClass rootImplicitStepEClass = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + *

Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * + * + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see base.Steps.StepsPackage#eNS_URI + * @see #init() + * @generated + */ + private StepsPackageImpl() { + super(eNS_URI, StepsFactory.eINSTANCE); + } + + /** + * + * + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * + *

This method is used to initialize {@link StepsPackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * + * + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static StepsPackage init() { + if (isInited) return (StepsPackage)EPackage.Registry.INSTANCE.getEPackage(StepsPackage.eNS_URI); + + // Obtain or create and register package + StepsPackageImpl theStepsPackage = (StepsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StepsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StepsPackageImpl()); + + isInited = true; + + // Initialize simple dependencies + TracePackage.eINSTANCE.eClass(); + + // Obtain or create and register interdependencies + BasePackageImpl theBasePackage = (BasePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(BasePackage.eNS_URI) instanceof BasePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(BasePackage.eNS_URI) : BasePackage.eINSTANCE); + StatesPackageImpl theStatesPackage = (StatesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatesPackage.eNS_URI) instanceof StatesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatesPackage.eNS_URI) : StatesPackage.eINSTANCE); + + // Create package meta-data objects + theStepsPackage.createPackageContents(); + theBasePackage.createPackageContents(); + theStatesPackage.createPackageContents(); + + // Initialize created meta-data + theStepsPackage.initializePackageContents(); + theBasePackage.initializePackageContents(); + theStatesPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theStepsPackage.freeze(); + + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(StepsPackage.eNS_URI, theStepsPackage); + return theStepsPackage; + } + + /** + * + * + * @generated + */ + public EClass getSpecificStep() { + return specificStepEClass; + } + + /** + * + * + * @generated + */ + public EReference getSpecificStep_StartingState() { + return (EReference)specificStepEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getSpecificStep_EndingState() { + return (EReference)specificStepEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EClass getRootImplicitStep() { + return rootImplicitStepEClass; + } + + /** + * + * + * @generated + */ + public StepsFactory getStepsFactory() { + return (StepsFactory)getEFactoryInstance(); + } + + /** + * + * + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + specificStepEClass = createEClass(SPECIFIC_STEP); + createEReference(specificStepEClass, SPECIFIC_STEP__STARTING_STATE); + createEReference(specificStepEClass, SPECIFIC_STEP__ENDING_STATE); + + rootImplicitStepEClass = createEClass(ROOT_IMPLICIT_STEP); + } + + /** + * + * + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + TracePackage theTracePackage = (TracePackage)EPackage.Registry.INSTANCE.getEPackage(TracePackage.eNS_URI); + StatesPackage theStatesPackage = (StatesPackage)EPackage.Registry.INSTANCE.getEPackage(StatesPackage.eNS_URI); + + // Create type parameters + + // Set bounds for type parameters + + // Add supertypes to classes + specificStepEClass.getESuperTypes().add(theTracePackage.getStep()); + rootImplicitStepEClass.getESuperTypes().add(theTracePackage.getSmallStep()); + + // Initialize classes, features, and operations; add parameters + initEClass(specificStepEClass, SpecificStep.class, "SpecificStep", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getSpecificStep_StartingState(), theStatesPackage.getSpecificState(), theStatesPackage.getSpecificState_StartedSteps(), "startingState", null, 1, 1, SpecificStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSpecificStep_EndingState(), theStatesPackage.getSpecificState(), theStatesPackage.getSpecificState_EndedSteps(), "endingState", null, 0, 1, SpecificStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(rootImplicitStepEClass, RootImplicitStep.class, "RootImplicitStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + } + +} //StepsPackageImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java new file mode 100644 index 000000000..e91a54432 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java @@ -0,0 +1,177 @@ +/** + */ +package base.Steps.util; + +import base.Steps.*; + +import fr.inria.diverse.trace.commons.model.trace.SmallStep; +import fr.inria.diverse.trace.commons.model.trace.Step; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * The Adapter Factory for the model. + * It provides an adapter createXXX method for each class of the model. + * + * @see base.Steps.StepsPackage + * @generated + */ +public class StepsAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + * + * + * @generated + */ + protected static StepsPackage modelPackage; + + /** + * Creates an instance of the adapter factory. + * + * + * @generated + */ + public StepsAdapterFactory() { + if (modelPackage == null) { + modelPackage = StepsPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + * + * This implementation returns true if the object is either the model's package or is an instance object of the model. + * + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the createXXX methods. + * + * + * @generated + */ + protected StepsSwitch modelSwitch = + new StepsSwitch() { + @Override + public Adapter caseSpecificStep(SpecificStep object) { + return createSpecificStepAdapter(); + } + @Override + public Adapter caseRootImplicitStep(RootImplicitStep object) { + return createRootImplicitStepAdapter(); + } + @Override + public Adapter caseStep(Step object) { + return createStepAdapter(); + } + @Override + public Adapter caseSmallStep(SmallStep object) { + return createSmallStepAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the target. + * + * + * @param target the object to adapt. + * @return the adapter for the target. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link base.Steps.SpecificStep Specific Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see base.Steps.SpecificStep + * @generated + */ + public Adapter createSpecificStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link base.Steps.RootImplicitStep Root Implicit Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see base.Steps.RootImplicitStep + * @generated + */ + public Adapter createRootImplicitStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Step + * @generated + */ + public Adapter createStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.SmallStep + * @generated + */ + public Adapter createSmallStepAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + * + * This default implementation returns null. + * + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //StepsAdapterFactory diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java new file mode 100644 index 000000000..dc67289da --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java @@ -0,0 +1,167 @@ +/** + */ +package base.Steps.util; + +import base.Steps.*; + +import fr.inria.diverse.trace.commons.model.trace.SmallStep; +import fr.inria.diverse.trace.commons.model.trace.Step; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; + +/** + * + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the caseXXX method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * + * @see base.Steps.StepsPackage + * @generated + */ +public class StepsSwitch extends Switch { + /** + * The cached model package + * + * + * @generated + */ + protected static StepsPackage modelPackage; + + /** + * Creates an instance of the switch. + * + * + * @generated + */ + public StepsSwitch() { + if (modelPackage == null) { + modelPackage = StepsPackage.eINSTANCE; + } + } + + /** + * Checks whether this is a switch for the given package. + * + * + * @param ePackage the package in question. + * @return whether this is a switch for the given package. + * @generated + */ + @Override + protected boolean isSwitchFor(EPackage ePackage) { + return ePackage == modelPackage; + } + + /** + * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * + * + * @return the first non-null result returned by a caseXXX call. + * @generated + */ + @Override + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case StepsPackage.SPECIFIC_STEP: { + SpecificStep specificStep = (SpecificStep)theEObject; + T result = caseSpecificStep(specificStep); + if (result == null) result = caseStep(specificStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + case StepsPackage.ROOT_IMPLICIT_STEP: { + RootImplicitStep rootImplicitStep = (RootImplicitStep)theEObject; + T result = caseRootImplicitStep(rootImplicitStep); + if (result == null) result = caseSmallStep(rootImplicitStep); + if (result == null) result = caseStep(rootImplicitStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'Specific Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Specific Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseSpecificStep(SpecificStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Root Implicit Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Root Implicit Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseRootImplicitStep(RootImplicitStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseStep(Step object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Small Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Small Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseSmallStep(SmallStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + @Override + public T defaultCase(EObject object) { + return null; + } + +} //StepsSwitch diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BaseFactoryImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BaseFactoryImpl.java new file mode 100644 index 000000000..cb797d656 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BaseFactoryImpl.java @@ -0,0 +1,95 @@ +/** + */ +package base.impl; + +import base.*; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; + +/** + * + * An implementation of the model Factory. + * + * @generated + */ +public class BaseFactoryImpl extends EFactoryImpl implements BaseFactory { + /** + * Creates the default factory implementation. + * + * + * @generated + */ + public static BaseFactory init() { + try { + BaseFactory theBaseFactory = (BaseFactory)EPackage.Registry.INSTANCE.getEFactory(BasePackage.eNS_URI); + if (theBaseFactory != null) { + return theBaseFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new BaseFactoryImpl(); + } + + /** + * Creates an instance of the factory. + * + * + * @generated + */ + public BaseFactoryImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case BasePackage.SPECIFIC_TRACE: return createSpecificTrace(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + public SpecificTrace createSpecificTrace() { + SpecificTraceImpl specificTrace = new SpecificTraceImpl(); + return specificTrace; + } + + /** + * + * + * @generated + */ + public BasePackage getBasePackage() { + return (BasePackage)getEPackage(); + } + + /** + * + * + * @deprecated + * @generated + */ + @Deprecated + public static BasePackage getPackage() { + return BasePackage.eINSTANCE; + } + +} //BaseFactoryImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java new file mode 100644 index 000000000..50db40514 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java @@ -0,0 +1,213 @@ +/** + */ +package base.impl; + +import base.BaseFactory; +import base.BasePackage; +import base.SpecificTrace; + +import base.States.StatesPackage; + +import base.States.impl.StatesPackageImpl; + +import base.Steps.StepsPackage; + +import base.Steps.impl.StepsPackageImpl; + +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EGenericType; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.impl.EPackageImpl; + +/** + * + * An implementation of the model Package. + * + * @generated + */ +public class BasePackageImpl extends EPackageImpl implements BasePackage { + /** + * + * + * @generated + */ + private EClass specificTraceEClass = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + *

Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * + * + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see base.BasePackage#eNS_URI + * @see #init() + * @generated + */ + private BasePackageImpl() { + super(eNS_URI, BaseFactory.eINSTANCE); + } + + /** + * + * + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * + *

This method is used to initialize {@link BasePackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * + * + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static BasePackage init() { + if (isInited) return (BasePackage)EPackage.Registry.INSTANCE.getEPackage(BasePackage.eNS_URI); + + // Obtain or create and register package + BasePackageImpl theBasePackage = (BasePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BasePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BasePackageImpl()); + + isInited = true; + + // Initialize simple dependencies + TracePackage.eINSTANCE.eClass(); + + // Obtain or create and register interdependencies + StepsPackageImpl theStepsPackage = (StepsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StepsPackage.eNS_URI) instanceof StepsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StepsPackage.eNS_URI) : StepsPackage.eINSTANCE); + StatesPackageImpl theStatesPackage = (StatesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatesPackage.eNS_URI) instanceof StatesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatesPackage.eNS_URI) : StatesPackage.eINSTANCE); + + // Create package meta-data objects + theBasePackage.createPackageContents(); + theStepsPackage.createPackageContents(); + theStatesPackage.createPackageContents(); + + // Initialize created meta-data + theBasePackage.initializePackageContents(); + theStepsPackage.initializePackageContents(); + theStatesPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theBasePackage.freeze(); + + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(BasePackage.eNS_URI, theBasePackage); + return theBasePackage; + } + + /** + * + * + * @generated + */ + public EClass getSpecificTrace() { + return specificTraceEClass; + } + + /** + * + * + * @generated + */ + public BaseFactory getBaseFactory() { + return (BaseFactory)getEFactoryInstance(); + } + + /** + * + * + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + specificTraceEClass = createEClass(SPECIFIC_TRACE); + } + + /** + * + * + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + StepsPackage theStepsPackage = (StepsPackage)EPackage.Registry.INSTANCE.getEPackage(StepsPackage.eNS_URI); + StatesPackage theStatesPackage = (StatesPackage)EPackage.Registry.INSTANCE.getEPackage(StatesPackage.eNS_URI); + TracePackage theTracePackage = (TracePackage)EPackage.Registry.INSTANCE.getEPackage(TracePackage.eNS_URI); + + // Add subpackages + getESubpackages().add(theStepsPackage); + getESubpackages().add(theStatesPackage); + + // Create type parameters + + // Set bounds for type parameters + + // Add supertypes to classes + EGenericType g1 = createEGenericType(theTracePackage.getTrace()); + EGenericType g2 = createEGenericType(theTracePackage.getSequentialStep()); + g1.getETypeArguments().add(g2); + EGenericType g3 = createEGenericType(theStepsPackage.getSpecificStep()); + g2.getETypeArguments().add(g3); + g2 = createEGenericType(theStatesPackage.getSpecificTracedObject()); + g1.getETypeArguments().add(g2); + g3 = createEGenericType(); + g2.getETypeArguments().add(g3); + EGenericType g4 = createEGenericType(theStatesPackage.getSpecificDimension()); + g3.setEUpperBound(g4); + EGenericType g5 = createEGenericType(); + g4.getETypeArguments().add(g5); + EGenericType g6 = createEGenericType(theStatesPackage.getSpecificValue()); + g5.setEUpperBound(g6); + g2 = createEGenericType(theStatesPackage.getSpecificState()); + g1.getETypeArguments().add(g2); + specificTraceEClass.getEGenericSuperTypes().add(g1); + + // Initialize classes, features, and operations; add parameters + initEClass(specificTraceEClass, SpecificTrace.class, "SpecificTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + // Create resource + createResource(eNS_URI); + } + +} //BasePackageImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java new file mode 100644 index 000000000..4c2e32425 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java @@ -0,0 +1,90 @@ +/** + */ +package base.impl; + +import base.BasePackage; +import base.SpecificTrace; + +import base.States.SpecificDimension; +import base.States.SpecificState; +import base.States.SpecificTracedObject; + +import base.States.SpecificValue; +import base.Steps.SpecificStep; + +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; + +/** + * + * An implementation of the model object 'Specific Trace'. + * + * + * @generated + */ +public class SpecificTraceImpl extends TraceImpl, SpecificTracedObject>, SpecificState> implements SpecificTrace { + /** + * + * + * @generated + */ + protected SpecificTraceImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return BasePackage.Literals.SPECIFIC_TRACE; + } + + /** + * + * + * This is specialized for the more specific type known in this context. + * @generated + */ + @Override + public NotificationChain basicSetRootStep(SequentialStep newRootStep, NotificationChain msgs) { + return super.basicSetRootStep(newRootStep, msgs); + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList>> getTracedObjects() { + if (tracedObjects == null) { + tracedObjects = new EObjectContainmentEList>>(SpecificTracedObject.class, this, BasePackage.SPECIFIC_TRACE__TRACED_OBJECTS); + } + return tracedObjects; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getStates() { + if (states == null) { + states = new EObjectContainmentEList(SpecificState.class, this, BasePackage.SPECIFIC_TRACE__STATES); + } + return states; + } + +} //SpecificTraceImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java new file mode 100644 index 000000000..181a72d54 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java @@ -0,0 +1,140 @@ +/** + */ +package base.util; + +import base.*; + +import fr.inria.diverse.trace.commons.model.trace.Trace; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * The Adapter Factory for the model. + * It provides an adapter createXXX method for each class of the model. + * + * @see base.BasePackage + * @generated + */ +public class BaseAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + * + * + * @generated + */ + protected static BasePackage modelPackage; + + /** + * Creates an instance of the adapter factory. + * + * + * @generated + */ + public BaseAdapterFactory() { + if (modelPackage == null) { + modelPackage = BasePackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + * + * This implementation returns true if the object is either the model's package or is an instance object of the model. + * + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the createXXX methods. + * + * + * @generated + */ + protected BaseSwitch modelSwitch = + new BaseSwitch() { + @Override + public Adapter caseSpecificTrace(SpecificTrace object) { + return createSpecificTraceAdapter(); + } + @Override + public Adapter caseTrace(Trace object) { + return createTraceAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the target. + * + * + * @param target the object to adapt. + * @return the adapter for the target. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link base.SpecificTrace Specific Trace}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see base.SpecificTrace + * @generated + */ + public Adapter createSpecificTraceAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Trace + * @generated + */ + public Adapter createTraceAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + * + * This default implementation returns null. + * + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //BaseAdapterFactory diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseSwitch.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseSwitch.java new file mode 100644 index 000000000..591a151e2 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseSwitch.java @@ -0,0 +1,128 @@ +/** + */ +package base.util; + +import base.*; + +import fr.inria.diverse.trace.commons.model.trace.Trace; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; + +/** + * + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the caseXXX method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * + * @see base.BasePackage + * @generated + */ +public class BaseSwitch extends Switch { + /** + * The cached model package + * + * + * @generated + */ + protected static BasePackage modelPackage; + + /** + * Creates an instance of the switch. + * + * + * @generated + */ + public BaseSwitch() { + if (modelPackage == null) { + modelPackage = BasePackage.eINSTANCE; + } + } + + /** + * Checks whether this is a switch for the given package. + * + * + * @param ePackage the package in question. + * @return whether this is a switch for the given package. + * @generated + */ + @Override + protected boolean isSwitchFor(EPackage ePackage) { + return ePackage == modelPackage; + } + + /** + * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * + * + * @return the first non-null result returned by a caseXXX call. + * @generated + */ + @Override + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case BasePackage.SPECIFIC_TRACE: { + SpecificTrace specificTrace = (SpecificTrace)theEObject; + T result = caseSpecificTrace(specificTrace); + if (result == null) result = caseTrace(specificTrace); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'Specific Trace'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Specific Trace'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseSpecificTrace(SpecificTrace object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Trace'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Trace'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseTrace(Trace object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + @Override + public T defaultCase(EObject object) { + return null; + } + +} //BaseSwitch diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend index e987a1347..08b4e4af0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend @@ -18,8 +18,13 @@ class TraceMMExplorer { // Base classes @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass stateClass @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificTraceClass + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificTracedObjectClass + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificDimensionClass @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificStepClass - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass valueClass + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificValueClass + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificAttributeValueClass + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificReferenceValueClass + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EReference dimensionsReference @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EPackage stepsPackage @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EPackage statesPackage @@ -46,10 +51,34 @@ class TraceMMExplorer { c.name.equals(TraceMMStrings.class_State) ] as EClass + // Find the SpecificTracedObject class + specificTracedObjectClass = tracemm.eAllContents.filter(EClass).findFirst [ c | + c.name.equals(TraceMMStrings.class_TracedObject) + ] as EClass + + dimensionsReference = specificTracedObjectClass.EAllContainments.findFirst [ r | + r.name.equals(TraceMMStrings.ref_Dimensions) + ] + + // Find the SpecificValue class + specificDimensionClass = tracemm.eAllContents.filter(EClass).findFirst [ c | + c.name.equals(TraceMMStrings.class_Dimension) + ] as EClass + // Find the Value class - valueClass = tracemm.eAllContents.filter(EClass).findFirst [ c | + specificValueClass = tracemm.eAllContents.filter(EClass).findFirst [ c | c.name.equals(TraceMMStrings.class_Value) ] as EClass + + // Find the AttributeValue class + specificAttributeValueClass = tracemm.eAllContents.filter(EClass).findFirst [ c | + c.name.equals(TraceMMStrings.class_AttributeValue) + ] as EClass + + // Find the ReferenceValue class + specificReferenceValueClass = tracemm.eAllContents.filter(EClass).findFirst [ c | + c.name.equals(TraceMMStrings.class_ReferenceValue) + ] as EClass // Find the Step class specificStepClass = tracemm.eAllContents.filter(EClass).findFirst [ c | diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index e72687d5f..59d7b1b59 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -191,7 +191,7 @@ class TraceMMGeneratorStates { private def EClass handleTraceClass(EClass runtimeClass) { - // If the xmof conf metamodel still has references to the AS, we replace by refs to the conf metamodel + // If the xmof conf metamodel still has references to the AS, we replace by refs to the conf metamodel if (traceability.xmofExeToConf.containsKey(runtimeClass)) return handleTraceClass(traceability.xmofExeToConf.get(runtimeClass)) @@ -214,15 +214,27 @@ class TraceMMGeneratorStates { val tracedSuperType = handleTraceClass(superType) tracedClass.ESuperTypes.add(tracedSuperType) } - + + val boolean notNewClass = !allNewEClasses.contains(runtimeClass) + val boolean notAbstract = !tracedClass.abstract + + // Adding the SpecificTracedObject super type + if (tracedClass.ESuperTypes.empty) { + val tracedObjectGenericSuperType = EcoreFactory.eINSTANCE.createEGenericType + tracedObjectGenericSuperType.EClassifier = traceMMExplorer.specificTracedObjectClass + val dimensionClassTracedObjectTypeBinding = EcoreFactory.eINSTANCE.createEGenericType + tracedObjectGenericSuperType.ETypeArguments.add(dimensionClassTracedObjectTypeBinding) + // And binds its type parameters to the runtime and specific dimension classes + dimensionClassTracedObjectTypeBinding.EClassifier = traceMMExplorer.specificDimensionClass + dimensionClassTracedObjectTypeBinding.ETypeArguments.add(EcoreFactory.eINSTANCE.createEGenericType) + tracedClass.EGenericSuperTypes.add(tracedObjectGenericSuperType) + } + // We recreate the same package organization val tracedPackage = obtainTracedPackage(runtimeClass.EPackage) tracedPackage.EClassifiers.add(tracedClass) // If this is a class extension, then we add a reference, to be able to refer to the element of the original model (if originally static element of the model) - val boolean notNewClass = !allNewEClasses.contains(runtimeClass) - val boolean notAbstract = !tracedClass.abstract - if (notNewClass && runtimeClass2ClassExtension.containsKey(runtimeClass)) { val traceabilityAnnotationValue = computeTraceabilityAnnotationValue( runtimeClass2ClassExtension.get(runtimeClass)); @@ -282,7 +294,7 @@ class TraceMMGeneratorStates { // Storing traceability stuff traceability.addMutableProperty(runtimeClass, runtimeProperty) - // Value class + //------------ Value class val valueClass = EcoreFactory.eINSTANCE.createEClass valueClass.name = TraceMMStrings.class_createStateClassName(runtimeClass, runtimeProperty) @@ -295,6 +307,18 @@ class TraceMMGeneratorStates { copiedProperty.derived = false copiedProperty.changeable = true copiedProperty.volatile = false + + // The value class inherits the SpecificReferenceValue abstract class + val valueGenericSuperType = EcoreFactory.eINSTANCE.createEGenericType + valueGenericSuperType.EClassifier = traceMMExplorer.specificReferenceValueClass + val valueTypeBinding = EcoreFactory.eINSTANCE.createEGenericType + valueGenericSuperType.ETypeArguments.add(valueTypeBinding) + // And binds its type parameter to the generated traced object class + valueTypeBinding.EClassifier = copiedProperty.EType + valueClass.EGenericSuperTypes.add(valueGenericSuperType) + } else { + // The value class inherits the SpecificAttributeValue abstract class + valueClass.ESuperTypes.add(traceMMExplorer.specificAttributeValueClass) } valueClass.EStructuralFeatures.add(copiedProperty) traceMMExplorer.statesPackage.EClassifiers.add(valueClass) @@ -304,9 +328,6 @@ class TraceMMGeneratorStates { ExecutionMetamodelTraceability.createTraceabilityAnnotation(valueClass, ExecutionMetamodelTraceability.getTraceabilityAnnotationValue(runtimeProperty)); - // The value class inherits the Value abstract class - valueClass.ESuperTypes.add(traceMMExplorer.valueClass) - // And must hence implement the derived getStepsNoOpposite val EOperation getStatesNoOppositeEOperation = EcoreFactory.eINSTANCE.createEOperation getStatesNoOppositeEOperation.EType = traceMMExplorer.stateClass @@ -319,6 +340,25 @@ class TraceMMGeneratorStates { bodyAnnotation.details.put("body", "return this.getStates();") valueClass.EOperations.add(getStatesNoOppositeEOperation) + //------------ Dimension class + val dimensionClass = EcoreFactory.eINSTANCE.createEClass + dimensionClass.name = TraceMMStrings.class_createDimensionClassName(runtimeClass, runtimeProperty) + // The dimension class inherits the SpecificDimension abstract class + val dimensionGenericSuperType = EcoreFactory.eINSTANCE.createEGenericType + dimensionGenericSuperType.EClassifier = traceMMExplorer.specificDimensionClass + val dimensionTypeBinding = EcoreFactory.eINSTANCE.createEGenericType + dimensionGenericSuperType.ETypeArguments.add(dimensionTypeBinding) + // And binds its type parameter to the generated value class + dimensionTypeBinding.EClassifier = valueClass + dimensionClass.EGenericSuperTypes.add(dimensionGenericSuperType) + traceMMExplorer.statesPackage.EClassifiers.add(dimensionClass) + + val dimensionRef = addReferenceToClass(tracedClass, + dimensionClass.name.toFirstLower, dimensionClass); + dimensionRef.containment = true + dimensionRef.lowerBound = 0 + dimensionRef.upperBound = 1 + // Link Traced class -> Value class val refTrace2State = addReferenceToClass(tracedClass, TraceMMStrings.ref_createTraceClassToValueClass(runtimeProperty), valueClass); @@ -346,7 +386,7 @@ class TraceMMGeneratorStates { refState2Value.lowerBound = 0 traceability.putStateClassToValueClass(runtimeProperty, refState2Value) - + // Link State class -> GlobalState (bidirectional) val refState2Global = addReferenceToClass(valueClass, TraceMMStrings.ref_ValueToStates, traceMMExplorer.stateClass); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend index dbbe22dcd..6a9d8173d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend @@ -8,9 +8,17 @@ class TraceMMStrings { public static val String class_Trace = "SpecificTrace" - public static val String class_State = "State" - - public static val String class_Value = "Value" + public static val String class_State = "SpecificState" + + public static val String class_TracedObject = "SpecificTracedObject" + + public static val String class_Dimension = "SpecificDimension" + + public static val String class_Value = "SpecificValue" + + public static val String class_AttributeValue = "SpecificAttributeValue" + + public static val String class_ReferenceValue = "SpecificReferenceValue" public static val String class_Step = "SpecificStep" @@ -18,6 +26,8 @@ class TraceMMStrings { public static val String package_Steps = "Steps" + public static val String ref_Dimensions = "dimensions" + public static val String ref_OriginalObject = "originalObject" public static val String ref_ValueToTrace = "parent" @@ -44,6 +54,10 @@ class TraceMMStrings { return runtimeClass.name + "_" + runtimeProperty.name + "_Value" } + static def String class_createDimensionClassName(EClass runtimeClass, EStructuralFeature runtimeProperty) { + return runtimeClass.name + "_" + runtimeProperty.name + "_Dimension" + } + static def String ref_createTraceClassToValueClass(EStructuralFeature runtimeProperty) { return runtimeProperty.name + "Sequence" } From 27759b2f85f4f5f37c0e920a9d607b7c7cfec300 Mon Sep 17 00:00:00 2001 From: d-leroy Date: Fri, 27 Jan 2017 09:31:36 +0100 Subject: [PATCH 080/267] Reworked metamodel and aligned corresponding code generators --- .../.project | 6 + .../META-INF/MANIFEST.MF | 33 +- .../model/GenericTrace.aird | 825 ++++++--- .../model/GenericTrace.ecore | 68 +- .../model/GenericTrace.genmodel | 46 +- .../model/trace class diagram.png | Bin 0 -> 260414 bytes .../model/trace/GenericAttributeValue.java | 2 +- .../commons/model/trace/GenericDimension.java | 2 +- .../trace/commons/model/trace/GenericMSE.java | 2 + .../model/trace/GenericParallelStep.java | 2 +- .../model/trace/GenericReferenceValue.java | 12 +- .../model/trace/GenericSequentialStep.java | 2 +- .../commons/model/trace/GenericSmallStep.java | 2 +- .../commons/model/trace/GenericState.java | 35 + .../commons/model/trace/GenericStep.java | 17 + .../commons/model/trace/GenericTrace.java | 2 +- .../commons/model/trace/GenericValue.java | 52 + .../model/trace/LaunchConfiguration.java | 12 +- .../trace/LaunchConfigurationParameter.java | 33 + .../trace/commons/model/trace/State.java | 20 +- .../commons/model/trace/TraceFactory.java | 4 +- .../commons/model/trace/TracePackage.java | 455 ++++- .../trace/commons/model/trace/Value.java | 21 +- .../trace/impl/GenericAttributeValueImpl.java | 2 +- .../trace/impl/GenericDimensionImpl.java | 21 +- .../model/trace/impl/GenericMSEImpl.java | 36 + .../trace/impl/GenericReferenceValueImpl.java | 20 +- .../model/trace/impl/GenericStateImpl.java | 151 ++ .../model/trace/impl/GenericStepImpl.java | 37 + .../model/trace/impl/GenericTraceImpl.java | 3 +- .../model/trace/impl/GenericValueImpl.java | 188 ++ .../trace/impl/LaunchConfigurationImpl.java | 38 +- .../LaunchConfigurationParameterImpl.java | 122 ++ .../commons/model/trace/impl/StateImpl.java | 117 +- .../model/trace/impl/TraceFactoryImpl.java | 6 +- .../model/trace/impl/TracePackageImpl.java | 142 +- .../commons/model/trace/impl/ValueImpl.java | 117 +- .../model/trace/util/TraceAdapterFactory.java | 40 +- .../commons/model/trace/util/TraceSwitch.java | 58 +- .../trace/gemoc/api/ITraceExplorer.java | 3 + .../trace/gemoc/api/ITraceExtractor.java | 135 +- .../trace/gemoc/api/ITraceListener.java | 15 +- .../traceaddon/GenericTraceConstructor.java | 9 +- .../traceaddon/GenericTraceEngineAddon.java | 10 +- .../traceaddon/GenericTraceExplorer.java | 6 +- .../traceaddon/GenericTraceExtractor.java | 19 +- .../model/base.aird | 209 ++- .../model/base.ecore | 7 +- .../base/States/SpecificAttributeValue.java | 23 - .../base/States/SpecificReferenceValue.java | 23 - .../src/base/States/SpecificState.java | 9 + .../src/base/States/StatesPackage.java | 109 +- .../base/States/impl/SpecificValueImpl.java | 1 - .../base/States/impl/StatesPackageImpl.java | 25 +- .../metamodel/generator/TraceMMExplorer.xtend | 14 +- .../TraceMMGenerationTraceability.xtend | 40 +- .../generator/TraceMMGeneratorStates.xtend | 94 +- .../metamodel/generator/TraceMMStrings.xtend | 4 +- .../TraceConstructorGeneratorJava.xtend | 62 +- .../codegen/TraceExplorerGeneratorJava.xtend | 56 +- .../codegen/TraceExtractorGeneratorJava.xtend | 142 +- .../codegen/TraceManagerGeneratorJava.xtend | 1594 ----------------- .../codegen/TraceNotifierGeneratorJava.xtend | 22 +- .../MultidimensionalTimelineRenderer.java | 78 +- 64 files changed, 2541 insertions(+), 2919 deletions(-) create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.png create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project index b035adff4..5d409b39e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project @@ -5,6 +5,11 @@ + + org.eclipse.xtext.ui.shared.xtextBuilder + + + org.eclipse.jdt.core.javabuilder @@ -24,5 +29,6 @@ org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + org.eclipse.xtext.ui.shared.xtextNature diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF index e42d5bffd..1fd1be50d 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF @@ -1,16 +1,17 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: fr.inria.diverse.trace.commons.model;singleton:=true -Bundle-Version: 0.1.0.qualifier -Bundle-ClassPath: . -Bundle-Vendor: INRIA -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: fr.inria.diverse.trace.commons.model.helper, - fr.inria.diverse.trace.commons.model.trace, - fr.inria.diverse.trace.commons.model.trace.impl, - fr.inria.diverse.trace.commons.model.trace.util -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport -Bundle-ActivationPolicy: lazy +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: fr.inria.diverse.trace.commons.model;singleton:=true +Bundle-Version: 0.1.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: INRIA +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: fr.inria.diverse.trace.commons.model.helper, + fr.inria.diverse.trace.commons.model.trace, + fr.inria.diverse.trace.commons.model.trace.impl, + fr.inria.diverse.trace.commons.model.trace.util +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.emf.ecore;visibility:=reexport +Bundle-ActivationPolicy: lazy + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird index f7e146a76..ca8b8fd5d 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird @@ -1,6 +1,6 @@ - + GenericTrace.ecore platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore http://www.eclipse.org/emf/2002/Ecore @@ -241,7 +241,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -362,33 +362,45 @@ + + + + - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - @@ -399,7 +411,7 @@ - + @@ -491,29 +503,17 @@ - - - - - - - - - - - - - - - + + + - - - + + + - - + + @@ -521,16 +521,20 @@ - + + + + + - + @@ -608,7 +612,7 @@ - + @@ -621,7 +625,7 @@ - + @@ -634,7 +638,7 @@ - + @@ -647,7 +651,7 @@ - + @@ -660,16 +664,20 @@ - + + + + + - + @@ -678,7 +686,7 @@ - + @@ -687,7 +695,7 @@ - + @@ -696,7 +704,7 @@ - + @@ -705,7 +713,7 @@ - + @@ -714,7 +722,7 @@ - + @@ -723,7 +731,7 @@ - + @@ -732,7 +740,7 @@ - + @@ -741,7 +749,29 @@ - + + + + + + + + + + + + + + + + + + + + + + + @@ -794,17 +824,17 @@ - + - + - + - + @@ -874,19 +904,19 @@ - + - + - + - + - + - + @@ -898,9 +928,9 @@ - + - + @@ -909,30 +939,30 @@ - + - + - + - + - + - + - + - + @@ -946,7 +976,7 @@ - + @@ -1064,126 +1094,54 @@ - - - - - - - - - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1212,8 +1170,8 @@ - - + + @@ -1232,22 +1190,6 @@ - - - - - - - - - - - - - - - - @@ -1325,7 +1267,7 @@ - + @@ -1340,8 +1282,8 @@ - - + + @@ -1372,26 +1314,186 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1536,7 +1638,7 @@ - + KEEP_LOCATION @@ -1618,7 +1720,7 @@ - + KEEP_LOCATION @@ -1629,7 +1731,7 @@ - + KEEP_LOCATION @@ -1640,7 +1742,7 @@ - + KEEP_LOCATION @@ -1821,7 +1923,8 @@ - + + routingStyle italic @@ -1834,7 +1937,8 @@ - + + routingStyle italic @@ -1846,8 +1950,10 @@ + - + + routingStyle italic @@ -1859,8 +1965,10 @@ + - + + routingStyle italic @@ -1872,7 +1980,9 @@ - + + + routingStyle italic @@ -1948,17 +2058,25 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic + + + + + + + + @@ -1986,37 +2104,53 @@ - + + + + + + + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic + + + + + + + + + + + + + + + + - + - - - - - - - - KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + @@ -2044,22 +2178,22 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - + - + routingStyle - + italic - + @@ -2246,13 +2380,13 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + @@ -2271,7 +2405,8 @@ - + + routingStyle italic @@ -2280,39 +2415,38 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + + + + + + + + + - + + routingStyle - + italic - + - - - - - - - - - - @@ -2470,7 +2604,7 @@ - + KEEP_LOCATION @@ -2482,41 +2616,6 @@ - - - - - - - italic - - - - - - - - - - - - italic - - - - - - - - - - - - - - - - @@ -2610,7 +2709,7 @@ - + KEEP_LOCATION @@ -2629,7 +2728,7 @@ - + KEEP_LOCATION @@ -2640,19 +2739,14 @@ - - - - - - - labelSize - - - labelSize - - - + + + + + + + + @@ -2849,12 +2943,173 @@ + + + + + + labelSize + + + labelSize + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + italic + + + + + + + + + + + + + italic + + + + + + + + + + + + routingStyle + + + italic + + + + + + + + + + + + routingStyle + + + italic + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + routingStyle + + + italic + + + + + + + + + + + + + + + + + + + + + + + labelSize + + + labelSize + + + + - diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index 55a083a0e..9bf972cdd 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -18,8 +18,16 @@ eType="#//MSE" containment="true"/> - - + + +

+ + + + +
+ + @@ -57,13 +65,15 @@ + + - + @@ -100,23 +110,22 @@ - + - - - - - + + + + + + - + @@ -127,9 +136,19 @@ - + + + +
+ + + + - + + + @@ -139,7 +158,7 @@ + eSuperTypes="#//GenericValue"/> @@ -151,11 +170,14 @@ - + - + + + @@ -164,4 +186,14 @@ + + + + +
+ + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel index afdcfb171..18e496be5 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel @@ -51,43 +51,65 @@ + - - + - + - - + - - - - + + + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.png b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.png new file mode 100644 index 0000000000000000000000000000000000000000..a58471b280fa1d0a9282f0907f14734966f76c8b GIT binary patch literal 260414 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%0AE~OuqKOC)DRM?IIEGJ%9|&D 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 { +public interface GenericDimension extends Dimension { /** * Returns the value of the 'Dynamic Property' reference. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java index 0cecb477f..4a9524377 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java @@ -79,6 +79,7 @@ public interface GenericMSE extends MSE { * * * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return callerReference;'" * @generated */ EObject getCaller(); @@ -87,6 +88,7 @@ public interface GenericMSE extends MSE { * * * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return actionReference;'" * @generated */ EOperation getAction(); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java index abf74ecc1..14606241c 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java @@ -13,5 +13,5 @@ * @model * @generated */ -public interface GenericParallelStep extends ParallelStep { +public interface GenericParallelStep extends ParallelStep, GenericStep { } // GenericParallelStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java index 87632948f..35a9cc850 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java @@ -2,6 +2,8 @@ */ package fr.inria.diverse.trace.commons.model.trace; +import org.eclipse.emf.ecore.EObject; + /** * @@ -19,7 +21,7 @@ * @model * @generated */ -public interface GenericReferenceValue extends Value { +public interface GenericReferenceValue extends GenericValue { /** * Returns the value of the 'Reference Value' reference. * @@ -29,12 +31,12 @@ public interface GenericReferenceValue extends Value { *

* * @return the value of the 'Reference Value' reference. - * @see #setReferenceValue(Object) + * @see #setReferenceValue(EObject) * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericReferenceValue_ReferenceValue() - * @model kind="reference" + * @model * @generated */ - T getReferenceValue(); + EObject getReferenceValue(); /** * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue#getReferenceValue Reference Value}' reference. @@ -44,6 +46,6 @@ public interface GenericReferenceValue extends Value { * @see #getReferenceValue() * @generated */ - void setReferenceValue(T value); + void setReferenceValue(EObject value); } // GenericReferenceValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java index bcaa243a9..2674469db 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java @@ -13,5 +13,5 @@ * @model * @generated */ -public interface GenericSequentialStep extends SequentialStep { +public interface GenericSequentialStep extends SequentialStep, GenericStep { } // GenericSequentialStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java index b6ffacb94..2f2478f9c 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java @@ -13,5 +13,5 @@ * @model * @generated */ -public interface GenericSmallStep extends SmallStep { +public interface GenericSmallStep extends SmallStep, GenericStep { } // GenericSmallStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java index 2ece4b923..217b106ea 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java @@ -2,16 +2,51 @@ */ package fr.inria.diverse.trace.commons.model.trace; +import org.eclipse.emf.common.util.EList; + /** * * A representation of the model object 'Generic State'. * * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValues Values}
    • + *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState() * @model * @generated */ public interface GenericState extends State { + + /** + * Returns the value of the 'Values' reference list. + * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericValue}. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates States}'. + * + *

+ * If the meaning of the 'Values' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Values' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState_Values() + * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates + * @model opposite="states" + * @generated + */ + EList getValues(); + + /** + * + * + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList result = new org.eclipse.emf.common.util.BasicEList();\nresult.addAll(getValues());\nreturn result;'" + * @generated + */ + EList getValuesView(); } // GenericState diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java new file mode 100644 index 000000000..697e8b8d6 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + + +/** + * + * A representation of the model object 'Generic Step'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericStep() + * @model abstract="true" + * @generated + */ +public interface GenericStep extends Step { +} // GenericStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java index 95f625885..908bb5277 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java @@ -12,5 +12,5 @@ * @model * @generated */ -public interface GenericTrace extends Trace, GenericState> { +public interface GenericTrace extends Trace, GenericState> { } // GenericTrace diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java new file mode 100644 index 000000000..03b39cf8b --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java @@ -0,0 +1,52 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; + + +/** + * + * A representation of the model object 'Generic Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates States}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericValue() + * @model abstract="true" + * @generated + */ +public interface GenericValue extends Value { + + /** + * Returns the value of the 'States' reference list. + * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericState}. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValues Values}'. + * + *

+ * If the meaning of the 'States' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'States' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericValue_States() + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValues + * @model opposite="values" + * @generated + */ + EList getStates(); + + /** + * + * + * @model kind="operation" required="true" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList result = new org.eclipse.emf.common.util.BasicEList();\nresult.addAll(getStates());\nreturn result;'" + * @generated + */ + EList getStatesView(); +} // GenericValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java index fcaf17a29..948bef421 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java @@ -15,7 +15,7 @@ * The following features are supported: *

*
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getLaunchconfigurationparameter Launchconfigurationparameter}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getParameters Parameters}
    • *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getType Type}
    • *
* @@ -25,20 +25,20 @@ */ public interface LaunchConfiguration extends EObject { /** - * Returns the value of the 'Launchconfigurationparameter' containment reference list. + * Returns the value of the 'Parameters' containment reference list. * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter}. * *

- * If the meaning of the 'Launchconfigurationparameter' containment reference list isn't clear, + * If the meaning of the 'Parameters' containment reference list isn't clear, * there really should be more of a description here... *

* - * @return the value of the 'Launchconfigurationparameter' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfiguration_Launchconfigurationparameter() + * @return the value of the 'Parameters' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfiguration_Parameters() * @model containment="true" * @generated */ - EList getLaunchconfigurationparameter(); + EList getParameters(); /** * Returns the value of the 'Type' attribute. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java index 87db548b6..80abc20ae 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java @@ -9,10 +9,43 @@ * A representation of the model object 'Launch Configuration Parameter'. * * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue Value}
    • + *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfigurationParameter() * @model abstract="true" * @generated */ public interface LaunchConfigurationParameter extends EObject { + + /** + * Returns the value of the 'Value' attribute. + * The default value is "". + * + *

+ * If the meaning of the 'Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Value' attribute. + * @see #setValue(String) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfigurationParameter_Value() + * @model default="" + * @generated + */ + String getValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue Value}' attribute. + * + * + * @param value the new value of the 'Value' attribute. + * @see #getValue() + * @generated + */ + void setValue(String value); } // LaunchConfigurationParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java index 70e9dfac2..84a20693a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java @@ -10,12 +10,6 @@ * A representation of the model object 'State'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getValue Value}
    • - *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState() * @model abstract="true" @@ -23,21 +17,11 @@ */ public interface State extends EObject { /** - * Returns the value of the 'Value' reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.Value}. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Value#getState State}'. * - *

- * If the meaning of the 'Value' reference isn't clear, - * there really should be more of a description here... - *

* - * @return the value of the 'Value' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_Value() - * @see fr.inria.diverse.trace.commons.model.trace.Value#getState - * @model opposite="state" + * @model kind="operation" * @generated */ - EList getValue(); + EList getValuesView(); } // State diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java index c14ca6277..728384d29 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java @@ -101,7 +101,7 @@ public interface TraceFactory extends EFactory { * @return a new object of class 'Generic Reference Value'. * @generated */ - GenericReferenceValue createGenericReferenceValue(); + GenericReferenceValue createGenericReferenceValue(); /** * Returns a new object of class 'Generic Dimension'. @@ -137,7 +137,7 @@ public interface TraceFactory extends EFactory { * @return a new object of class 'Generic Trace'. * @generated */ - GenericTrace createGenericTrace(); + GenericTrace createGenericTrace(); /** * Returns a new object of class 'Boolean Attribute Value'. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java index b43692620..05708bf75 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java @@ -805,22 +805,22 @@ public interface TracePackage extends EPackage { int VALUE = 15; /** - * The feature id for the 'State' reference list. + * The number of structural features of the 'Value' class. * * * @generated * @ordered */ - int VALUE__STATE = 0; + int VALUE_FEATURE_COUNT = 0; /** - * The number of structural features of the 'Value' class. + * The operation id for the 'Get States View' operation. * * * @generated * @ordered */ - int VALUE_FEATURE_COUNT = 1; + int VALUE___GET_STATES_VIEW = 0; /** * The number of operations of the 'Value' class. @@ -829,7 +829,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int VALUE_OPERATION_COUNT = 0; + int VALUE_OPERATION_COUNT = 1; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. @@ -842,22 +842,22 @@ public interface TracePackage extends EPackage { int STATE = 16; /** - * The feature id for the 'Value' reference list. + * The number of structural features of the 'State' class. * * * @generated * @ordered */ - int STATE__VALUE = 0; + int STATE_FEATURE_COUNT = 0; /** - * The number of structural features of the 'State' class. + * The operation id for the 'Get Values View' operation. * * * @generated * @ordered */ - int STATE_FEATURE_COUNT = 1; + int STATE___GET_VALUES_VIEW = 0; /** * The number of operations of the 'State' class. @@ -866,7 +866,53 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int STATE_OPERATION_COUNT = 0; + int STATE_OPERATION_COUNT = 1; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl Generic Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericValue() + * @generated + */ + int GENERIC_VALUE = 37; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_VALUE__STATES = VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Generic Value' class. + * + * + * @generated + * @ordered + */ + int GENERIC_VALUE_FEATURE_COUNT = VALUE_FEATURE_COUNT + 1; + + /** + * The operation id for the 'Get States View' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_VALUE___GET_STATES_VIEW = VALUE_OPERATION_COUNT + 0; + + /** + * The number of operations of the 'Generic Value' class. + * + * + * @generated + * @ordered + */ + int GENERIC_VALUE_OPERATION_COUNT = VALUE_OPERATION_COUNT + 1; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl Generic Reference Value}' class. @@ -879,13 +925,13 @@ public interface TracePackage extends EPackage { int GENERIC_REFERENCE_VALUE = 17; /** - * The feature id for the 'State' reference list. + * The feature id for the 'States' reference list. * * * @generated * @ordered */ - int GENERIC_REFERENCE_VALUE__STATE = VALUE__STATE; + int GENERIC_REFERENCE_VALUE__STATES = GENERIC_VALUE__STATES; /** * The feature id for the 'Reference Value' reference. @@ -894,7 +940,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_REFERENCE_VALUE__REFERENCE_VALUE = VALUE_FEATURE_COUNT + 0; + int GENERIC_REFERENCE_VALUE__REFERENCE_VALUE = GENERIC_VALUE_FEATURE_COUNT + 0; /** * The number of structural features of the 'Generic Reference Value' class. @@ -903,7 +949,16 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_REFERENCE_VALUE_FEATURE_COUNT = VALUE_FEATURE_COUNT + 1; + int GENERIC_REFERENCE_VALUE_FEATURE_COUNT = GENERIC_VALUE_FEATURE_COUNT + 1; + + /** + * The operation id for the 'Get States View' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_REFERENCE_VALUE___GET_STATES_VIEW = GENERIC_VALUE___GET_STATES_VIEW; /** * The number of operations of the 'Generic Reference Value' class. @@ -912,7 +967,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_REFERENCE_VALUE_OPERATION_COUNT = VALUE_OPERATION_COUNT + 0; + int GENERIC_REFERENCE_VALUE_OPERATION_COUNT = GENERIC_VALUE_OPERATION_COUNT + 0; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl Generic Dimension}' class. @@ -1008,13 +1063,13 @@ public interface TracePackage extends EPackage { int GENERIC_STATE = 20; /** - * The feature id for the 'Value' reference list. + * The feature id for the 'Values' reference list. * * * @generated * @ordered */ - int GENERIC_STATE__VALUE = STATE__VALUE; + int GENERIC_STATE__VALUES = STATE_FEATURE_COUNT + 0; /** * The number of structural features of the 'Generic State' class. @@ -1023,7 +1078,16 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_STATE_FEATURE_COUNT = STATE_FEATURE_COUNT + 0; + int GENERIC_STATE_FEATURE_COUNT = STATE_FEATURE_COUNT + 1; + + /** + * The operation id for the 'Get Values View' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE___GET_VALUES_VIEW = STATE_OPERATION_COUNT + 0; /** * The number of operations of the 'Generic State' class. @@ -1032,7 +1096,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_STATE_OPERATION_COUNT = STATE_OPERATION_COUNT + 0; + int GENERIC_STATE_OPERATION_COUNT = STATE_OPERATION_COUNT + 1; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl Generic Trace}' class. @@ -1109,13 +1173,13 @@ public interface TracePackage extends EPackage { int GENERIC_ATTRIBUTE_VALUE = 22; /** - * The feature id for the 'State' reference list. + * The feature id for the 'States' reference list. * * * @generated * @ordered */ - int GENERIC_ATTRIBUTE_VALUE__STATE = VALUE__STATE; + int GENERIC_ATTRIBUTE_VALUE__STATES = GENERIC_VALUE__STATES; /** * The number of structural features of the 'Generic Attribute Value' class. @@ -1124,7 +1188,16 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT = VALUE_FEATURE_COUNT + 0; + int GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_VALUE_FEATURE_COUNT + 0; + + /** + * The operation id for the 'Get States View' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_ATTRIBUTE_VALUE___GET_STATES_VIEW = GENERIC_VALUE___GET_STATES_VIEW; /** * The number of operations of the 'Generic Attribute Value' class. @@ -1133,7 +1206,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT = VALUE_OPERATION_COUNT + 0; + int GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_VALUE_OPERATION_COUNT + 0; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. @@ -1146,13 +1219,13 @@ public interface TracePackage extends EPackage { int BOOLEAN_ATTRIBUTE_VALUE = 23; /** - * The feature id for the 'State' reference list. + * The feature id for the 'States' reference list. * * * @generated * @ordered */ - int BOOLEAN_ATTRIBUTE_VALUE__STATE = GENERIC_ATTRIBUTE_VALUE__STATE; + int BOOLEAN_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; /** * The feature id for the 'Attribute Value' attribute. @@ -1172,6 +1245,15 @@ public interface TracePackage extends EPackage { */ int BOOLEAN_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + /** + * The operation id for the 'Get States View' operation. + * + * + * @generated + * @ordered + */ + int BOOLEAN_ATTRIBUTE_VALUE___GET_STATES_VIEW = GENERIC_ATTRIBUTE_VALUE___GET_STATES_VIEW; + /** * The number of operations of the 'Boolean Attribute Value' class. * @@ -1192,13 +1274,13 @@ public interface TracePackage extends EPackage { int INTEGER_ATTRIBUTEVALUE = 24; /** - * The feature id for the 'State' reference list. + * The feature id for the 'States' reference list. * * * @generated * @ordered */ - int INTEGER_ATTRIBUTEVALUE__STATE = GENERIC_ATTRIBUTE_VALUE__STATE; + int INTEGER_ATTRIBUTEVALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; /** * The feature id for the 'Attribute Value' attribute. @@ -1218,6 +1300,15 @@ public interface TracePackage extends EPackage { */ int INTEGER_ATTRIBUTEVALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + /** + * The operation id for the 'Get States View' operation. + * + * + * @generated + * @ordered + */ + int INTEGER_ATTRIBUTEVALUE___GET_STATES_VIEW = GENERIC_ATTRIBUTE_VALUE___GET_STATES_VIEW; + /** * The number of operations of the 'Integer Attributevalue' class. * @@ -1238,13 +1329,13 @@ public interface TracePackage extends EPackage { int STRING_ATTRIBUTE_VALUE = 25; /** - * The feature id for the 'State' reference list. + * The feature id for the 'States' reference list. * * * @generated * @ordered */ - int STRING_ATTRIBUTE_VALUE__STATE = GENERIC_ATTRIBUTE_VALUE__STATE; + int STRING_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; /** * The feature id for the 'Attribute Value' attribute. @@ -1264,6 +1355,15 @@ public interface TracePackage extends EPackage { */ int STRING_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + /** + * The operation id for the 'Get States View' operation. + * + * + * @generated + * @ordered + */ + int STRING_ATTRIBUTE_VALUE___GET_STATES_VIEW = GENERIC_ATTRIBUTE_VALUE___GET_STATES_VIEW; + /** * The number of operations of the 'String Attribute Value' class. * @@ -1284,13 +1384,13 @@ public interface TracePackage extends EPackage { int LAUNCH_CONFIGURATION = 26; /** - * The feature id for the 'Launchconfigurationparameter' containment reference list. + * The feature id for the 'Parameters' containment reference list. * * * @generated * @ordered */ - int LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER = 0; + int LAUNCH_CONFIGURATION__PARAMETERS = 0; /** * The feature id for the 'Type' attribute. @@ -1329,6 +1429,15 @@ public interface TracePackage extends EPackage { */ int LAUNCH_CONFIGURATION_PARAMETER = 27; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int LAUNCH_CONFIGURATION_PARAMETER__VALUE = 0; + /** * The number of structural features of the 'Launch Configuration Parameter' class. * @@ -1336,7 +1445,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT = 0; + int LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT = 1; /** * The number of operations of the 'Launch Configuration Parameter' class. @@ -1357,6 +1466,15 @@ public interface TracePackage extends EPackage { */ int LANGUAGE_NAME_PARAMETER = 28; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int LANGUAGE_NAME_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + /** * The number of structural features of the 'Language Name Parameter' class. * @@ -1385,6 +1503,15 @@ public interface TracePackage extends EPackage { */ int ADDON_EXTENSION_PARAMETER = 29; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int ADDON_EXTENSION_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + /** * The number of structural features of the 'Addon Extension Parameter' class. * @@ -1413,6 +1540,15 @@ public interface TracePackage extends EPackage { */ int MODEL_URI_PARAMETER = 30; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int MODEL_URI_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + /** * The number of structural features of the 'Model URI Parameter' class. * @@ -1441,6 +1577,15 @@ public interface TracePackage extends EPackage { */ int ANIMATOR_URI_PARAMETER = 31; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int ANIMATOR_URI_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + /** * The number of structural features of the 'Animator URI Parameter' class. * @@ -1469,6 +1614,15 @@ public interface TracePackage extends EPackage { */ int ENTRY_POINT_PARAMETER = 32; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int ENTRY_POINT_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + /** * The number of structural features of the 'Entry Point Parameter' class. * @@ -1497,6 +1651,15 @@ public interface TracePackage extends EPackage { */ int INITIALIZATION_ARGUMENTS_PARAMETER = 33; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_ARGUMENTS_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + /** * The number of structural features of the 'Initialization Arguments Parameter' class. * @@ -1525,6 +1688,15 @@ public interface TracePackage extends EPackage { */ int MODEL_ROOT_PARAMETER = 34; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int MODEL_ROOT_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + /** * The number of structural features of the 'Model Root Parameter' class. * @@ -1553,6 +1725,15 @@ public interface TracePackage extends EPackage { */ int INITIALIZATION_METHOD_PARAMETER = 35; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_METHOD_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + /** * The number of structural features of the 'Initialization Method Parameter' class. * @@ -1571,6 +1752,43 @@ public interface TracePackage extends EPackage { */ int INITIALIZATION_METHOD_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl Generic Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericStep() + * @generated + */ + int GENERIC_STEP = 36; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP__MSEOCCURRENCE = STEP__MSEOCCURRENCE; + + /** + * The number of structural features of the 'Generic Step' class. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP_FEATURE_COUNT = STEP_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Generic Step' class. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP_OPERATION_COUNT = STEP_OPERATION_COUNT + 0; + /** * The meta object id for the 'ISerializable' data type. * @@ -1578,7 +1796,7 @@ public interface TracePackage extends EPackage { * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() * @generated */ - int ISERIALIZABLE = 36; + int ISERIALIZABLE = 38; /** @@ -1936,15 +2154,14 @@ public interface TracePackage extends EPackage { EClass getValue(); /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.Value#getState State}'. + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.Value#getStatesView() Get States View}' operation. * * - * @return the meta object for the reference list 'State'. - * @see fr.inria.diverse.trace.commons.model.trace.Value#getState() - * @see #getValue() + * @return the meta object for the 'Get States View' operation. + * @see fr.inria.diverse.trace.commons.model.trace.Value#getStatesView() * @generated */ - EReference getValue_State(); + EOperation getValue__GetStatesView(); /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. @@ -1957,15 +2174,14 @@ public interface TracePackage extends EPackage { EClass getState(); /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getValue Value}'. + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.State#getValuesView() Get Values View}' operation. * * - * @return the meta object for the reference list 'Value'. - * @see fr.inria.diverse.trace.commons.model.trace.State#getValue() - * @see #getState() + * @return the meta object for the 'Get Values View' operation. + * @see fr.inria.diverse.trace.commons.model.trace.State#getValuesView() * @generated */ - EReference getState_Value(); + EOperation getState__GetValuesView(); /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue Generic Reference Value}'. @@ -2029,6 +2245,27 @@ public interface TracePackage extends EPackage { */ EClass getGenericState(); + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValues Values}'. + * + * + * @return the meta object for the reference list 'Values'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValues() + * @see #getGenericState() + * @generated + */ + EReference getGenericState_Values(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesView() Get Values View}' operation. + * + * + * @return the meta object for the 'Get Values View' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesView() + * @generated + */ + EOperation getGenericState__GetValuesView(); + /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericTrace Generic Trace}'. * @@ -2123,15 +2360,15 @@ public interface TracePackage extends EPackage { EClass getLaunchConfiguration(); /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getLaunchconfigurationparameter Launchconfigurationparameter}'. + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getParameters Parameters}'. * * - * @return the meta object for the containment reference list 'Launchconfigurationparameter'. - * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getLaunchconfigurationparameter() + * @return the meta object for the containment reference list 'Parameters'. + * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getParameters() * @see #getLaunchConfiguration() * @generated */ - EReference getLaunchConfiguration_Launchconfigurationparameter(); + EReference getLaunchConfiguration_Parameters(); /** * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getType Type}'. @@ -2154,6 +2391,17 @@ public interface TracePackage extends EPackage { */ EClass getLaunchConfigurationParameter(); + /** + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue Value}'. + * + * + * @return the meta object for the attribute 'Value'. + * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue() + * @see #getLaunchConfigurationParameter() + * @generated + */ + EAttribute getLaunchConfigurationParameter_Value(); + /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter Language Name Parameter}'. * @@ -2234,6 +2482,47 @@ public interface TracePackage extends EPackage { */ EClass getInitializationMethodParameter(); + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep Generic Step}'. + * + * + * @return the meta object for class 'Generic Step'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericStep + * @generated + */ + EClass getGenericStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue Generic Value}'. + * + * + * @return the meta object for class 'Generic Value'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericValue + * @generated + */ + EClass getGenericValue(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates States}'. + * + * + * @return the meta object for the reference list 'States'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates() + * @see #getGenericValue() + * @generated + */ + EReference getGenericValue_States(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesView() Get States View}' operation. + * + * + * @return the meta object for the 'Get States View' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesView() + * @generated + */ + EOperation getGenericValue__GetStatesView(); + /** * Returns the meta object for data type 'ISerializable'. * @@ -2572,12 +2861,12 @@ interface Literals { EClass VALUE = eINSTANCE.getValue(); /** - * The meta object literal for the 'State' reference list feature. + * The meta object literal for the 'Get States View' operation. * * * @generated */ - EReference VALUE__STATE = eINSTANCE.getValue_State(); + EOperation VALUE___GET_STATES_VIEW = eINSTANCE.getValue__GetStatesView(); /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. @@ -2590,12 +2879,12 @@ interface Literals { EClass STATE = eINSTANCE.getState(); /** - * The meta object literal for the 'Value' reference list feature. + * The meta object literal for the 'Get Values View' operation. * * * @generated */ - EReference STATE__VALUE = eINSTANCE.getState_Value(); + EOperation STATE___GET_VALUES_VIEW = eINSTANCE.getState__GetValuesView(); /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl Generic Reference Value}' class. @@ -2653,6 +2942,22 @@ interface Literals { */ EClass GENERIC_STATE = eINSTANCE.getGenericState(); + /** + * The meta object literal for the 'Values' reference list feature. + * + * + * @generated + */ + EReference GENERIC_STATE__VALUES = eINSTANCE.getGenericState_Values(); + + /** + * The meta object literal for the 'Get Values View' operation. + * + * + * @generated + */ + EOperation GENERIC_STATE___GET_VALUES_VIEW = eINSTANCE.getGenericState__GetValuesView(); + /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl Generic Trace}' class. * @@ -2738,12 +3043,12 @@ interface Literals { EClass LAUNCH_CONFIGURATION = eINSTANCE.getLaunchConfiguration(); /** - * The meta object literal for the 'Launchconfigurationparameter' containment reference list feature. + * The meta object literal for the 'Parameters' containment reference list feature. * * * @generated */ - EReference LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER = eINSTANCE.getLaunchConfiguration_Launchconfigurationparameter(); + EReference LAUNCH_CONFIGURATION__PARAMETERS = eINSTANCE.getLaunchConfiguration_Parameters(); /** * The meta object literal for the 'Type' attribute feature. @@ -2763,6 +3068,14 @@ interface Literals { */ EClass LAUNCH_CONFIGURATION_PARAMETER = eINSTANCE.getLaunchConfigurationParameter(); + /** + * The meta object literal for the 'Value' attribute feature. + * + * + * @generated + */ + EAttribute LAUNCH_CONFIGURATION_PARAMETER__VALUE = eINSTANCE.getLaunchConfigurationParameter_Value(); + /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl Language Name Parameter}' class. * @@ -2843,6 +3156,42 @@ interface Literals { */ EClass INITIALIZATION_METHOD_PARAMETER = eINSTANCE.getInitializationMethodParameter(); + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl Generic Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericStep() + * @generated + */ + EClass GENERIC_STEP = eINSTANCE.getGenericStep(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl Generic Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericValue() + * @generated + */ + EClass GENERIC_VALUE = eINSTANCE.getGenericValue(); + + /** + * The meta object literal for the 'States' reference list feature. + * + * + * @generated + */ + EReference GENERIC_VALUE__STATES = eINSTANCE.getGenericValue_States(); + + /** + * The meta object literal for the 'Get States View' operation. + * + * + * @generated + */ + EOperation GENERIC_VALUE___GET_STATES_VIEW = eINSTANCE.getGenericValue__GetStatesView(); + /** * The meta object literal for the 'ISerializable' data type. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java index dc357a8bd..c6de0bd64 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java @@ -10,34 +10,19 @@ * A representation of the model object 'Value'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.Value#getState State}
    • - *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue() * @model abstract="true" * @generated */ public interface Value extends EObject { + /** - * Returns the value of the 'State' reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.State}. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getValue Value}'. * - *

- * If the meaning of the 'State' reference isn't clear, - * there really should be more of a description here... - *

* - * @return the value of the 'State' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue_State() - * @see fr.inria.diverse.trace.commons.model.trace.State#getValue - * @model opposite="value" + * @model kind="operation" required="true" * @generated */ - EList getState(); + EList getStatesView(); } // Value diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java index aa47b602b..aefb2dc4b 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java @@ -14,7 +14,7 @@ * * @generated */ -public abstract class GenericAttributeValueImpl extends ValueImpl implements GenericAttributeValue { +public abstract class GenericAttributeValueImpl extends GenericValueImpl implements GenericAttributeValue { /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java index 3c57d0489..7de724f55 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java @@ -3,15 +3,16 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.GenericDimension; +import fr.inria.diverse.trace.commons.model.trace.GenericValue; import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import fr.inria.diverse.trace.commons.model.trace.Value; import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; /** * @@ -26,7 +27,7 @@ * * @generated */ -public class GenericDimensionImpl extends DimensionImpl implements GenericDimension { +public class GenericDimensionImpl extends DimensionImpl implements GenericDimension { /** * The cached value of the '{@link #getDynamicProperty() Dynamic Property}' reference. * @@ -56,6 +57,20 @@ protected EClass eStaticClass() { return TracePackage.Literals.GENERIC_DIMENSION; } + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getValues() { + if (values == null) { + values = new EObjectContainmentEList(GenericValue.class, this, TracePackage.GENERIC_DIMENSION__VALUES); + } + return values; + } + /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java index c7ed3e4c4..df764c6d7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java @@ -5,8 +5,10 @@ import fr.inria.diverse.trace.commons.model.trace.GenericMSE; import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import java.lang.reflect.InvocationTargetException; import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EOperation; @@ -144,6 +146,24 @@ public void setActionReference(EOperation newActionReference) { eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_MSE__ACTION_REFERENCE, oldActionReference, actionReference)); } + /** + * + * + * @generated + */ + public EObject getCaller() { + return callerReference; + } + + /** + * + * + * @generated + */ + public EOperation getAction() { + return actionReference; + } + /** * * @@ -214,4 +234,20 @@ public boolean eIsSet(int featureID) { return super.eIsSet(featureID); } + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case TracePackage.GENERIC_MSE___GET_CALLER: + return getCaller(); + case TracePackage.GENERIC_MSE___GET_ACTION: + return getAction(); + } + return super.eInvoke(operationID, arguments); + } + } //GenericMSEImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java index 614ed5393..accfd8878 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java @@ -26,7 +26,7 @@ * * @generated */ -public class GenericReferenceValueImpl extends ValueImpl implements GenericReferenceValue { +public class GenericReferenceValueImpl extends GenericValueImpl implements GenericReferenceValue { /** * The cached value of the '{@link #getReferenceValue() Reference Value}' reference. * @@ -35,7 +35,7 @@ public class GenericReferenceValueImpl extends ValueImpl implements GenericRe * @generated * @ordered */ - protected T referenceValue; + protected EObject referenceValue; /** * * @@ -61,10 +61,10 @@ protected EClass eStaticClass() { * @generated */ @SuppressWarnings("unchecked") - public T getReferenceValue() { - if (referenceValue != null && ((EObject)referenceValue).eIsProxy()) { + public EObject getReferenceValue() { + if (referenceValue != null && referenceValue.eIsProxy()) { InternalEObject oldReferenceValue = (InternalEObject)referenceValue; - referenceValue = (T)eResolveProxy(oldReferenceValue); + referenceValue = eResolveProxy(oldReferenceValue); if (referenceValue != oldReferenceValue) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); @@ -78,7 +78,7 @@ public T getReferenceValue() { * * @generated */ - public T basicGetReferenceValue() { + public EObject basicGetReferenceValue() { return referenceValue; } @@ -87,8 +87,8 @@ public T basicGetReferenceValue() { * * @generated */ - public void setReferenceValue(T newReferenceValue) { - T oldReferenceValue = referenceValue; + public void setReferenceValue(EObject newReferenceValue) { + EObject oldReferenceValue = referenceValue; referenceValue = newReferenceValue; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); @@ -119,7 +119,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: - setReferenceValue((T)newValue); + setReferenceValue((EObject)newValue); return; } super.eSet(featureID, newValue); @@ -134,7 +134,7 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: - setReferenceValue((T)null); + setReferenceValue((EObject)null); return; } super.eUnset(featureID); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java index fe36f4775..117880341 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java @@ -3,18 +3,43 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericValue; import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.Value; +import java.lang.reflect.InvocationTargetException; +import java.util.Collection; +import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; /** * * An implementation of the model object 'Generic State'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl#getValues Values}
    • + *
* * @generated */ public class GenericStateImpl extends StateImpl implements GenericState { + /** + * The cached value of the '{@link #getValues() Values}' reference list. + * + * + * @see #getValues() + * @generated + * @ordered + */ + protected EList values; + /** * * @@ -34,4 +59,130 @@ protected EClass eStaticClass() { return TracePackage.Literals.GENERIC_STATE; } + /** + * + * + * @generated + */ + public EList getValues() { + if (values == null) { + values = new EObjectWithInverseResolvingEList.ManyInverse(GenericValue.class, this, TracePackage.GENERIC_STATE__VALUES, TracePackage.GENERIC_VALUE__STATES); + } + return values; + } + + /** + * + * + * @generated + */ + public EList getValuesView() { + final EList result = new org.eclipse.emf.common.util.BasicEList(); + result.addAll(getValues()); + return result; + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_STATE__VALUES: + return ((InternalEList)(InternalEList)getValues()).basicAdd(otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_STATE__VALUES: + return ((InternalEList)getValues()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.GENERIC_STATE__VALUES: + return getValues(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.GENERIC_STATE__VALUES: + getValues().clear(); + getValues().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_STATE__VALUES: + getValues().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_STATE__VALUES: + return values != null && !values.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case TracePackage.GENERIC_STATE___GET_VALUES_VIEW: + return getValuesView(); + } + return super.eInvoke(operationID, arguments); + } + } //GenericStateImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java new file mode 100644 index 000000000..82a900d31 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.GenericStep; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Generic Step'. + * + * + * @generated + */ +public abstract class GenericStepImpl extends StepImpl implements GenericStep { + /** + * + * + * @generated + */ + protected GenericStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.GENERIC_STEP; + } + +} //GenericStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java index 76c07d0e3..550c52dc9 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java @@ -3,6 +3,7 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericStep; import fr.inria.diverse.trace.commons.model.trace.GenericTrace; import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.TracePackage; @@ -21,7 +22,7 @@ * * @generated */ -public class GenericTraceImpl extends TraceImpl, GenericState> implements GenericTrace { +public class GenericTraceImpl extends TraceImpl, GenericState> implements GenericTrace { /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java new file mode 100644 index 000000000..71589ac7a --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java @@ -0,0 +1,188 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericValue; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import java.lang.reflect.InvocationTargetException; +import java.util.Collection; +import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Generic Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl#getStates States}
    • + *
+ * + * @generated + */ +public abstract class GenericValueImpl extends ValueImpl implements GenericValue { + /** + * The cached value of the '{@link #getStates() States}' reference list. + * + * + * @see #getStates() + * @generated + * @ordered + */ + protected EList states; + + /** + * + * + * @generated + */ + protected GenericValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.GENERIC_VALUE; + } + + /** + * + * + * @generated + */ + public EList getStates() { + if (states == null) { + states = new EObjectWithInverseResolvingEList.ManyInverse(GenericState.class, this, TracePackage.GENERIC_VALUE__STATES, TracePackage.GENERIC_STATE__VALUES); + } + return states; + } + + /** + * + * + * @generated + */ + public EList getStatesView() { + final EList result = new org.eclipse.emf.common.util.BasicEList(); + result.addAll(getStates()); + return result; + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_VALUE__STATES: + return ((InternalEList)(InternalEList)getStates()).basicAdd(otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_VALUE__STATES: + return ((InternalEList)getStates()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.GENERIC_VALUE__STATES: + return getStates(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.GENERIC_VALUE__STATES: + getStates().clear(); + getStates().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_VALUE__STATES: + getStates().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_VALUE__STATES: + return states != null && !states.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case TracePackage.GENERIC_VALUE___GET_STATES_VIEW: + return getStatesView(); + } + return super.eInvoke(operationID, arguments); + } + +} //GenericValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java index 463c30d22..45c151c3e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java @@ -30,7 +30,7 @@ * The following features are implemented: *

*
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl#getLaunchconfigurationparameter Launchconfigurationparameter}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl#getParameters Parameters}
    • *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl#getType Type}
    • *
* @@ -38,14 +38,14 @@ */ public class LaunchConfigurationImpl extends MinimalEObjectImpl.Container implements LaunchConfiguration { /** - * The cached value of the '{@link #getLaunchconfigurationparameter() Launchconfigurationparameter}' containment reference list. + * The cached value of the '{@link #getParameters() Parameters}' containment reference list. * * - * @see #getLaunchconfigurationparameter() + * @see #getParameters() * @generated * @ordered */ - protected EList launchconfigurationparameter; + protected EList parameters; /** * The default value of the '{@link #getType() Type}' attribute. @@ -91,11 +91,11 @@ protected EClass eStaticClass() { * * @generated */ - public EList getLaunchconfigurationparameter() { - if (launchconfigurationparameter == null) { - launchconfigurationparameter = new EObjectContainmentEList(LaunchConfigurationParameter.class, this, TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER); + public EList getParameters() { + if (parameters == null) { + parameters = new EObjectContainmentEList(LaunchConfigurationParameter.class, this, TracePackage.LAUNCH_CONFIGURATION__PARAMETERS); } - return launchconfigurationparameter; + return parameters; } /** @@ -127,8 +127,8 @@ public void setType(String newType) { @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER: - return ((InternalEList)getLaunchconfigurationparameter()).basicRemove(otherEnd, msgs); + case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: + return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -141,8 +141,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER: - return getLaunchconfigurationparameter(); + case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: + return getParameters(); case TracePackage.LAUNCH_CONFIGURATION__TYPE: return getType(); } @@ -158,9 +158,9 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER: - getLaunchconfigurationparameter().clear(); - getLaunchconfigurationparameter().addAll((Collection)newValue); + case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: + getParameters().clear(); + getParameters().addAll((Collection)newValue); return; case TracePackage.LAUNCH_CONFIGURATION__TYPE: setType((String)newValue); @@ -177,8 +177,8 @@ public void eSet(int featureID, Object newValue) { @Override public void eUnset(int featureID) { switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER: - getLaunchconfigurationparameter().clear(); + case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: + getParameters().clear(); return; case TracePackage.LAUNCH_CONFIGURATION__TYPE: setType(TYPE_EDEFAULT); @@ -195,8 +195,8 @@ public void eUnset(int featureID) { @Override public boolean eIsSet(int featureID) { switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER: - return launchconfigurationparameter != null && !launchconfigurationparameter.isEmpty(); + case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: + return parameters != null && !parameters.isEmpty(); case TracePackage.LAUNCH_CONFIGURATION__TYPE: return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java index 58e3577a6..473377469 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java @@ -5,18 +5,45 @@ import fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter; import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; /** * * An implementation of the model object 'Launch Configuration Parameter'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl#getValue Value}
    • + *
* * @generated */ public abstract class LaunchConfigurationParameterImpl extends MinimalEObjectImpl.Container implements LaunchConfigurationParameter { + /** + * The default value of the '{@link #getValue() Value}' attribute. + * + * + * @see #getValue() + * @generated + * @ordered + */ + protected static final String VALUE_EDEFAULT = ""; + /** + * The cached value of the '{@link #getValue() Value}' attribute. + * + * + * @see #getValue() + * @generated + * @ordered + */ + protected String value = VALUE_EDEFAULT; + /** * * @@ -36,4 +63,99 @@ protected EClass eStaticClass() { return TracePackage.Literals.LAUNCH_CONFIGURATION_PARAMETER; } + /** + * + * + * @generated + */ + public String getValue() { + return value; + } + + /** + * + * + * @generated + */ + public void setValue(String newValue) { + String oldValue = value; + value = newValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE, oldValue, value)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: + return getValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: + setValue((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: + setValue(VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: + return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (value: "); + result.append(value); + result.append(')'); + return result.toString(); + } + } //LaunchConfigurationParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java index e9e302fa7..425bec2fb 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java @@ -6,40 +6,19 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.commons.model.trace.Value; -import java.util.Collection; -import org.eclipse.emf.common.notify.NotificationChain; - +import java.lang.reflect.InvocationTargetException; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; /** * * An implementation of the model object 'State'. * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getValue Value}
    • - *
* * @generated */ public abstract class StateImpl extends MinimalEObjectImpl.Container implements State { - /** - * The cached value of the '{@link #getValue() Value}' reference list. - * - * - * @see #getValue() - * @generated - * @ordered - */ - protected EList value; - /** * * @@ -64,86 +43,10 @@ protected EClass eStaticClass() { * * @generated */ - public EList getValue() { - if (value == null) { - value = new EObjectWithInverseResolvingEList.ManyInverse(Value.class, this, TracePackage.STATE__VALUE, TracePackage.VALUE__STATE); - } - return value; - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.STATE__VALUE: - return ((InternalEList)(InternalEList)getValue()).basicAdd(otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.STATE__VALUE: - return ((InternalEList)getValue()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.STATE__VALUE: - return getValue(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.STATE__VALUE: - getValue().clear(); - getValue().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.STATE__VALUE: - getValue().clear(); - return; - } - super.eUnset(featureID); + public EList getValuesView() { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); } /** @@ -152,12 +55,12 @@ public void eUnset(int featureID) { * @generated */ @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.STATE__VALUE: - return value != null && !value.isEmpty(); + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case TracePackage.STATE___GET_VALUES_VIEW: + return getValuesView(); } - return super.eIsSet(featureID); + return super.eInvoke(operationID, arguments); } } //StateImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java index 475979b43..026ca8581 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java @@ -202,8 +202,8 @@ public GenericSmallStep createGenericSmallStep() { * * @generated */ - public GenericReferenceValue createGenericReferenceValue() { - GenericReferenceValueImpl genericReferenceValue = new GenericReferenceValueImpl(); + public GenericReferenceValue createGenericReferenceValue() { + GenericReferenceValueImpl genericReferenceValue = new GenericReferenceValueImpl(); return genericReferenceValue; } @@ -242,7 +242,7 @@ public GenericState createGenericState() { * * @generated */ - public GenericTrace createGenericTrace() { + public GenericTrace createGenericTrace() { GenericTraceImpl genericTrace = new GenericTraceImpl(); return genericTrace; } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java index ea210826b..7a4ef2e2a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java @@ -16,8 +16,10 @@ import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; import fr.inria.diverse.trace.commons.model.trace.GenericSmallStep; import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericStep; import fr.inria.diverse.trace.commons.model.trace.GenericTrace; import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; +import fr.inria.diverse.trace.commons.model.trace.GenericValue; import fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter; import fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter; import fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue; @@ -311,6 +313,20 @@ public class TracePackageImpl extends EPackageImpl implements TracePackage { */ private EClass initializationMethodParameterEClass = null; + /** + * + * + * @generated + */ + private EClass genericStepEClass = null; + + /** + * + * + * @generated + */ + private EClass genericValueEClass = null; + /** * * @@ -693,8 +709,8 @@ public EClass getValue() { * * @generated */ - public EReference getValue_State() { - return (EReference)valueEClass.getEStructuralFeatures().get(0); + public EOperation getValue__GetStatesView() { + return valueEClass.getEOperations().get(0); } /** @@ -711,8 +727,8 @@ public EClass getState() { * * @generated */ - public EReference getState_Value() { - return (EReference)stateEClass.getEStructuralFeatures().get(0); + public EOperation getState__GetValuesView() { + return stateEClass.getEOperations().get(0); } /** @@ -769,6 +785,24 @@ public EClass getGenericState() { return genericStateEClass; } + /** + * + * + * @generated + */ + public EReference getGenericState_Values() { + return (EReference)genericStateEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EOperation getGenericState__GetValuesView() { + return genericStateEClass.getEOperations().get(0); + } + /** * * @@ -855,7 +889,7 @@ public EClass getLaunchConfiguration() { * * @generated */ - public EReference getLaunchConfiguration_Launchconfigurationparameter() { + public EReference getLaunchConfiguration_Parameters() { return (EReference)launchConfigurationEClass.getEStructuralFeatures().get(0); } @@ -877,6 +911,15 @@ public EClass getLaunchConfigurationParameter() { return launchConfigurationParameterEClass; } + /** + * + * + * @generated + */ + public EAttribute getLaunchConfigurationParameter_Value() { + return (EAttribute)launchConfigurationParameterEClass.getEStructuralFeatures().get(0); + } + /** * * @@ -949,6 +992,42 @@ public EClass getInitializationMethodParameter() { return initializationMethodParameterEClass; } + /** + * + * + * @generated + */ + public EClass getGenericStep() { + return genericStepEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericValue() { + return genericValueEClass; + } + + /** + * + * + * @generated + */ + public EReference getGenericValue_States() { + return (EReference)genericValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EOperation getGenericValue__GetStatesView() { + return genericValueEClass.getEOperations().get(0); + } + /** * * @@ -1035,10 +1114,10 @@ public void createPackageContents() { createEReference(dimensionEClass, DIMENSION__VALUES); valueEClass = createEClass(VALUE); - createEReference(valueEClass, VALUE__STATE); + createEOperation(valueEClass, VALUE___GET_STATES_VIEW); stateEClass = createEClass(STATE); - createEReference(stateEClass, STATE__VALUE); + createEOperation(stateEClass, STATE___GET_VALUES_VIEW); genericReferenceValueEClass = createEClass(GENERIC_REFERENCE_VALUE); createEReference(genericReferenceValueEClass, GENERIC_REFERENCE_VALUE__REFERENCE_VALUE); @@ -1049,6 +1128,8 @@ public void createPackageContents() { genericTracedObjectEClass = createEClass(GENERIC_TRACED_OBJECT); genericStateEClass = createEClass(GENERIC_STATE); + createEReference(genericStateEClass, GENERIC_STATE__VALUES); + createEOperation(genericStateEClass, GENERIC_STATE___GET_VALUES_VIEW); genericTraceEClass = createEClass(GENERIC_TRACE); @@ -1064,10 +1145,11 @@ public void createPackageContents() { createEAttribute(stringAttributeValueEClass, STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); launchConfigurationEClass = createEClass(LAUNCH_CONFIGURATION); - createEReference(launchConfigurationEClass, LAUNCH_CONFIGURATION__LAUNCHCONFIGURATIONPARAMETER); + createEReference(launchConfigurationEClass, LAUNCH_CONFIGURATION__PARAMETERS); createEAttribute(launchConfigurationEClass, LAUNCH_CONFIGURATION__TYPE); launchConfigurationParameterEClass = createEClass(LAUNCH_CONFIGURATION_PARAMETER); + createEAttribute(launchConfigurationParameterEClass, LAUNCH_CONFIGURATION_PARAMETER__VALUE); languageNameParameterEClass = createEClass(LANGUAGE_NAME_PARAMETER); @@ -1085,6 +1167,12 @@ public void createPackageContents() { initializationMethodParameterEClass = createEClass(INITIALIZATION_METHOD_PARAMETER); + genericStepEClass = createEClass(GENERIC_STEP); + + genericValueEClass = createEClass(GENERIC_VALUE); + createEReference(genericValueEClass, GENERIC_VALUE__STATES); + createEOperation(genericValueEClass, GENERIC_VALUE___GET_STATES_VIEW); + // Create data types iSerializableEDataType = createEDataType(ISERIALIZABLE); } @@ -1124,7 +1212,6 @@ public void initializePackageContents() { ETypeParameter traceEClass_StateSubType = addETypeParameter(traceEClass, "StateSubType"); ETypeParameter tracedObjectEClass_DimensionSubType = addETypeParameter(tracedObjectEClass, "DimensionSubType"); ETypeParameter dimensionEClass_ValueSubType = addETypeParameter(dimensionEClass, "ValueSubType"); - ETypeParameter genericReferenceValueEClass_T = addETypeParameter(genericReferenceValueEClass, "T"); ETypeParameter genericTracedObjectEClass_T = addETypeParameter(genericTracedObjectEClass, "T"); ETypeParameter genericTraceEClass_StepSubType = addETypeParameter(genericTraceEClass, "StepSubType"); @@ -1139,6 +1226,8 @@ public void initializePackageContents() { dimensionEClass_ValueSubType.getEBounds().add(g1); g1 = createEGenericType(ecorePackage.getEObject()); genericTracedObjectEClass_T.getEBounds().add(g1); + g1 = createEGenericType(this.getGenericStep()); + genericTraceEClass_StepSubType.getEBounds().add(g1); // Add supertypes to classes mseEClass.getESuperTypes().add(theEcorePackage.getENamedElement()); @@ -1157,14 +1246,19 @@ public void initializePackageContents() { g2 = createEGenericType(this.getStep()); g1.getETypeArguments().add(g2); genericSequentialStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(this.getGenericStep()); + genericSequentialStepEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(this.getParallelStep()); g2 = createEGenericType(this.getStep()); g1.getETypeArguments().add(g2); genericParallelStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(this.getGenericStep()); + genericParallelStepEClass.getEGenericSuperTypes().add(g1); genericSmallStepEClass.getESuperTypes().add(this.getSmallStep()); - genericReferenceValueEClass.getESuperTypes().add(this.getValue()); + genericSmallStepEClass.getESuperTypes().add(this.getGenericStep()); + genericReferenceValueEClass.getESuperTypes().add(this.getGenericValue()); g1 = createEGenericType(this.getDimension()); - g2 = createEGenericType(this.getValue()); + g2 = createEGenericType(this.getGenericValue()); g1.getETypeArguments().add(g2); genericDimensionEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(this.getTracedObject()); @@ -1182,7 +1276,7 @@ public void initializePackageContents() { g2 = createEGenericType(this.getGenericState()); g1.getETypeArguments().add(g2); genericTraceEClass.getEGenericSuperTypes().add(g1); - genericAttributeValueEClass.getESuperTypes().add(this.getValue()); + genericAttributeValueEClass.getESuperTypes().add(this.getGenericValue()); booleanAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); integerAttributevalueEClass.getESuperTypes().add(this.getGenericAttributeValue()); stringAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); @@ -1194,6 +1288,8 @@ public void initializePackageContents() { initializationArgumentsParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); modelRootParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); initializationMethodParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + genericStepEClass.getESuperTypes().add(this.getStep()); + genericValueEClass.getESuperTypes().add(this.getValue()); // Initialize classes, features, and operations; add parameters initEClass(mseOccurrenceEClass, MSEOccurrence.class, "MSEOccurrence", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1255,14 +1351,15 @@ public void initializePackageContents() { initEReference(getDimension_Values(), g1, null, "values", null, 0, -1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(valueEClass, Value.class, "Value", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getValue_State(), this.getState(), this.getState_Value(), "state", null, 0, -1, Value.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEOperation(getValue__GetStatesView(), this.getState(), "getStatesView", 1, -1, IS_UNIQUE, IS_ORDERED); initEClass(stateEClass, State.class, "State", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getState_Value(), this.getValue(), this.getValue_State(), "value", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEOperation(getState__GetValuesView(), this.getValue(), "getValuesView", 0, -1, IS_UNIQUE, IS_ORDERED); initEClass(genericReferenceValueEClass, GenericReferenceValue.class, "GenericReferenceValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - g1 = createEGenericType(genericReferenceValueEClass_T); - initEReference(getGenericReferenceValue_ReferenceValue(), g1, null, "referenceValue", null, 0, 1, GenericReferenceValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGenericReferenceValue_ReferenceValue(), ecorePackage.getEObject(), null, "referenceValue", null, 0, 1, GenericReferenceValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(genericDimensionEClass, GenericDimension.class, "GenericDimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getGenericDimension_DynamicProperty(), theEcorePackage.getEStructuralFeature(), null, "dynamicProperty", null, 0, 1, GenericDimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1270,6 +1367,9 @@ public void initializePackageContents() { initEClass(genericTracedObjectEClass, GenericTracedObject.class, "GenericTracedObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(genericStateEClass, GenericState.class, "GenericState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getGenericState_Values(), this.getGenericValue(), this.getGenericValue_States(), "values", null, 0, -1, GenericState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEOperation(getGenericState__GetValuesView(), this.getValue(), "getValuesView", 0, -1, IS_UNIQUE, IS_ORDERED); initEClass(genericTraceEClass, GenericTrace.class, "GenericTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1285,10 +1385,11 @@ public void initializePackageContents() { initEAttribute(getStringAttributeValue_AttributeValue(), theEcorePackage.getEString(), "attributeValue", null, 0, 1, StringAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(launchConfigurationEClass, LaunchConfiguration.class, "LaunchConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getLaunchConfiguration_Launchconfigurationparameter(), this.getLaunchConfigurationParameter(), null, "launchconfigurationparameter", null, 0, -1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getLaunchConfiguration_Parameters(), this.getLaunchConfigurationParameter(), null, "parameters", null, 0, -1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getLaunchConfiguration_Type(), theEcorePackage.getEString(), "type", null, 1, 1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(launchConfigurationParameterEClass, LaunchConfigurationParameter.class, "LaunchConfigurationParameter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getLaunchConfigurationParameter_Value(), ecorePackage.getEString(), "value", "", 0, 1, LaunchConfigurationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(languageNameParameterEClass, LanguageNameParameter.class, "LanguageNameParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1306,6 +1407,13 @@ public void initializePackageContents() { initEClass(initializationMethodParameterEClass, InitializationMethodParameter.class, "InitializationMethodParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(genericStepEClass, GenericStep.class, "GenericStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericValueEClass, GenericValue.class, "GenericValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getGenericValue_States(), this.getGenericState(), this.getGenericState_Values(), "states", null, 0, -1, GenericValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEOperation(getGenericValue__GetStatesView(), this.getState(), "getStatesView", 1, -1, IS_UNIQUE, IS_ORDERED); + // Initialize data types initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java index ffe663901..abdeabe22 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java @@ -5,40 +5,19 @@ import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.commons.model.trace.Value; -import java.util.Collection; -import org.eclipse.emf.common.notify.NotificationChain; - +import java.lang.reflect.InvocationTargetException; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; /** * * An implementation of the model object 'Value'. * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl#getState State}
    • - *
* * @generated */ public abstract class ValueImpl extends MinimalEObjectImpl.Container implements Value { - /** - * The cached value of the '{@link #getState() State}' reference list. - * - * - * @see #getState() - * @generated - * @ordered - */ - protected EList state; - /** * * @@ -63,86 +42,10 @@ protected EClass eStaticClass() { * * @generated */ - public EList getState() { - if (state == null) { - state = new EObjectWithInverseResolvingEList.ManyInverse(State.class, this, TracePackage.VALUE__STATE, TracePackage.STATE__VALUE); - } - return state; - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.VALUE__STATE: - return ((InternalEList)(InternalEList)getState()).basicAdd(otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.VALUE__STATE: - return ((InternalEList)getState()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.VALUE__STATE: - return getState(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.VALUE__STATE: - getState().clear(); - getState().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.VALUE__STATE: - getState().clear(); - return; - } - super.eUnset(featureID); + public EList getStatesView() { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); } /** @@ -151,12 +54,12 @@ public void eUnset(int featureID) { * @generated */ @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.VALUE__STATE: - return state != null && !state.isEmpty(); + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case TracePackage.VALUE___GET_STATES_VIEW: + return getStatesView(); } - return super.eIsSet(featureID); + return super.eInvoke(operationID, arguments); } } //ValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java index 687f1a151..c9ed7a2f9 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java @@ -138,7 +138,7 @@ public Adapter caseState(State object) { return createStateAdapter(); } @Override - public Adapter caseGenericReferenceValue(GenericReferenceValue object) { + public Adapter caseGenericReferenceValue(GenericReferenceValue object) { return createGenericReferenceValueAdapter(); } @Override @@ -154,7 +154,7 @@ public Adapter caseGenericState(GenericState object) { return createGenericStateAdapter(); } @Override - public Adapter caseGenericTrace(GenericTrace object) { + public Adapter caseGenericTrace(GenericTrace object) { return createGenericTraceAdapter(); } @Override @@ -214,6 +214,14 @@ public Adapter caseInitializationMethodParameter(InitializationMethodParameter o return createInitializationMethodParameterAdapter(); } @Override + public Adapter caseGenericStep(GenericStep object) { + return createGenericStepAdapter(); + } + @Override + public Adapter caseGenericValue(GenericValue object) { + return createGenericValueAdapter(); + } + @Override public Adapter caseEModelElement(EModelElement object) { return createEModelElementAdapter(); } @@ -745,6 +753,34 @@ public Adapter createInitializationMethodParameterAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep Generic Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.GenericStep + * @generated + */ + public Adapter createGenericStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue Generic Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.GenericValue + * @generated + */ + public Adapter createGenericValueAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement EModel Element}'. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java index 68503c11f..6e8740dc0 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java @@ -137,6 +137,7 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { GenericSequentialStep genericSequentialStep = (GenericSequentialStep)theEObject; T1 result = caseGenericSequentialStep(genericSequentialStep); if (result == null) result = caseSequentialStep(genericSequentialStep); + if (result == null) result = caseGenericStep(genericSequentialStep); if (result == null) result = caseBigStep(genericSequentialStep); if (result == null) result = caseStep(genericSequentialStep); if (result == null) result = defaultCase(theEObject); @@ -146,6 +147,7 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { GenericParallelStep genericParallelStep = (GenericParallelStep)theEObject; T1 result = caseGenericParallelStep(genericParallelStep); if (result == null) result = caseParallelStep(genericParallelStep); + if (result == null) result = caseGenericStep(genericParallelStep); if (result == null) result = caseBigStep(genericParallelStep); if (result == null) result = caseStep(genericParallelStep); if (result == null) result = defaultCase(theEObject); @@ -155,6 +157,7 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { GenericSmallStep genericSmallStep = (GenericSmallStep)theEObject; T1 result = caseGenericSmallStep(genericSmallStep); if (result == null) result = caseSmallStep(genericSmallStep); + if (result == null) result = caseGenericStep(genericSmallStep); if (result == null) result = caseStep(genericSmallStep); if (result == null) result = defaultCase(theEObject); return result; @@ -190,8 +193,9 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { return result; } case TracePackage.GENERIC_REFERENCE_VALUE: { - GenericReferenceValue genericReferenceValue = (GenericReferenceValue)theEObject; + GenericReferenceValue genericReferenceValue = (GenericReferenceValue)theEObject; T1 result = caseGenericReferenceValue(genericReferenceValue); + if (result == null) result = caseGenericValue(genericReferenceValue); if (result == null) result = caseValue(genericReferenceValue); if (result == null) result = defaultCase(theEObject); return result; @@ -227,6 +231,7 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { case TracePackage.GENERIC_ATTRIBUTE_VALUE: { GenericAttributeValue genericAttributeValue = (GenericAttributeValue)theEObject; T1 result = caseGenericAttributeValue(genericAttributeValue); + if (result == null) result = caseGenericValue(genericAttributeValue); if (result == null) result = caseValue(genericAttributeValue); if (result == null) result = defaultCase(theEObject); return result; @@ -235,6 +240,7 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { BooleanAttributeValue booleanAttributeValue = (BooleanAttributeValue)theEObject; T1 result = caseBooleanAttributeValue(booleanAttributeValue); if (result == null) result = caseGenericAttributeValue(booleanAttributeValue); + if (result == null) result = caseGenericValue(booleanAttributeValue); if (result == null) result = caseValue(booleanAttributeValue); if (result == null) result = defaultCase(theEObject); return result; @@ -243,6 +249,7 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { IntegerAttributevalue integerAttributevalue = (IntegerAttributevalue)theEObject; T1 result = caseIntegerAttributevalue(integerAttributevalue); if (result == null) result = caseGenericAttributeValue(integerAttributevalue); + if (result == null) result = caseGenericValue(integerAttributevalue); if (result == null) result = caseValue(integerAttributevalue); if (result == null) result = defaultCase(theEObject); return result; @@ -251,6 +258,7 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { StringAttributeValue stringAttributeValue = (StringAttributeValue)theEObject; T1 result = caseStringAttributeValue(stringAttributeValue); if (result == null) result = caseGenericAttributeValue(stringAttributeValue); + if (result == null) result = caseGenericValue(stringAttributeValue); if (result == null) result = caseValue(stringAttributeValue); if (result == null) result = defaultCase(theEObject); return result; @@ -323,6 +331,20 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { if (result == null) result = defaultCase(theEObject); return result; } + case TracePackage.GENERIC_STEP: { + GenericStep genericStep = (GenericStep)theEObject; + T1 result = caseGenericStep(genericStep); + if (result == null) result = caseStep(genericStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.GENERIC_VALUE: { + GenericValue genericValue = (GenericValue)theEObject; + T1 result = caseGenericValue(genericValue); + if (result == null) result = caseValue(genericValue); + if (result == null) result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } @@ -593,7 +615,7 @@ public T1 caseState(State object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseGenericReferenceValue(GenericReferenceValue object) { + public T1 caseGenericReferenceValue(GenericReferenceValue object) { return null; } @@ -653,7 +675,7 @@ public T1 caseGenericState(GenericState object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseGenericTrace(GenericTrace object) { + public T1 caseGenericTrace(GenericTrace object) { return null; } @@ -867,6 +889,36 @@ public T1 caseInitializationMethodParameter(InitializationMethodParameter object return null; } + /** + * Returns the result of interpreting the object as an instance of 'Generic Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseGenericStep(GenericStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseGenericValue(GenericValue object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'EModel Element'. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java index 87e3e6646..0de917e44 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java @@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EObject; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; public interface ITraceExplorer extends ITraceViewNotifier, ITraceListener { @@ -37,6 +38,8 @@ public interface ITraceExplorer extends ITraceViewNotifier, ITraceListener { * @return The index of the current state in the trace */ int getCurrentStateIndex(); + + State getCurrentState(); /** * If o is a state, updates the explorer so that o becomes the current state. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java index c5c265ca5..73efdf888 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java @@ -10,14 +10,13 @@ *******************************************************************************/ package fr.inria.diverse.trace.gemoc.api; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; import org.eclipse.emf.ecore.EObject; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Value; public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { @@ -78,45 +77,30 @@ public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { * @return The number of states in the trace */ int getStatesTraceLength(); - + /** - * Creates and returns a generic wrapper of the specific state located at the provided index. * @param stateIndex The index of the state in the trace - * @return A generic wrapper of the state - */ - StateWrapper getStateWrapper(int stateIndex); - - /** - * Creates and returns a generic wrapper of the provided specific state. - * @param state The state to create a wrapper for - * @return A generic wrapper of the state + * @return The state */ - StateWrapper getStateWrapper(EObject state); + State getState(int stateIndex); /** - * Returns a list of generic wrappers of the specific states located between - * the start and the end index, both included. - * @param start The index of the first desired state - * @param end The index of the last desired state - * @return A list of generic wrapper of the states + * @param state The state + * @return The index of the state in the trace */ - List getStateWrappers(int start, int end); + int getStateIndex(State state); /** - * Creates and returns a generic wrapper of the provided specific step. - * @param step The step to create a wrapper for - * @return A generic wrapper of the step + * @param value the value + * @return The index of the first state in which the value is present */ - StepWrapper getStepWrapper(Step step); - + int getValueFirstStateIndex(Value value); + /** - * Returns a list of generic wrappers of the specific steps located between - * the start and the end index, both included. - * @param start The index of the first state - * @param end The index of the last state - * @return A list of generic wrapper of the steps + * @param value the value + * @return The index of the last state in which the value is present */ - List getStepWrappers(int start, int end); + int getValueLastStateIndex(Value value); /** * Returns a description of the value located on the provided value trace index and at the provided state index. @@ -139,92 +123,5 @@ public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { */ int getValuesTraceLength(int traceIndex); - /** - * Creates and returns a generic wrapper of the provided specific value. - * @param traceIndex The index of the value trace - * @param stateIndex The index of the state - * @return A generic wrapper of the value - */ - ValueWrapper getValueWrapper(int traceIndex, int stateIndex); - - /** - * Returns a list of generic wrappers of the specific values of the value trace - * located at the provided index, between the start and the end - * index, both included. - * @param valueTraceIndex The index of the value trace - * @param start The index of the first desired state - * @param end The index of the last desired state - * @return A list of generic wrappers of the values - */ - List getValueWrappers(int valueTraceIndex, int start, int end); - - /** - * Updates the state of the extractor. - * To be called when the trace has changed. - */ -// void update(); - - class ValueWrapper { - - public EObject value; - public int firstStateIndex; - public int traceIndex; - public int lastStateIndex; - - public ValueWrapper() { - value = null; - firstStateIndex = -1; - lastStateIndex = -1; - traceIndex = -1; - } - - public ValueWrapper(EObject value, int firstStateIndex, int lastStateIndex, int traceIndex) { - this.value = value; - this.firstStateIndex = firstStateIndex; - this.lastStateIndex = lastStateIndex; - this.traceIndex = traceIndex; - } - } - - class StateWrapper { - public EObject state; - public int stateIndex; - public boolean breakable; - public String description; - - public StateWrapper() { - state = null; - stateIndex = -1; - breakable = false; - description = ""; - } - - public StateWrapper(EObject value, int stateIndex, boolean breakable) { - this.state = value; - this.stateIndex = stateIndex; - this.breakable = breakable; - this.description = ""; - } - - public StateWrapper(EObject value, int stateIndex, boolean breakable, String description) { - this.state = value; - this.stateIndex = stateIndex; - this.breakable = breakable; - this.description = description; - } - } - - class StepWrapper { - public Step step = null; - public int startingIndex = -1; - public int endingIndex = -1; - public List subSteps = new ArrayList<>(); - - public StepWrapper(Step value, int startingIndex, int endingIndex, List subSteps) { - this.step = value; - this.startingIndex = startingIndex; - this.endingIndex = endingIndex; - this.subSteps.addAll(subSteps); - } - } + int } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java index dae6f2067..ba0003525 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java @@ -12,17 +12,20 @@ import java.util.List; -import org.eclipse.emf.ecore.EObject; +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Value; public interface ITraceListener { - void statesAdded(List states); + void statesAdded(List states); - void stepsStarted(List steps); + void stepsStarted(List steps); - void stepsEnded(List steps); + void stepsEnded(List steps); - void valuesAdded(List values); + void valuesAdded(List values); - void dimensionsAdded(List> dimensions); + void dimensionsAdded(List> dimensions); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index c05c5ace9..3537cd8ee 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -9,6 +9,9 @@ import org.eclipse.emf.ecore.resource.Resource; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; +import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.Step; @@ -18,7 +21,7 @@ public class GenericTraceConstructor implements ITraceConstructor { - private Trace> traceRoot; + private Trace, GenericState> traceRoot; private Resource traceResource; private final Deque context = new LinkedList(); @@ -54,11 +57,11 @@ public void endStep(Step step) { public EObject initTrace(LaunchConfiguration launchConfiguration) { // Create root - traceRoot = TraceFactory.eINSTANCE.createTrace(); + traceRoot = TraceFactory.eINSTANCE.createGenericTrace(); traceRoot.setLaunchconfiguration(launchConfiguration); // Create root sequential step - SequentialStep rootStep = TraceFactory.eINSTANCE.createSequentialStep(); + GenericSequentialStep rootStep = TraceFactory.eINSTANCE.createGenericSequentialStep(); traceRoot.setRootStep(rootStep); // Put in the resource diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java index ccb30978a..77f545a95 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java @@ -6,6 +6,8 @@ import org.eclipse.emf.ecore.resource.Resource; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; @@ -43,8 +45,8 @@ public boolean isAddonForTrace(EObject traceRoot) { public ITraceExplorer constructTraceExplorer(Resource traceResource) { GenericTraceExplorer explorer = new GenericTraceExplorer(); EObject root = traceResource.getContents().get(0); - if (root instanceof Trace) { - explorer.loadTrace((Trace>)root); + if (root instanceof Trace) { + explorer.loadTrace((Trace, GenericTracedObject, GenericState>)root); return explorer; } return null; @@ -61,8 +63,8 @@ public ITraceExplorer constructTraceExplorer(Resource modelResource, public ITraceExtractor constructTraceExtractor(Resource traceResource) { GenericTraceExtractor extractor = new GenericTraceExtractor(); EObject root = traceResource.getContents().get(0); - if (root instanceof Trace) { - extractor.loadTrace((Trace>)root); + if (root instanceof Trace) { + extractor.loadTrace((Trace, GenericTracedObject, GenericState>)root); return extractor; } return null; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java index 1a0982134..63010d6e6 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java @@ -11,6 +11,8 @@ import org.eclipse.emf.ecore.EObject; +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; @@ -19,7 +21,7 @@ public class GenericTraceExplorer implements ITraceExplorer { - private Trace> traceRoot; + private Trace, GenericTracedObject, GenericState> traceRoot; final private List callStack = new ArrayList<>(); @@ -211,7 +213,7 @@ private void jumpBeforeStep(Step step) { updateCallStack(step); } - public void loadTrace(Trace> root) { + public void loadTrace(Trace, GenericTracedObject, GenericState> root) { traceRoot = root; } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index c09eccc2a..26d2eba84 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -11,16 +11,21 @@ import org.eclipse.emf.ecore.EObject; +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; public class GenericTraceExtractor implements ITraceExtractor { - private Trace> traceRoot; + private Trace, GenericTracedObject, GenericState> traceRoot; private Map> listeners = new HashMap<>(); @Override @@ -98,7 +103,7 @@ public LaunchConfiguration getLaunchConfiguration() { return traceRoot.getLaunchconfiguration(); } - public void loadTrace(Trace> root) { + public void loadTrace(Trace, GenericTracedObject, GenericState> root) { traceRoot = root; } @@ -127,17 +132,17 @@ public StateWrapper getStateWrapper(EObject state) { } @Override - public void statesAdded(List states) { + public void statesAdded(List states) { // TODO Auto-generated method stub } @Override - public void valuesAdded(List values) { + public void valuesAdded(List values) { // TODO Auto-generated method stub } @Override - public void dimensionsAdded(List> dimensions) { + public void dimensionsAdded(List> dimensions) { // TODO Auto-generated method stub } @@ -168,13 +173,13 @@ public void removeListener(ITraceViewListener listener) { } @Override - public void stepsStarted(List steps) { + public void stepsStarted(List steps) { // TODO Auto-generated method stub } @Override - public void stepsEnded(List steps) { + public void stepsEnded(List steps) { // TODO Auto-generated method stub } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird index 24657b714..3f4c000c1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird @@ -16,16 +16,6 @@ - - - - bold - - - - - - @@ -86,7 +76,7 @@ - + @@ -104,11 +94,15 @@ + + + + - + @@ -117,7 +111,7 @@ - + @@ -169,7 +163,7 @@ - + @@ -177,7 +171,7 @@ - + @@ -279,20 +273,43 @@ - + + + + + - + + + + + + + + + + + + + + + + + + + + @@ -311,33 +328,33 @@ - + - + - + - + - + - + - + - + @@ -463,7 +480,7 @@ - + @@ -471,36 +488,20 @@ - + - + - + - - + + - - - - - - - - - - - - - - - - @@ -514,7 +515,7 @@ - + @@ -530,40 +531,40 @@ - + - + - + - + - + - - - + + + - - + + - - + + - - - - - + + + + + @@ -625,7 +626,7 @@ - + @@ -638,6 +639,14 @@ + + + + + + + + @@ -712,6 +721,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -995,7 +1007,8 @@ - + + routingStyle italic @@ -1004,7 +1017,7 @@ - + @@ -1018,13 +1031,29 @@ + + + + + + + + - + + + + + + + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -1033,6 +1062,22 @@ + + + + + + + + + + + + + + + + @@ -1050,18 +1095,7 @@ - - - - - - - - - - - - + @@ -1119,14 +1153,15 @@ - - - - - + + + + + + labelSize - + labelSize diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore index fe9dc8f81..11215e34e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore @@ -30,6 +30,7 @@ + - - - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java index cecfb315e..521134a5a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java @@ -2,39 +2,16 @@ */ package base.States; -import org.eclipse.emf.common.util.EList; - /** * * A representation of the model object 'Specific Attribute Value'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link base.States.SpecificAttributeValue#getStatesNoOpposite States No Opposite}
    • - *
* * @see base.States.StatesPackage#getSpecificAttributeValue() * @model interface="true" abstract="true" * @generated */ public interface SpecificAttributeValue extends SpecificValue { - /** - * Returns the value of the 'States No Opposite' reference list. - * The list contents are of type {@link base.States.SpecificState}. - * - *

- * If the meaning of the 'States No Opposite' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'States No Opposite' reference list. - * @see base.States.StatesPackage#getSpecificAttributeValue_StatesNoOpposite() - * @model required="true" transient="true" changeable="false" volatile="true" derived="true" - * @generated - */ - EList getStatesNoOpposite(); } // SpecificAttributeValue diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java index f1a3504d3..41c2d4d51 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java @@ -2,39 +2,16 @@ */ package base.States; -import org.eclipse.emf.common.util.EList; - /** * * A representation of the model object 'Specific Reference Value'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link base.States.SpecificReferenceValue#getStatesNoOpposite States No Opposite}
    • - *
* * @see base.States.StatesPackage#getSpecificReferenceValue() * @model interface="true" abstract="true" * @generated */ public interface SpecificReferenceValue extends SpecificValue { - /** - * Returns the value of the 'States No Opposite' reference list. - * The list contents are of type {@link base.States.SpecificState}. - * - *

- * If the meaning of the 'States No Opposite' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'States No Opposite' reference list. - * @see base.States.StatesPackage#getSpecificReferenceValue_StatesNoOpposite() - * @model required="true" transient="true" changeable="false" volatile="true" derived="true" - * @generated - */ - EList getStatesNoOpposite(); } // SpecificReferenceValue diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java index dccd3ee86..790172567 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java @@ -6,6 +6,7 @@ import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Value; import org.eclipse.emf.common.util.EList; /** @@ -62,4 +63,12 @@ public interface SpecificState extends State { */ EList getEndedSteps(); + /** + * + * + * @model kind="operation" + * @generated + */ + EList getValuesView(); + } // SpecificState diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java index a4414f026..ea1c52fd3 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java @@ -5,6 +5,7 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; @@ -68,40 +69,40 @@ public interface StatesPackage extends EPackage { int SPECIFIC_STATE = 0; /** - * The feature id for the 'Value' reference list. + * The feature id for the 'Started Steps' reference list. * * * @generated * @ordered */ - int SPECIFIC_STATE__VALUE = TracePackage.STATE__VALUE; + int SPECIFIC_STATE__STARTED_STEPS = TracePackage.STATE_FEATURE_COUNT + 0; /** - * The feature id for the 'Started Steps' reference list. + * The feature id for the 'Ended Steps' reference list. * * * @generated * @ordered */ - int SPECIFIC_STATE__STARTED_STEPS = TracePackage.STATE_FEATURE_COUNT + 0; + int SPECIFIC_STATE__ENDED_STEPS = TracePackage.STATE_FEATURE_COUNT + 1; /** - * The feature id for the 'Ended Steps' reference list. + * The number of structural features of the 'Specific State' class. * * * @generated * @ordered */ - int SPECIFIC_STATE__ENDED_STEPS = TracePackage.STATE_FEATURE_COUNT + 1; + int SPECIFIC_STATE_FEATURE_COUNT = TracePackage.STATE_FEATURE_COUNT + 2; /** - * The number of structural features of the 'Specific State' class. + * The operation id for the 'Get Values View' operation. * * * @generated * @ordered */ - int SPECIFIC_STATE_FEATURE_COUNT = TracePackage.STATE_FEATURE_COUNT + 2; + int SPECIFIC_STATE___GET_VALUES_VIEW = TracePackage.STATE_OPERATION_COUNT + 0; /** * The number of operations of the 'Specific State' class. @@ -110,7 +111,7 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 0; + int SPECIFIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 1; /** * The meta object id for the '{@link base.States.impl.SpecificValueImpl Specific Value}' class. @@ -123,22 +124,22 @@ public interface StatesPackage extends EPackage { int SPECIFIC_VALUE = 5; /** - * The feature id for the 'State' reference list. + * The number of structural features of the 'Specific Value' class. * * * @generated * @ordered */ - int SPECIFIC_VALUE__STATE = TracePackage.VALUE__STATE; + int SPECIFIC_VALUE_FEATURE_COUNT = TracePackage.VALUE_FEATURE_COUNT + 0; /** - * The number of structural features of the 'Specific Value' class. + * The operation id for the 'Get States View' operation. * * * @generated * @ordered */ - int SPECIFIC_VALUE_FEATURE_COUNT = TracePackage.VALUE_FEATURE_COUNT + 0; + int SPECIFIC_VALUE___GET_STATES_VIEW = TracePackage.VALUE___GET_STATES_VIEW; /** * The number of operations of the 'Specific Value' class. @@ -160,31 +161,22 @@ public interface StatesPackage extends EPackage { int SPECIFIC_ATTRIBUTE_VALUE = 1; /** - * The feature id for the 'State' reference list. + * The number of structural features of the 'Specific Attribute Value' class. * * * @generated * @ordered */ - int SPECIFIC_ATTRIBUTE_VALUE__STATE = SPECIFIC_VALUE__STATE; + int SPECIFIC_ATTRIBUTE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 0; /** - * The feature id for the 'States No Opposite' reference list. + * The operation id for the 'Get States View' operation. * * * @generated * @ordered */ - int SPECIFIC_ATTRIBUTE_VALUE__STATES_NO_OPPOSITE = SPECIFIC_VALUE_FEATURE_COUNT + 0; - - /** - * The number of structural features of the 'Specific Attribute Value' class. - * - * - * @generated - * @ordered - */ - int SPECIFIC_ATTRIBUTE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 1; + int SPECIFIC_ATTRIBUTE_VALUE___GET_STATES_VIEW = SPECIFIC_VALUE___GET_STATES_VIEW; /** * The number of operations of the 'Specific Attribute Value' class. @@ -281,31 +273,22 @@ public interface StatesPackage extends EPackage { int SPECIFIC_REFERENCE_VALUE = 4; /** - * The feature id for the 'State' reference list. - * - * - * @generated - * @ordered - */ - int SPECIFIC_REFERENCE_VALUE__STATE = SPECIFIC_VALUE__STATE; - - /** - * The feature id for the 'States No Opposite' reference list. + * The number of structural features of the 'Specific Reference Value' class. * * * @generated * @ordered */ - int SPECIFIC_REFERENCE_VALUE__STATES_NO_OPPOSITE = SPECIFIC_VALUE_FEATURE_COUNT + 0; + int SPECIFIC_REFERENCE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 0; /** - * The number of structural features of the 'Specific Reference Value' class. + * The operation id for the 'Get States View' operation. * * * @generated * @ordered */ - int SPECIFIC_REFERENCE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 1; + int SPECIFIC_REFERENCE_VALUE___GET_STATES_VIEW = SPECIFIC_VALUE___GET_STATES_VIEW; /** * The number of operations of the 'Specific Reference Value' class. @@ -350,25 +333,24 @@ public interface StatesPackage extends EPackage { EReference getSpecificState_EndedSteps(); /** - * Returns the meta object for class '{@link base.States.SpecificAttributeValue Specific Attribute Value}'. + * Returns the meta object for the '{@link base.States.SpecificState#getValuesView() Get Values View}' operation. * * - * @return the meta object for class 'Specific Attribute Value'. - * @see base.States.SpecificAttributeValue + * @return the meta object for the 'Get Values View' operation. + * @see base.States.SpecificState#getValuesView() * @generated */ - EClass getSpecificAttributeValue(); + EOperation getSpecificState__GetValuesView(); /** - * Returns the meta object for the reference list '{@link base.States.SpecificAttributeValue#getStatesNoOpposite States No Opposite}'. + * Returns the meta object for class '{@link base.States.SpecificAttributeValue Specific Attribute Value}'. * * - * @return the meta object for the reference list 'States No Opposite'. - * @see base.States.SpecificAttributeValue#getStatesNoOpposite() - * @see #getSpecificAttributeValue() + * @return the meta object for class 'Specific Attribute Value'. + * @see base.States.SpecificAttributeValue * @generated */ - EReference getSpecificAttributeValue_StatesNoOpposite(); + EClass getSpecificAttributeValue(); /** * Returns the meta object for class '{@link base.States.SpecificDimension Specific Dimension}'. @@ -400,17 +382,6 @@ public interface StatesPackage extends EPackage { */ EClass getSpecificReferenceValue(); - /** - * Returns the meta object for the reference list '{@link base.States.SpecificReferenceValue#getStatesNoOpposite States No Opposite}'. - * - * - * @return the meta object for the reference list 'States No Opposite'. - * @see base.States.SpecificReferenceValue#getStatesNoOpposite() - * @see #getSpecificReferenceValue() - * @generated - */ - EReference getSpecificReferenceValue_StatesNoOpposite(); - /** * Returns the meta object for class '{@link base.States.SpecificValue Specific Value}'. * @@ -471,22 +442,22 @@ interface Literals { EReference SPECIFIC_STATE__ENDED_STEPS = eINSTANCE.getSpecificState_EndedSteps(); /** - * The meta object literal for the '{@link base.States.SpecificAttributeValue Specific Attribute Value}' class. + * The meta object literal for the 'Get Values View' operation. * * - * @see base.States.SpecificAttributeValue - * @see base.States.impl.StatesPackageImpl#getSpecificAttributeValue() * @generated */ - EClass SPECIFIC_ATTRIBUTE_VALUE = eINSTANCE.getSpecificAttributeValue(); + EOperation SPECIFIC_STATE___GET_VALUES_VIEW = eINSTANCE.getSpecificState__GetValuesView(); /** - * The meta object literal for the 'States No Opposite' reference list feature. + * The meta object literal for the '{@link base.States.SpecificAttributeValue Specific Attribute Value}' class. * * + * @see base.States.SpecificAttributeValue + * @see base.States.impl.StatesPackageImpl#getSpecificAttributeValue() * @generated */ - EReference SPECIFIC_ATTRIBUTE_VALUE__STATES_NO_OPPOSITE = eINSTANCE.getSpecificAttributeValue_StatesNoOpposite(); + EClass SPECIFIC_ATTRIBUTE_VALUE = eINSTANCE.getSpecificAttributeValue(); /** * The meta object literal for the '{@link base.States.impl.SpecificDimensionImpl Specific Dimension}' class. @@ -518,14 +489,6 @@ interface Literals { */ EClass SPECIFIC_REFERENCE_VALUE = eINSTANCE.getSpecificReferenceValue(); - /** - * The meta object literal for the 'States No Opposite' reference list feature. - * - * - * @generated - */ - EReference SPECIFIC_REFERENCE_VALUE__STATES_NO_OPPOSITE = eINSTANCE.getSpecificReferenceValue_StatesNoOpposite(); - /** * The meta object literal for the '{@link base.States.impl.SpecificValueImpl Specific Value}' class. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java index 6b8372696..be62bd00e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java @@ -6,7 +6,6 @@ import base.States.StatesPackage; import fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl; - import org.eclipse.emf.ecore.EClass; /** diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java index 7c803b67f..3aee2dd05 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java @@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; @@ -182,8 +183,8 @@ public EReference getSpecificState_EndedSteps() { * * @generated */ - public EClass getSpecificAttributeValue() { - return specificAttributeValueEClass; + public EOperation getSpecificState__GetValuesView() { + return specificStateEClass.getEOperations().get(0); } /** @@ -191,8 +192,8 @@ public EClass getSpecificAttributeValue() { * * @generated */ - public EReference getSpecificAttributeValue_StatesNoOpposite() { - return (EReference)specificAttributeValueEClass.getEStructuralFeatures().get(0); + public EClass getSpecificAttributeValue() { + return specificAttributeValueEClass; } /** @@ -222,15 +223,6 @@ public EClass getSpecificReferenceValue() { return specificReferenceValueEClass; } - /** - * - * - * @generated - */ - public EReference getSpecificReferenceValue_StatesNoOpposite() { - return (EReference)specificReferenceValueEClass.getEStructuralFeatures().get(0); - } - /** * * @@ -271,16 +263,15 @@ public void createPackageContents() { specificStateEClass = createEClass(SPECIFIC_STATE); createEReference(specificStateEClass, SPECIFIC_STATE__STARTED_STEPS); createEReference(specificStateEClass, SPECIFIC_STATE__ENDED_STEPS); + createEOperation(specificStateEClass, SPECIFIC_STATE___GET_VALUES_VIEW); specificAttributeValueEClass = createEClass(SPECIFIC_ATTRIBUTE_VALUE); - createEReference(specificAttributeValueEClass, SPECIFIC_ATTRIBUTE_VALUE__STATES_NO_OPPOSITE); specificDimensionEClass = createEClass(SPECIFIC_DIMENSION); specificTracedObjectEClass = createEClass(SPECIFIC_TRACED_OBJECT); specificReferenceValueEClass = createEClass(SPECIFIC_REFERENCE_VALUE); - createEReference(specificReferenceValueEClass, SPECIFIC_REFERENCE_VALUE__STATES_NO_OPPOSITE); specificValueEClass = createEClass(SPECIFIC_VALUE); } @@ -342,15 +333,15 @@ public void initializePackageContents() { initEReference(getSpecificState_StartedSteps(), theStepsPackage.getSpecificStep(), theStepsPackage.getSpecificStep_StartingState(), "startedSteps", null, 0, -1, SpecificState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getSpecificState_EndedSteps(), theStepsPackage.getSpecificStep(), theStepsPackage.getSpecificStep_EndingState(), "endedSteps", null, 0, -1, SpecificState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEOperation(getSpecificState__GetValuesView(), theTracePackage.getValue(), "getValuesView", 0, -1, IS_UNIQUE, IS_ORDERED); + initEClass(specificAttributeValueEClass, SpecificAttributeValue.class, "SpecificAttributeValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSpecificAttributeValue_StatesNoOpposite(), this.getSpecificState(), null, "statesNoOpposite", null, 1, -1, SpecificAttributeValue.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(specificDimensionEClass, SpecificDimension.class, "SpecificDimension", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(specificTracedObjectEClass, SpecificTracedObject.class, "SpecificTracedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(specificReferenceValueEClass, SpecificReferenceValue.class, "SpecificReferenceValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSpecificReferenceValue_StatesNoOpposite(), this.getSpecificState(), null, "statesNoOpposite", null, 1, -1, SpecificReferenceValue.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(specificValueEClass, SpecificValue.class, "SpecificValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend index 08b4e4af0..cf47234a5 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend @@ -17,6 +17,7 @@ class TraceMMExplorer { // Base classes @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass stateClass + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificStateClass @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificTraceClass @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificTracedObjectClass @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificDimensionClass @@ -46,8 +47,13 @@ class TraceMMExplorer { c.name.equals(TraceMMStrings.class_Trace) ] as EClass + // Find the SpecificState class + specificStateClass = tracemm.eAllContents.filter(EClass).findFirst [ c | + c.name.equals(TraceMMStrings.class_SpecificState) + ] as EClass + // Find the State class - stateClass = tracemm.eAllContents.filter(EClass).findFirst [ c | + stateClass = specificStateClass.EAllSuperTypes.filter(EClass).findFirst [ c | c.name.equals(TraceMMStrings.class_State) ] as EClass @@ -65,7 +71,7 @@ class TraceMMExplorer { c.name.equals(TraceMMStrings.class_Dimension) ] as EClass - // Find the Value class + // Find the SpecificValue class specificValueClass = tracemm.eAllContents.filter(EClass).findFirst [ c | c.name.equals(TraceMMStrings.class_Value) ] as EClass @@ -80,7 +86,7 @@ class TraceMMExplorer { c.name.equals(TraceMMStrings.class_ReferenceValue) ] as EClass - // Find the Step class + // Find the SpecificStep class specificStepClass = tracemm.eAllContents.filter(EClass).findFirst [ c | c.name.equals(TraceMMStrings.class_Step) ] as EClass @@ -106,7 +112,7 @@ class TraceMMExplorer { c != specificStepClass ].toSet) - refs_valueRefsFromStateClassCache = stateClass.getEAllReferences.filter [ r | + refs_valueRefsFromStateClassCache = specificStateClass.getEAllReferences.filter [ r | !r.name.equals(TraceMMStrings.ref_ValueToStates) ].toSet diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend index b2295ff0b..76ab8301c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend @@ -75,6 +75,26 @@ class TraceMMGenerationTraceability { return result } + val dimensionClasses = new HashMap + + public def putDimensionClass(EStructuralFeature property, EClass dimension) { + dimensionClasses.put(property, dimension) + } + + public def EClass getDimensionClass(EStructuralFeature property) { + return dimensionClasses.get(property) + } + + val dimensionRefs = new HashMap + + public def putDimensionRef(EStructuralFeature property, EReference dimensionRef) { + dimensionRefs.put(property, dimensionRef) + } + + public def EReference getDimensionRef(EStructuralFeature property) { + return dimensionRefs.get(property) + } + public def Set getNewClasses() { val Set newClasses = new HashSet for (p : mmext.newPackages) { @@ -119,14 +139,24 @@ class TraceMMGenerationTraceability { return res } - private Map traceOf = new HashMap +// private Map traceOf = new HashMap +// +// package def void putTraceOf(EStructuralFeature r1, EReference r2) { +// traceOf.put(r1, r2) +// } +// +// public def EReference getTraceOf(EStructuralFeature s) { +// return traceOf.get(s) +// } + + private Map valueClass = new HashMap - package def void putTraceOf(EStructuralFeature r1, EReference r2) { - traceOf.put(r1, r2) + package def void putValueClass(EStructuralFeature r, EClass c) { + valueClass.put(r, c) } - public def EReference getTraceOf(EStructuralFeature s) { - return traceOf.get(s) + public def EClass getValueClass(EStructuralFeature s) { + return valueClass.get(s) } private Map stateClassToValueClass = new HashMap diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index 59d7b1b59..a668ba465 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -2,9 +2,12 @@ package fr.inria.diverse.trace.metamodel.generator import ecorext.ClassExtension import ecorext.Ecorext +import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.commons.ExecutionMetamodelTraceability +import java.util.ArrayList import java.util.HashMap import java.util.HashSet +import java.util.List import java.util.Map import java.util.Set import org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage @@ -38,6 +41,7 @@ class TraceMMGeneratorStates { private val Set allNewEClasses private val Map runtimeClass2ClassExtension = new HashMap private val Set multipleOrig = new HashSet + private val List valuesGetters = new ArrayList new(Ecorext mmext, EPackage mm, TraceMMGenerationTraceability traceability, TraceMMExplorer traceMMExplorer, String languageName, EPackage tracemmresult, boolean gemoc) { @@ -187,6 +191,19 @@ class TraceMMGeneratorStates { handleTraceClass(runtimeClass) } + if (!valuesGetters.empty) { + val getValuesViewEOperation = traceMMExplorer.specificStateClass.EOperations.findFirst[name == "getValuesView"] + val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation + getValuesViewEOperation.EAnnotations.add(bodyAnnotation) + bodyAnnotation.source = GenModelPackage.eNS_URI + bodyAnnotation.details.put("body", ''' + final EList result = new org.eclipse.emf.common.util.BasicEList(); + «FOR getter : valuesGetters» + result.addAll(«getter»); + «ENDFOR» + return result; + ''') + } } private def EClass handleTraceClass(EClass runtimeClass) { @@ -328,17 +345,33 @@ class TraceMMGeneratorStates { ExecutionMetamodelTraceability.createTraceabilityAnnotation(valueClass, ExecutionMetamodelTraceability.getTraceabilityAnnotationValue(runtimeProperty)); - // And must hence implement the derived getStepsNoOpposite - val EOperation getStatesNoOppositeEOperation = EcoreFactory.eINSTANCE.createEOperation - getStatesNoOppositeEOperation.EType = traceMMExplorer.stateClass - getStatesNoOppositeEOperation.lowerBound = 1 - getStatesNoOppositeEOperation.upperBound = -1 - getStatesNoOppositeEOperation.name = "getStatesNoOpposite" + // Adding the getStatesView operation + val EOperation getStatesViewEOperation = EcoreFactory.eINSTANCE.createEOperation + getStatesViewEOperation.EType = traceMMExplorer.stateClass + getStatesViewEOperation.lowerBound = 1 + getStatesViewEOperation.upperBound = -1 + getStatesViewEOperation.name = "getStatesView" val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation - getStatesNoOppositeEOperation.EAnnotations.add(bodyAnnotation) + getStatesViewEOperation.EAnnotations.add(bodyAnnotation) bodyAnnotation.source = GenModelPackage.eNS_URI - bodyAnnotation.details.put("body", "return this.getStates();") - valueClass.EOperations.add(getStatesNoOppositeEOperation) + bodyAnnotation.details.put("body", ''' + final EList result = new org.eclipse.emf.common.util.BasicEList(); + result.addAll(getStates()); + return result; + ''') + valueClass.EOperations.add(getStatesViewEOperation) + +// // And must hence implement the derived getStepsNoOpposite +// val EOperation getStatesNoOppositeEOperation = EcoreFactory.eINSTANCE.createEOperation +// getStatesNoOppositeEOperation.EType = traceMMExplorer.stateClass +// getStatesNoOppositeEOperation.lowerBound = 1 +// getStatesNoOppositeEOperation.upperBound = -1 +// getStatesNoOppositeEOperation.name = "getStatesNoOpposite" +// val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation +// getStatesNoOppositeEOperation.EAnnotations.add(bodyAnnotation) +// bodyAnnotation.source = GenModelPackage.eNS_URI +// bodyAnnotation.details.put("body", "return this.getStates();") +// valueClass.EOperations.add(getStatesNoOppositeEOperation) //------------ Dimension class val dimensionClass = EcoreFactory.eINSTANCE.createEClass @@ -359,37 +392,42 @@ class TraceMMGeneratorStates { dimensionRef.lowerBound = 0 dimensionRef.upperBound = 1 - // Link Traced class -> Value class - val refTrace2State = addReferenceToClass(tracedClass, - TraceMMStrings.ref_createTraceClassToValueClass(runtimeProperty), valueClass); - refTrace2State.containment = true - refTrace2State.ordered = true - refTrace2State.unique = true - refTrace2State.lowerBound = 0 - refTrace2State.upperBound = -1 - - traceability.putTraceOf(runtimeProperty, refTrace2State) - - // Link Value class -> Traced class (bidirectional) - val refValue2Traced = addReferenceToClass(valueClass, TraceMMStrings.ref_ValueToTrace, tracedClass); - refValue2Traced.upperBound = 1 - refValue2Traced.lowerBound = 1 - refValue2Traced.EOpposite = refTrace2State - refTrace2State.EOpposite = refValue2Traced + traceability.putDimensionClass(runtimeProperty, dimensionClass) + traceability.putDimensionRef(runtimeProperty, dimensionRef) + + traceability.putValueClass(runtimeProperty, valueClass) +// // Link Traced class -> Value class +// val refTrace2State = addReferenceToClass(tracedClass, +// TraceMMStrings.ref_createTraceClassToValueClass(runtimeProperty), valueClass); +// refTrace2State.containment = true +// refTrace2State.ordered = true +// refTrace2State.unique = true +// refTrace2State.lowerBound = 0 +// refTrace2State.upperBound = -1 +// +// traceability.putTraceOf(runtimeProperty, refTrace2State) +// +// // Link Value class -> Traced class (bidirectional) +// val refValue2Traced = addReferenceToClass(valueClass, TraceMMStrings.ref_ValueToTrace, tracedClass); +// refValue2Traced.upperBound = 1 +// refValue2Traced.lowerBound = 1 +// refValue2Traced.EOpposite = refTrace2State +// refTrace2State.EOpposite = refValue2Traced // Link State -> Value class - val refState2Value = addReferenceToClass(traceMMExplorer.stateClass, + val refState2Value = addReferenceToClass(traceMMExplorer.specificStateClass, TraceMMStrings.ref_createGlobalToState(valueClass), valueClass); refState2Value.ordered = false refState2Value.unique = true refState2Value.upperBound = -1 refState2Value.lowerBound = 0 + valuesGetters.add(EcoreCraftingUtil.stringGetter(refState2Value)) traceability.putStateClassToValueClass(runtimeProperty, refState2Value) // Link State class -> GlobalState (bidirectional) val refState2Global = addReferenceToClass(valueClass, TraceMMStrings.ref_ValueToStates, - traceMMExplorer.stateClass); + traceMMExplorer.specificStateClass); refState2Global.upperBound = -1 refState2Global.lowerBound = 1 refState2Global.EOpposite = refState2Value diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend index 6a9d8173d..16661f185 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend @@ -8,7 +8,9 @@ class TraceMMStrings { public static val String class_Trace = "SpecificTrace" - public static val String class_State = "SpecificState" + public static val String class_State = "State" + + public static val String class_SpecificState = "SpecificState" public static val String class_TracedObject = "SpecificTracedObject" diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 17b30d2d7..672970496 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -61,7 +61,7 @@ class TraceConstructorGeneratorJava { this.refGenPackages = refGenPackages this.gemoc = gemoc this.abstractSyntax = abstractSyntax - this.stateClass = traceability.traceMMExplorer.stateClass + this.stateClass = traceability.traceMMExplorer.getSpecificStateClass this.specificStepClass = traceability.traceMMExplorer.getSpecificStepClass this.partialTraceManagement=partialTraceManagement this.stateFQN = getJavaFQN(stateClass) @@ -387,7 +387,7 @@ class TraceConstructorGeneratorJava { «ENDFOR» } } - this.traceRoot.getStatesTrace().add(lastState); + this.traceRoot.getStates().add(lastState); }} ''' } @@ -431,7 +431,7 @@ class TraceConstructorGeneratorJava { «IF ! c.abstract» if (!added && !exeToTraced.containsKey(o_cast)) { - «getJavaFQN(traced)» tracedObject = «EcoreCraftingUtil.stringCreate(traced)»; + «getJavaFQN(traced)» tracedObject = «EcoreCraftingUtil.stringCreate(traced)»; «val Set origRefs1 = traceability.getRefs_originalObject(traced)» «FOR EReference origRef : origRefs1.sortBy[name]» tracedObject.«stringSetter(origRef, "o_cast")»; @@ -439,13 +439,16 @@ class TraceConstructorGeneratorJava { exeToTraced.put(o_cast, tracedObject); traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))».add(tracedObject); - + «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass valueClass = ptrace.getEType as EClass» + «val EClass pdimensionClass = traceability.getDimensionClass(p)» + «val EReference pdimensionRef = traceability.getDimensionRef(p)» + «val EClass valueClass = traceability.getValueClass(p)» «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» + // Creation of the dimension corresponding to the field «p.name» + tracedObject.«EcoreCraftingUtil.stringSetter(pdimensionRef, EcoreCraftingUtil.stringCreate(pdimensionClass))»; // Creation of the first value of the field «p.name» «getJavaFQN(valueClass)» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(valueClass)»; @@ -487,7 +490,7 @@ class TraceConstructorGeneratorJava { firstValue_«p.name».«stringSetter(valueProperty,"o_cast."+EcoreCraftingUtil.stringGetter(p))»; «ENDIF» ««« End IF traceability.isSomehowMutable(p.EType) } else { - firstValue_«p.name».«stringSetter(valueProperty,"null")»; + firstValue_«p.name».«stringSetter(valueProperty,"null")»; } «ELSE» ««« If attribute @@ -495,7 +498,7 @@ class TraceConstructorGeneratorJava { «ENDIF» ««« End IF EReference «ENDIF» ««« End IF p.many - tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)».add(firstValue_«p.name»); + tracedObject.«EcoreCraftingUtil.stringGetter(pdimensionRef)».getValues().add(firstValue_«p.name»); newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(firstValue_«p.name»); «ENDFOR» ««« End FOR p : getAllMutableProperties @@ -579,9 +582,9 @@ private def String generateAddStateUsingListenerMethods() { «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o_cast); ««« Loop over the fields of this class, which are all mutable «FOR p : c.EStructuralFeatures» - «val EReference ptrace = traceability.getTraceOf(p)» «val EReference pvalues = traceability.getStateClassToValueClass(p)» - newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(traced.«EcoreCraftingUtil.stringGetter(ptrace)».get(traced.«EcoreCraftingUtil.stringGetter(ptrace)».size()-1)); + «val EReference pdimension = traceability.getDimensionRef(p)» + newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); «ENDFOR» }««« end if instanceof «ENDFOR» @@ -605,15 +608,15 @@ private def String generateAddStateUsingListenerMethods() { «FOR p : nonCollectionMutableFields SEPARATOR " else "» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass valueClass = ptrace.getEType as EClass» + «val EClass valueClass = traceability.getValueClass(p)» «val EReference pvalues = traceability.getStateClassToValueClass(p)» + «val EReference pdimension = traceability.getDimensionRef(p)» if (p.getFeatureID() == «stringFeatureID(p)») { // Rollback: we remove the last value of this field from the new state «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o); - «getJavaFQN(valueClass)» lastValue = traced.«EcoreCraftingUtil.stringGetter(ptrace)».get(traced.«EcoreCraftingUtil.stringGetter(ptrace)».size()-1); + «getJavaFQN(valueClass)» lastValue = traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1); newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); // And we create a proper new value @@ -622,7 +625,7 @@ private def String generateAddStateUsingListenerMethods() { ««« «ENDIF» «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» - + «IF p instanceof EReference» «getJavaFQN(valueProperty.EType)» value = null; if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { @@ -634,7 +637,7 @@ private def String generateAddStateUsingListenerMethods() { newValue.«stringSetter(valueProperty,"value")»; - traced.«EcoreCraftingUtil.stringGetter(ptrace)».add(newValue); + traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().add(newValue); newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); } ««« end if feature id @@ -659,12 +662,12 @@ private def String generateAddStateUsingListenerMethods() { «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; «getJavaFQN(traced)» tracedObject = («getJavaFQN(traced)») exeToTraced.get(o_cast); «FOR p : collectionMutableFields SEPARATOR " else "» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass valueClass = ptrace.getEType as EClass» + «val EClass valueClass = traceability.getValueClass(p)» «val EReference pvalues = traceability.getStateClassToValueClass(p)» + «val EReference pdimension = traceability.getDimensionRef(p)» if (p.getFeatureID() == «stringFeatureID(p)») { // We compare the last collection in the value sequence, and the current one in the potentially changed object - List<«getJavaFQN(valueClass)»> valueSequence = tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)»; + List<«getJavaFQN(valueClass)»> valueSequence = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues(); «getJavaFQN(valueClass)» previousValue = null; if (!valueSequence.isEmpty()) { previousValue = valueSequence.get(valueSequence.size() - 1); @@ -710,7 +713,7 @@ private def String generateAddStateUsingListenerMethods() { if (change) { stateChanged = true; // Rollback: we remove the last value of this field from the new state - «getJavaFQN(valueClass)» lastValue = tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)».get(tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)».size()-1); + «getJavaFQN(valueClass)» lastValue = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1); newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); // And we create a proper new value «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; @@ -726,7 +729,7 @@ private def String generateAddStateUsingListenerMethods() { «ELSE» newValue.«stringSetter(valueProperty,stringGetterTracedValue("o_cast", p))»; «ENDIF» - tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)».add(newValue); + tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().add(newValue); newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); }««« end if change }««« end if featureid @@ -744,7 +747,8 @@ private def String generateAddStateUsingListenerMethods() { addImplicitStep(currentStep, startingState, endingState); } lastState = newState; - traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_TraceToStates)».add(lastState); + traceRoot.getStates().add(lastState); +««« traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_TraceToStates)».add(lastState); }««« end if (stateChanged) else if (copiedState) { «FOR p : traceability.allMutableProperties.sortBy[FQN]» @@ -772,8 +776,8 @@ private def String generateAddStateUsingListenerMethods() { private boolean addState(boolean onlyIfChange) { - «getJavaFQN(traceability.traceMMExplorer.getStateClass)» newState = «EcoreCraftingUtil.stringCreate( - traceability.traceMMExplorer.getStateClass)»; + «getJavaFQN(traceability.traceMMExplorer.getSpecificStateClass)» newState = «EcoreCraftingUtil.stringCreate( + traceability.traceMMExplorer.getSpecificStateClass)»; boolean changed = false; Set allResources = getAllExecutedModelResources(); @@ -796,8 +800,8 @@ private def String generateAddStateUsingListenerMethods() { «getJavaFQN(traced)» tracedObject = («getJavaFQN(traced)») exeToTraced.get(o); «ENDIF» «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass valueClass = ptrace.getEType as EClass» + «val EClass valueClass = traceability.getValueClass(p)» + «val EReference pdimension = traceability.getDimensionRef(p)» «incVar("valueSequence")» «val EReference refGlobalToState = traceability.getStateClassToValueClass(p)» «incVar("previousValue")» @@ -807,7 +811,7 @@ private def String generateAddStateUsingListenerMethods() { // If same value, we create no local state and we refer to the previous ««« TODO to change if we switch from refering the exeMM to refering the AS (as in the ECMFA paper) -> need to compare to refs to origobjs/tracedobj ««« TODO handle collections of datatypes - List<«getJavaFQN(valueClass)»> «uniqueVar("valueSequence")» = tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)»; + List<«getJavaFQN(valueClass)»> «uniqueVar("valueSequence")» = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues(); «getJavaFQN(valueClass)» «uniqueVar("previousValue")» = null; if (!«uniqueVar("valueSequence")».isEmpty()) { «uniqueVar("previousValue")» = «uniqueVar("valueSequence")».get(«uniqueVar("valueSequence")».size() - 1); @@ -915,7 +919,7 @@ private def String generateAddStateUsingListenerMethods() { «ENDIF» ««« end collection/Single - tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)».add(newValue); + tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().add(newValue); newState.«EcoreCraftingUtil.stringGetter(refGlobalToState)».add(newValue); } @@ -974,7 +978,7 @@ private def String generateAddStateUsingListenerMethods() { mseModel.getOwnedMSEs().add(step_cast.getMseoccurrence().getMse()); // Creating generic (or almost generic) links - «stateFQN» state = traceRoot.getStatesTrace().get(traceRoot.getStatesTrace().size()-1); + «stateFQN» state = traceRoot.getStates().get(traceRoot.getStates().size()-1); step_cast.setStartingState(state); if (!context.isEmpty() && context.getFirst() != null) { ((SequentialStep<«specificStepFQN»>) context.getFirst()).getSubSteps().add(step_cast); @@ -1005,7 +1009,7 @@ private def String generateAddStateUsingListenerMethods() { private void addStep(String stepRule, Map params, int stateIndex) { «specificStepFQN» toPush = null; if (stateIndex >= 0) { - «stateFQN» state = this.traceRoot.getStatesTrace().get(stateIndex); + «stateFQN» state = this.traceRoot.getStates().get(stateIndex); «IF !stepRules.empty» «FOR stepRule : stepRules.sortBy[baseFQN] SEPARATOR "else"» «val stepCallerClass = stepRule.containingClass» diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend index fb00dce82..855ab39bf 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend @@ -51,8 +51,8 @@ class TraceExplorerGeneratorJava { this.traceability = traceability this.refGenPackages = refGenPackages this.abstractSyntax = abstractSyntax - stateClass = traceability.traceMMExplorer.stateClass - valueClass = traceability.traceMMExplorer.valueClass + stateClass = traceability.traceMMExplorer.getSpecificStateClass + valueClass = traceability.traceMMExplorer.getSpecificValueClass statesPackageFQN = EcoreCraftingUtil.getBaseFQN(traceability.traceMMExplorer.statesPackage) + "." + traceability.traceMMExplorer.statesPackage.name.toFirstUpper + "Package" specificStepClass = traceability.traceMMExplorer.specificStepClass stateFQN = getJavaFQN(stateClass) @@ -148,8 +148,11 @@ class TraceExplorerGeneratorJava { import org.eclipse.emf.transaction.util.TransactionUtil; import org.gemoc.executionframework.engine.core.CommandExecution; + import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; + import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; + import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; ''' @@ -211,8 +214,8 @@ class TraceExplorerGeneratorJava { «IF !mutProps.empty» for («getJavaFQN(traced)» tracedObject : traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))») { «FOR p : mutProps» - «val EReference ptrace = traceability.getTraceOf(p)» - result.add(tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)»); + «val EReference pdimension = traceability.getDimensionRef(p)» + result.add(tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues()); «ENDFOR» } «ENDIF» @@ -223,7 +226,7 @@ class TraceExplorerGeneratorJava { private «valueFQN» getActiveValue(final List valueTrace, final «stateFQN» state) { «valueFQN» result = null; for («valueFQN» value : valueTrace) { - if (value.getStatesNoOpposite().contains(state)) { + if (value.getStatesView().contains(state)) { result = value; break; } @@ -246,7 +249,7 @@ class TraceExplorerGeneratorJava { int i = getCurrentStateIndex() + 1; final «valueFQN» value = getActiveValue(valueTrace, statesTrace.get(i-1)); «valueFQN» nextValue = null; - final int traceLength = valueTrace.stream().map(v -> v.getStatesNoOpposite().size()).reduce(0, (a,b) -> a+b); + final int traceLength = valueTrace.stream().map(v -> v.getStatesView().size()).reduce(0, (a,b) -> a+b); while (i < traceLength && (nextValue == null || nextValue == value)) { nextValue = getActiveValue(valueTrace, statesTrace.get(i)); i++; @@ -465,23 +468,24 @@ class TraceExplorerGeneratorJava { ''' private void goTo(EObject eObject) { if (eObject instanceof «stateFQN») { - «getJavaFQN(traceability.traceMMExplorer.stateClass)» stateToGo = («getJavaFQN(traceability.traceMMExplorer.stateClass)») eObject; + «getJavaFQN(traceability.traceMMExplorer.getSpecificStateClass)» stateToGo = («getJavaFQN(traceability.traceMMExplorer.getSpecificStateClass)») eObject; «FOR p : traceability.allMutableProperties.sortBy[FQN]» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass stateClass = ptrace.getEType as EClass» + «val EReference pdimension = traceability.getDimensionRef(p)» + «val EClass stateClass = traceability.getValueClass(p)» for («getJavaFQN(stateClass)» value : stateToGo.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createGlobalToState(stateClass))») { + final EObject parent = value.eContainer().eContainer(); ««« Case in which we can use the "originalObject" reference and simply set its values «IF p.eContainer instanceof ClassExtension» ««« We have to test at runtime be can't know at design time the type of the object containing the property - ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. - «FOR concreteSubType : getConcreteSubtypesTraceClassOf(ptrace.getEContainingClass).sortBy[name]» - if (value.«EcoreCraftingUtil.stringGetter("parent")» instanceof «getJavaFQN(concreteSubType)») { + ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. + «FOR concreteSubType : getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» + if (parent instanceof «getJavaFQN(concreteSubType)») { «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» - «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») value.«EcoreCraftingUtil.stringGetter("parent")»; + «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; «IF !origRefs.isEmpty» «val EReference origRef = origRefs.get(0)» «IF p.many» - «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(ptrace.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(ptrace.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; + «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value",p)»); «ELSE» @@ -496,7 +500,7 @@ class TraceExplorerGeneratorJava { «ENDFOR» ««« Case in which we have to recreate/restore execution objects in the model «ELSEIF p.eContainer instanceof EClass» - «getJavaFQN(p.EContainingClass)» exeObject = («getJavaFQN(p.EContainingClass)») «getTracedToExeMethodName»(value.getParent()); + «getJavaFQN(p.EContainingClass)» exeObject = («getJavaFQN(p.EContainingClass)») «getTracedToExeMethodName»(parent); «IF p.many» exeObject.«EcoreCraftingUtil.stringGetter(p)».clear(); «IF p instanceof EReference» @@ -513,7 +517,7 @@ class TraceExplorerGeneratorJava { «ENDFOR» backValueCache.clear(); } else if (eObject instanceof «valueFQN») { - goTo(((«valueFQN»)eObject).getStatesNoOpposite().get(0)); + goTo(((«valueFQN»)eObject).getStatesView().get(0)); } } @@ -582,7 +586,7 @@ class TraceExplorerGeneratorJava { ''' public void loadTrace(«getJavaFQN(traceability.traceMMExplorer.specificTraceClass)» root) { traceRoot = root; - statesTrace = traceRoot.getStatesTrace(); + statesTrace = traceRoot.getStates(); if (!statesTrace.isEmpty()) { currentState = statesTrace.get(0); } @@ -745,6 +749,11 @@ class TraceExplorerGeneratorJava { return statesTrace.size() - 1; } + @Override + public State getCurrentState() { + return currentState; + } + @Override public List getCallStack() { return callStack; @@ -811,8 +820,7 @@ class TraceExplorerGeneratorJava { if (o instanceof «stateFQN») { idx = statesTrace.indexOf(o); } else if (o instanceof «valueFQN») { - final «stateFQN» state = ((«valueFQN») o).getStatesNoOpposite().get(0); - idx = statesTrace.indexOf(state); + idx = statesTrace.indexOf(((«valueFQN») o).getStatesView().get(0)); } if (idx != -1) { jump(idx); @@ -917,26 +925,26 @@ class TraceExplorerGeneratorJava { } @Override - public void statesAdded(List state) { + public void statesAdded(List state) { } @Override - public void valuesAdded(List value) { + public void valuesAdded(List value) { } @Override - public void dimensionsAdded(List> dimensions) { + public void dimensionsAdded(List> dimensions) { valueTraces.clear(); valueTraces.addAll(getAllValueTraces()); notifyListeners(); } @Override - public void stepsStarted(List steps) { + public void stepsStarted(List steps) { } @Override - public void stepsEnded(List steps) { + public void stepsEnded(List steps) { } ''' } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend index bc692243b..32138d632 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend @@ -49,8 +49,8 @@ class TraceExtractorGeneratorJava { this.traceability = traceability this.refGenPackages = refGenPackages this.abstractSyntax = abstractSyntax - stateClass = traceability.traceMMExplorer.stateClass - valueClass = traceability.traceMMExplorer.valueClass + stateClass = traceability.traceMMExplorer.getSpecificStateClass + valueClass = traceability.traceMMExplorer.getSpecificValueClass statesPackageFQN = EcoreCraftingUtil.getBaseFQN(traceability.traceMMExplorer.statesPackage) + "." + traceability.traceMMExplorer.statesPackage.name.toFirstUpper + "Package" specificStepClass = traceability.traceMMExplorer.specificStepClass stateFQN = getJavaFQN(stateClass) @@ -133,9 +133,13 @@ class TraceExtractorGeneratorJava { import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; + import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; + import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; + import fr.inria.diverse.trace.commons.model.trace.Trace; + import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; ''' @@ -507,8 +511,8 @@ class TraceExtractorGeneratorJava { return false; } - final List<«stateFQN»> states1 = trace1.getStatesTrace(); - final List<«stateFQN»> states2 = trace2.getStatesTrace(); + final List<«stateFQN»> states1 = trace1.getStates(); + final List<«stateFQN»> states2 = trace2.getStates(); if (states1.size() != states2.size()) { return false; @@ -540,7 +544,7 @@ class TraceExtractorGeneratorJava { final List trace = valueTraces.get(i); boolean notFound = true; for («valueFQN» value : trace) { - if (value.getStatesNoOpposite().contains(state)) { + if (value.getStatesView().contains(state)) { result.add(value); notFound = false; break; @@ -585,8 +589,8 @@ class TraceExtractorGeneratorJava { «IF !mutProps.empty» for («getJavaFQN(traced)» tracedObject : traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))») { «FOR p : mutProps» - «val EReference ptrace = traceability.getTraceOf(p)» - result.add(tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)»); + «val EReference pdimension = traceability.getDimensionRef(p)» + result.add(tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues()); «ENDFOR» } «ENDIF» @@ -594,21 +598,13 @@ class TraceExtractorGeneratorJava { return result; } - private ValueWrapper getValueWrapper(«valueFQN» value, int valueIndex) { - List<«stateFQN»> states = value.getStatesNoOpposite(); - «stateFQN» firstState = states.get(0); - final int firstStateIndex = statesTrace.indexOf(firstState); - final int lastStateIndex = (int) (firstStateIndex + states.stream().distinct().count() - 1); - return new ValueWrapper(value, firstStateIndex, lastStateIndex, valueIndex); - } - private «valueFQN» getValueAt(int traceIndex, int stateIndex) { «valueFQN» result = null; if (traceIndex >= 0 && traceIndex < valueTraces.size()) { final List valueTrace = valueTraces.get(traceIndex); final «stateFQN» state = statesTrace.get(stateIndex); for («valueFQN» value : valueTrace) { - if (value.getStatesNoOpposite().contains(state)) { + if (value.getStatesView().contains(state)) { result = value; break; } @@ -616,19 +612,6 @@ class TraceExtractorGeneratorJava { } return result; } - - @Override - public ValueWrapper getValueWrapper(int traceIndex, int stateIndex) { - «valueFQN» value = getValueAt(traceIndex, stateIndex); - if (value == null) { - return null; - } - List<«stateFQN»> states = value.getStatesNoOpposite(); - «stateFQN» firstState = states.get(0); - final int firstStateIndex = statesTrace.indexOf(firstState); - final int lastStateIndex = (int) (firstStateIndex + states.stream().distinct().count() - 1); - return new ValueWrapper(value, firstStateIndex, lastStateIndex, traceIndex); - } ''' } @@ -657,7 +640,7 @@ class TraceExtractorGeneratorJava { ''' public void loadTrace(«getJavaFQN(traceability.traceMMExplorer.specificTraceClass)» root) { traceRoot = root; - statesTrace = traceRoot.getStatesTrace(); + statesTrace = traceRoot.getStates(); valueTraces.addAll(getAllValueTraces()); updateEquivalenceClasses(statesTrace); } @@ -667,19 +650,6 @@ class TraceExtractorGeneratorJava { private def String generateAPI() { return ''' - @Override - public List getStepWrappers(int startingState, int endingState) { - Predicate<«specificStepFQN»> predicate = s -> { - final int stepStartingState = getStartingIndex(s); - final int stepEndingState = getEndingIndex(s); - return (stepEndingState == -1 || stepEndingState >= startingState) - && stepStartingState <= endingState; - }; - return traceRoot.getRootStep().getSubSteps().stream().filter(predicate) - .map(s -> getStepWrapper(s)) - .collect(Collectors.toList()); - } - private boolean isStateBreakable(«stateFQN» state) { «IF !traceability.bigStepClasses.empty» final boolean b = state.getStartedSteps().size() == 1; @@ -695,82 +665,34 @@ class TraceExtractorGeneratorJava { } @Override - public StateWrapper getStateWrapper(int stateIndex) { - if (stateIndex > -1 && stateIndex < statesTrace.size()) { - final «stateFQN» state = statesTrace.get(stateIndex); - return new StateWrapper(state, stateIndex, isStateBreakable(state), getStateDescription(stateIndex)); - } - return null; - } - - @Override - public StateWrapper getStateWrapper(EObject state) { - if (state instanceof «stateFQN») { - final int idx = statesTrace.indexOf(state); - if (idx != -1) { - final «stateFQN» state_cast = («stateFQN») state; - return new StateWrapper(state_cast, idx, isStateBreakable(state_cast), getStateDescription(idx)); - } - } - return null; + public int getNumberOfTraces() { + return valueTraces.size(); } @Override - public List getStateWrappers(int start, int end) { - final List result = new ArrayList<>(); - final int startStateIndex = Math.max(0, start); - final int endStateIndex = Math.min(statesTrace.size() - 1, end); - - for (int i = startStateIndex; i < endStateIndex + 1; i++) { - final «stateFQN» state = statesTrace.get(i); - result.add(new StateWrapper(state, i, isStateBreakable(state), getStateDescription(i))); - } - - return result; + public int getStatesTraceLength() { + return statesTrace.size(); } @Override - public List getValueWrappers(int valueTraceIndex, int start, int end) { - final List result = new ArrayList<>(); - - if (valueTraceIndex < valueTraces.size()) { - final List valueTrace = valueTraces.get(valueTraceIndex); - for («valueFQN» value : valueTrace) { - final int currentValueIndex = valueTrace.indexOf(value); - ValueWrapper wrapper = getValueWrapper(value, currentValueIndex); - if (wrapper.firstStateIndex < end && wrapper.lastStateIndex > start) { - result.add(wrapper); - } - } - } - - return result; + public State getState(int stateIndex) { + return statesTrace.get(stateIndex); } - @SuppressWarnings("unchecked") @Override - public StepWrapper getStepWrapper(Step step) { - if (step instanceof «specificStepFQN») { - final «specificStepFQN» step_cast = («specificStepFQN») step; - final int startingIndex = getStartingIndex(step_cast); - final int endingIndex = getEndingIndex(step_cast); - final List subSteps = new ArrayList<>(); - if (step_cast instanceof SequentialStep) { - subSteps.addAll(((SequentialStep<«specificStepFQN»>) step_cast).getSubSteps()); - } - return new StepWrapper(step, startingIndex, endingIndex, subSteps); - } - return null; + public State getStateIndex(State state) { + return statesTrace.indexOf(state); } @Override - public int getNumberOfTraces() { - return valueTraces.size(); + public int getValueFirstStateIndex(Value value) { + return getStateIndex(value.getStatesView().get(0)); } @Override - public int getStatesTraceLength() { - return statesTrace.size(); + public int getValueLastStateIndex(Value value) { + final List states = value.getStatesView() + return getStateIndex(states.get(states.size() - 1)); } @Override @@ -931,7 +853,7 @@ class TraceExtractorGeneratorJava { } @Override - public void statesAdded(List states) { + public void statesAdded(List states) { updateEquivalenceClasses(states.stream() .map(e -> («stateFQN») e).collect(Collectors.toList())); notifyListeners(); @@ -942,7 +864,7 @@ class TraceExtractorGeneratorJava { private Map> listeners = new HashMap<>(); @Override - public void valuesAdded(List values) { + public void valuesAdded(List values) { ««« for (EObject value : values) { ««« final EReference r = value.eContainmentFeature(); ««« final EObject c = value.eContainer(); @@ -966,13 +888,13 @@ class TraceExtractorGeneratorJava { } @Override - public void dimensionsAdded(List> dimensions) { + public void dimensionsAdded(List> dimensions) { if (!dimensions.isEmpty()) { valueTraces.clear(); cachedMaskedStateEquivalenceClasses.clear(); valueTraces.addAll(getAllValueTraces()); final List insertedTracesIndexes = new ArrayList<>(); - for (List valueTrace : dimensions) { + for (Dimension valueTrace : dimensions) { final int i = valueTraces.indexOf(valueTrace); insertedTracesIndexes.add(i); } @@ -1029,12 +951,12 @@ class TraceExtractorGeneratorJava { } @Override - public void stepsStarted(List steps) { + public void stepsStarted(List steps) { // Nothing to do here. } @Override - public void stepsEnded(List steps) { + public void stepsEnded(List steps) { // Nothing to do here. } ''' diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend deleted file mode 100644 index c1ab0975c..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend +++ /dev/null @@ -1,1594 +0,0 @@ -package fr.inria.diverse.trace.plugin.generator.codegen - - -import ecorext.ClassExtension -import ecorext.Rule -import fr.inria.diverse.trace.commons.CodeGenUtil -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.commons.tracemetamodel.StepStrings -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import fr.inria.diverse.trace.metamodel.generator.TraceMMStrings -import java.util.ArrayList -import java.util.Collection -import java.util.HashMap -import java.util.HashSet -import java.util.List -import java.util.Map -import java.util.Set -import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import org.eclipse.emf.ecore.EAttribute -import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.EClassifier -import org.eclipse.emf.ecore.EOperation -import org.eclipse.emf.ecore.EPackage -import org.eclipse.emf.ecore.EReference -import org.eclipse.emf.ecore.EStructuralFeature -import fr.inria.diverse.trace.commons.model.trace.TracePackage - -class TraceManagerGeneratorJava { - - // Inputs - private val String className - private val String packageQN - private val EPackage traceMM - private val EPackage abstractSyntax - private val TraceMMGenerationTraceability traceability - private val Set refGenPackages - private val boolean gemoc - private val boolean partialTraceManagement - - // Transient - private boolean getExeToTracedUsed = false - private boolean getTracedToExeUsed = false - - - // Shortcuts - private val EClass stateClass - - public def String getClassName() { - return className - } - - new(String languageName, String packageQN, EPackage traceMM, TraceMMGenerationTraceability traceability, - Set refGenPackages, boolean gemoc, EPackage abstractSyntax, boolean partialTraceManagement) { - this.traceMM = traceMM - this.className = languageName.replaceAll(" ", "").toFirstUpper + "Manager" - this.packageQN = packageQN - this.traceability = traceability - this.refGenPackages = refGenPackages - this.gemoc = gemoc - this.abstractSyntax = abstractSyntax - stateClass = traceability.traceMMExplorer.stateClass - this.partialTraceManagement=partialTraceManagement - } - - private def String getActualFQN(EClass c, Rule r) { - val EOperation o = r.operation - return EcoreCraftingUtil.getBaseFQN(c) + "." + o.name - } - - private def String getFQN(EStructuralFeature eFeature) { - return EcoreCraftingUtil.getBaseFQN(eFeature.EContainingClass) + "." + eFeature.name - } - - private static def boolean isNotSuperTypeOf(EClass c, Collection eclasses) { - for (eclass : eclasses) { - if (eclass.EAllSuperTypes.contains(c)) - return false - } - return true - } - - private def String getTracedJavaFQN(EClassifier c) { - return getTracedJavaFQN(c,false) - } - - private def String getTracedJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { - if (c instanceof EClass) { - val tracedClass = traceability.getTracedClass(c) - if (tracedClass != null) - return getJavaFQN(traceability.getTracedClass(c),enforcePrimitiveJavaClass) - else - return getJavaFQN(c,enforcePrimitiveJavaClass) - } else { - return getJavaFQN(c,enforcePrimitiveJavaClass) - } - } - - private def String getJavaFQN(EClassifier c) { - return getJavaFQN(c,false) - } - - private def String getJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { - return EcoreCraftingUtil.getJavaFQN(c,refGenPackages,enforcePrimitiveJavaClass) - } - - private static def List partialOrderSort (List eclasses) { - val List result = new ArrayList - for (ci : eclasses) { - if (result.isEmpty) - result.add(ci) - else { - var boolean found = false - for (var int i = 0; i < result.size && !found; i++) { - val Set followings = result.subList(i, result.size).toSet - if (ci.isNotSuperTypeOf(followings)) { - result.add(0, ci) - found = true - } - } - - if (!found) - result.add(ci) - } - } - return result - - } - - /* - private def String getEOperationGetCode (Rule r) { - val o = r.operation - val eclass = r.containingClass - val epackage = eclass.EPackage - val res = '''«getJavaFQN(epackage)».«epackage.name.toFirstUpper»Package.eINSTANCE.get«eclass.name»__«o.name.toFirstUpper»()''' - return res - } -*/ - - - - public def String generateCode() { - val String code = generateTraceManagerClass() - try { - return CodeGenUtil.formatJavaCode(code) - } catch (Throwable t) { - return code - } - - } - - private Map counters = new HashMap - - private def String uniqueVar(String s) { - if (!counters.containsKey(s)) { - counters.put(s, 0) - } - return s + counters.get(s) - } - - private def void incVar(String s) { - if (!counters.containsKey(s)) { - counters.put(s, 0) - } - counters.put(s, counters.get(s) + 1) - } - - public static def String getBaseFQN(Rule r) { - val EOperation o = r.operation - val EClass c = r.containingClass - return EcoreCraftingUtil.getBaseFQN(c) + "." + o.name - } - - private def EClassifier getEventParamRuntimeType(EStructuralFeature f) { - var EClass res = null - if (f instanceof EAttribute) { - // TODO - } else if (f instanceof EReference) { - val potentialRealRuntimeClass = traceability.getRealMutableClass(f.EReferenceType) - if (potentialRealRuntimeClass != null) { - - // TODO here in the general case we need to find the exe class - res = potentialRealRuntimeClass - } else { - - // TODO same here - res = f.EReferenceType - } - } - return res - } - - private def String stringGetterTracedValue(String javaVarName, EStructuralFeature p) { - if (p instanceof EReference && traceability.hasTracedClass(p.EType as EClass)) - return '''((«getJavaFQN(traceability.getTracedClass(p.EType as EClass))»)exeToTraced.get(«javaVarName».«EcoreCraftingUtil.stringGetter( - p)»))''' - else - return javaVarName + "." + EcoreCraftingUtil.stringGetter(p) - } - - private def String stringGetterExeValue(String javaVarName, EStructuralFeature p) { - return ''' - «IF (p instanceof EReference && traceability.hasTracedClass(p.EType as EClass))» - - ««« If many elements are in this fields, we have to cast the element with a collection - «IF p.many» - (Collection) - «ELSE» - («getJavaFQN(p.EType, true)») - «ENDIF» - «getTracedToExeMethodName»(«javaVarName».«EcoreCraftingUtil.stringGetter(p)») - «ELSE» - «javaVarName».«EcoreCraftingUtil.stringGetter(p)» - «ENDIF»''' - } - - private def Set getConcreteSubtypesTraceClassOf(EClass tracedClass) { - val Set result = new HashSet() - result.addAll(this.traceMM.eAllContents.filter(EClass).filter [ c | - !c.abstract && c.EAllSuperTypes.contains(tracedClass) - ].toSet) - if (!tracedClass.abstract) - result.add(tracedClass) - return result - } - - private def Set getAllMutablePropertiesOf(EClass exeClass) { - val Set res = new HashSet - res.addAll(traceability.getMutablePropertiesOf(exeClass)) - res.addAll(exeClass.EAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); - return res - } - - private def Set getAllMutableClasses() { - return traceability.allMutableClasses.filter[c|!c.allMutablePropertiesOf.empty].toSet - } - - - private def String generateImports() { - return ''' -import fr.inria.diverse.trace.api.IValueTrace; -import fr.inria.diverse.trace.api.impl.GenericValueTrace; - -import java.util.LinkedList; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Deque; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EReference; -«««import org.eclipse.emf.ecore.EOperation; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.common.util.TreeIterator; -import org.eclipse.emf.common.util.URI; - ''' - } - - private def String generateFields() { - return ''' - - private «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)» traceRoot; - private fr.inria.diverse.trace.commons.model.trace.MSEModel mseModel; - private Resource executedModel; - - ««« TODO one map per type? So that we can completely stop manipulationg eobjects - private Map exeToTraced; - - private «getJavaFQN(traceability.traceMMExplorer.getStateClass)» lastState; - private List traces; - - private Resource traceResource; - private Deque<«getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)»> context = new LinkedList<«getJavaFQN( - traceability.traceMMExplorer.getSpecificStepClass)»>(); - ''' - } - - private def String generateConstructor() { - return ''' - public «className» (Resource exeModel, Resource traceResource) { - this.traceResource = traceResource; - this.executedModel = exeModel; - this.traces = new ArrayList(); - }''' - } - - - private def String getExeToTracedMethodName() { - getExeToTracedUsed = true - return "getExeToTraced" - } - - private def String getTracedToExeMethodName() { - getTracedToExeUsed = true - return "getTracedToExe" - } - - - private def String generateExeToFromTracedGenericMethods() { - return ''' - «IF getExeToTracedUsed» - private Collection «getExeToTracedMethodName»(Collection exeObjects) { - Collection result = new ArrayList(); - for(EObject exeObject : exeObjects) { - storeAsTracedObject(exeObject); - result.add(exeToTraced.get(exeObject)); - } - return result; - } - «ENDIF» - - «IF getTracedToExeUsed» - private Collection «getTracedToExeMethodName»( - Collection tracedObjects) { - Collection result = new ArrayList(); - for (EObject tracedObject : tracedObjects) { - result.add(«getTracedToExeMethodName»(tracedObject)); - } - return result; - } - - private EObject «getTracedToExeMethodName»(EObject tracedObject) { - for (EObject key : exeToTraced.keySet()) { - if (exeToTraced.get(key) == tracedObject) - return key; - } - return null; - } - «ENDIF» - ''' - } - - private def String generateStoreAsTracedMethods() { - return ''' «FOR mutClass : traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name]» - -private void storeAsTracedObject(«getJavaFQN(mutClass)» o) { - «val traced = traceability.getTracedClass(mutClass)» - - // First we find the traced object, and we create it if required - «getJavaFQN(traced)» tracedObject; - if (!exeToTraced.containsKey(o)) { - tracedObject = «EcoreCraftingUtil.stringCreate(traced)»; - «val Set origRefs1 = traceability.getRefs_originalObject(traced)» - «FOR EReference origRef : origRefs1.sortBy[name]» - tracedObject.«EcoreCraftingUtil.stringSetter(origRef, "o")»; - «ENDFOR» - exeToTraced.put(o, tracedObject); - traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))».add(tracedObject); - - «FOR p : getAllMutablePropertiesOf(mutClass).sortBy[FQN]» - «val EReference ptrace = traceability.getTraceOf(p)» - traces.add(new GenericValueTrace(tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)», this)); - «ENDFOR» - } - } - - «ENDFOR» -«IF getExeToTracedUsed» -private void storeAsTracedObject(EObject o) { - «FOR mutClass : partialOrderSort(traceability.allMutableClasses.filter[c|!c.isAbstract].toList.sortBy[name]) SEPARATOR "\n else "» -if (o instanceof «getJavaFQN(mutClass)») { - storeAsTracedObject((«getJavaFQN(mutClass)»)o); -} -«ENDFOR» -} -«ENDIF» -''' - } - - private def String stringFeatureID(EStructuralFeature p) { - val containingClass = if (p.eContainer instanceof EClass) p.eContainer as EClassifier else (p.eContainer as ClassExtension).extendedExistingClass - return EcoreCraftingUtil.stringFeatureID(p,containingClass,refGenPackages) - } - - private def String generateGetAllResourcesMethod() { - return ''' - - private Set getAllExecutedModelResources() { - Set allResources = new HashSet<>(); - allResources.add(executedModel); - «IF gemoc» - allResources.addAll(org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); - «ENDIF» - return allResources; - } - - ''' - } - - - private def String generateAddInitialStateMethod() { - return ''' - - private void addInitialState() { - if (lastState == null) { - // Creation of the initial state - Set allResources = getAllExecutedModelResources(); - lastState = «EcoreCraftingUtil.stringCreate(stateClass)»; - for (Resource r : allResources) { - for (TreeIterator i = r.getAllContents(); i.hasNext();) { - EObject o = i.next(); - «FOR c : partialOrderSort(getAllMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList) SEPARATOR "else"» - - if (o instanceof «getJavaFQN(c)») { - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - addNewObjectToState(o_cast, lastState); - } - «ENDFOR» - } - } - this.traceRoot.getStatesTrace().add(lastState); - }} - ''' - } - - private def String generateAddNewObjectToStateMethods() { - val stateClass = traceability.traceMMExplorer.stateClass - return ''' - - «FOR c : partialOrderSort(getAllMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList)» - «val traced = traceability.getTracedClass(c)» - - «IF getAllMutablePropertiesOf(c).exists[p|p instanceof EReference && p.many]» - @SuppressWarnings("unchecked") - «ENDIF» - private void addNewObjectToState(«getJavaFQN(c)» o_cast, «getJavaFQN(stateClass)» newState) { - storeAsTracedObject(o_cast); - «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o_cast); - - «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass valueClass = ptrace.getEType as EClass» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» - - // Creation of the first value of the field «p.name» - «IF traceability.allMutableClasses.contains(p.EType)» - «IF p.many» - for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - storeAsTracedObject(aValue); - } - «ELSE» - storeAsTracedObject(o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - «ENDIF» - «getJavaFQN(valueClass)» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(valueClass)»; - «IF p.many» - «IF p instanceof EReference» - firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)»)); - «ELSE» - firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - «ELSE» - firstValue_«p.name».«EcoreCraftingUtil.stringSetter(p,stringGetterTracedValue("o_cast", p))»; - «ENDIF» - traced.«EcoreCraftingUtil.stringGetter(ptrace)».add(firstValue_«p.name»); - newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(firstValue_«p.name»); - «ENDFOR» - } - «ENDFOR» - - - - ''' - } - -private def String generateAddStateUsingListenerMethods() { - - val stateClass = traceability.traceMMExplorer.stateClass - val newClassesNotEmpty = partialOrderSort(traceability.getNewClasses.filter[c|!c.EStructuralFeatures.empty].toList) - val allConcreteMutableClasses = partialOrderSort(getAllMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList) - val mutableClassesWithNonCollectionMutableFields = allConcreteMutableClasses.filter[c|getAllMutablePropertiesOf(c).exists[p|!p.many]] - val mutableClassesWithCollectionMutableFields = allConcreteMutableClasses.filter[c|getAllMutablePropertiesOf(c).exists[p| p.many]] - return ''' - - private «getJavaFQN(stateClass)» copyState(«getJavaFQN(stateClass)» oldState) { - «getJavaFQN(stateClass)» newState = «EcoreCraftingUtil.stringCreate(stateClass)»; - «FOR c : getAllMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList» - «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» - newState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))».addAll(oldState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))»); - «ENDFOR» - «ENDFOR» - return newState; - } - - @Override - public void addState(Set changes) { - - - if (lastState == null) { - addInitialState(); - } ««« end if laststate null - - - if (!changes.isEmpty()) { - - boolean stateChanged = false; - - // We start by a (shallow) copy of the last state - // But we will have to rollback a little by replacing values that changed - «getJavaFQN(stateClass)» newState = copyState(lastState); - - for (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) { - EObject o = modelChange.getChangedObject(); - - - - «IF !newClassesNotEmpty.empty» - // We only look at constructable objects that have mutable fields - // Here we have nothing to rollback, just a new object to add - if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange) { - stateChanged = true; - - ««« Loop over all classes that may be constructed and that have mutable fields - «FOR c : newClassesNotEmpty» - if (o instanceof «getJavaFQN(c)») { - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - addNewObjectToState(o_cast, newState); - } ««« end if instanceof - «ENDFOR» - - } ««« end if NewObjectModelChange - - - - // We only look at constructable objects that have mutable fields - // Here we must rollback to remove the values of the removed object from the copied state - else if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.RemovedObjectModelChange) { - stateChanged = true; - - ««« Loop over all classes that may be constructed and that have mutable fields - «FOR c : newClassesNotEmpty» - «val traced = traceability.getTracedClass(c)» - if (o instanceof «getJavaFQN(c)») { - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o_cast); - - ««« Loop over the fields of this class, which are all mutable - «FOR p : c.EStructuralFeatures» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» - newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(traced.«EcoreCraftingUtil.stringGetter(ptrace)».get(traced.«EcoreCraftingUtil.stringGetter(ptrace)».size()-1)); - «ENDFOR» - } ««« end if instanceof - «ENDFOR» - } ««« end if RemovedObjectModelChange - «ENDIF» - - - - «IF !mutableClassesWithNonCollectionMutableFields.empty» - // Here we must look at non-collection mutable fields - // We must rollback the last values from the copied state, and add new values as well - // ie. mix of remove and new - «IF !newClassesNotEmpty.empty» else «ENDIF» if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) { - stateChanged = true; - - org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange; - «EStructuralFeature.canonicalName » p = modelChange_cast.getChangedField(); - - - «FOR c : mutableClassesWithNonCollectionMutableFields SEPARATOR "\n else "» - «val nonCollectionMutableFields = getAllMutablePropertiesOf(c).filter[p|!p.many]» - «val traced = traceability.getTracedClass(c)» - - if (o instanceof «getJavaFQN(c)») { - - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - - «FOR p : nonCollectionMutableFields » - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass valueClass = ptrace.getEType as EClass» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» - - if (p.getFeatureID() == «stringFeatureID(p)») { - - // Rollback: we remove the last value of this field from the new state - «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o); - «getJavaFQN(valueClass)» lastValue = traced.«EcoreCraftingUtil.stringGetter(ptrace)».get(traced.«EcoreCraftingUtil.stringGetter(ptrace)».size()-1); - newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); - - // And we create a proper new value - «IF traceability.allMutableClasses.contains(p.EType)» - storeAsTracedObject(o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; - newValue.«EcoreCraftingUtil.stringSetter(p,stringGetterTracedValue("o_cast", p))»; - traced.«EcoreCraftingUtil.stringGetter(ptrace)».add(newValue); - newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); - } ««« end if feature id - - «ENDFOR» - - } ««« end if instance of - «ENDFOR» - - - } ««« end if NonCollectionFieldModelChange - «ENDIF» - - - «IF !mutableClassesWithCollectionMutableFields.empty» - // Here we look at collection mutable fields - // We must first manually find out if the collection changed... - // If it changed we must rollback the last values from the copied state, and add new values as well - «IF !newClassesNotEmpty.empty || !mutableClassesWithNonCollectionMutableFields.empty » else «ENDIF» if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange) { - org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange) modelChange; - - - «EStructuralFeature.canonicalName » p = modelChange_cast.getChangedField(); - - «FOR c : mutableClassesWithCollectionMutableFields SEPARATOR "\n else "» - «val collectionMutableFields = getAllMutablePropertiesOf(c).filter[p|p.many]» - «val traced = traceability.getTracedClass(c)» - - - if (o instanceof «getJavaFQN(c)») { - - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - «getJavaFQN(traced)» tracedObject = («getJavaFQN(traced)») exeToTraced.get(o_cast); - - «FOR p : collectionMutableFields » - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass valueClass = ptrace.getEType as EClass» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» - - - if (p.getFeatureID() == «stringFeatureID(p)») { - - // We compare the last collection in the value sequence, and the current one in the potentially changed object - List<«getJavaFQN(valueClass)»> valueSequence = tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)»; - «getJavaFQN(valueClass)» previousValue = null; - if (!valueSequence.isEmpty()) - previousValue = valueSequence.get(valueSequence.size() - 1); - - ««« If instances of new class, we have to make sure that there are traced versions - «IF traceability.allMutableClasses.contains(p.EType)» - for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - storeAsTracedObject(aValue); - } ««« end for loop on values - «ENDIF» - - boolean change = false; - if (previousValue != null) { - - if (previousValue.«EcoreCraftingUtil.stringGetter(p)».size() == o_cast - .«EcoreCraftingUtil.stringGetter(p)».size()) { - - ««« We this is an ordered collection, we have to compare in the correct order - «IF p.ordered» - java.util.Iterator<«getJavaFQN(p.EType,true)»> it = o_cast.«EcoreCraftingUtil.stringGetter(p)».iterator(); - for («getTracedJavaFQN(p.EType,true)» aPreviousValue : previousValue - .«EcoreCraftingUtil.stringGetter(p)») { - «getJavaFQN(p.EType)» aCurrentValue = it.next(); - «IF p instanceof EReference» - if (aPreviousValue != exeToTraced.get(aCurrentValue)) - «ELSE» - if (!aPreviousValue.equals(aCurrentValue)) - «ENDIF» - { - change = true; - break; - } - } - - ««« Else we simply check that the content is the same - «ELSE» - change = !previousValue.«EcoreCraftingUtil.stringGetter(p)».containsAll(«getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter( - p)»)); - «ENDIF» - ««« end case ordered - - } ««« end if same size - - else { - change = true; - } ««« end else - - } ««« end if (previousValue != null) - - else { - change = true; - } ««« end else - - - - - if (change) { - stateChanged = true; - - // Rollback: we remove the last value of this field from the new state - «getJavaFQN(valueClass)» lastValue = tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)».get(tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)».size()-1); - newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); - - // And we create a proper new value - «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; - «IF p.many» - «IF p instanceof EReference» - newValue.«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)»)); - «ELSE» - newValue.«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - «ELSE» - newValue.«EcoreCraftingUtil.stringSetter(p,stringGetterTracedValue("o_cast", p))»; - «ENDIF» - tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)».add(newValue); - newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); - } ««« end if change - - } ««« end if featureid - - «ENDFOR» - } ««« end if instanceof - - «ENDFOR» - } ««« end if PotentialCollectionFieldModelChange - - «ENDIF» - - } ««« end for all changes - - if (stateChanged) { - final «getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» currentStep = context.peekFirst(); - if (currentStep != null && currentStep instanceof «getJavaFQN(TracePackage.eINSTANCE.bigStep)») { - final «getJavaFQN(traceability.traceMMExplorer.stateClass)» startingState = lastState; - final «getJavaFQN(traceability.traceMMExplorer.stateClass)» endingState = newState; - addImplicitStep(currentStep, startingState, endingState); - } - - lastState = newState; - traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_TraceToStates)».add(lastState); - } ««« end if (stateChanged) - - } ««« end if (!changes.isEmpty()) - } ««« end method - - ''' - - } - - private def String generateAddStateMethods() { return - ''' - @Override - public boolean addStateIfChanged() { - return addState(true); - } - - @Override - public void addState() { - addState(false); - } - - private boolean addState(boolean onlyIfChange) { - - «getJavaFQN(traceability.traceMMExplorer.getStateClass)» newState = «EcoreCraftingUtil.stringCreate( - traceability.traceMMExplorer.getStateClass)»; - boolean changed = false; - - Set allResources = getAllExecutedModelResources(); - - // We look at each object instance of a class with mutable properties - // Each of these objects should eventually become a traced object - for (Resource r : allResources) - for (TreeIterator i = r.getAllContents(); i.hasNext();){ - EObject o = i.next(); - - - - «FOR c : partialOrderSort(getAllMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList) SEPARATOR "\n else "» - «val traced = traceability.getTracedClass(c)» - - /** - * Storing the state of a «getJavaFQN(c)» object - */ - if (o instanceof «getJavaFQN(c)») { - - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - - storeAsTracedObject(o_cast); - - «IF !getAllMutablePropertiesOf(c).empty» - «getJavaFQN(traced)» tracedObject = («getJavaFQN(traced)») exeToTraced.get(o); - «ENDIF» - «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass valueClass = ptrace.getEType as EClass» - «incVar("valueSequence")» - «val EReference refGlobalToState = traceability.getStateClassToValueClass(p)» - «incVar("previousValue")» - «incVar("noChange")» - - - // Then we compare the value of the field with the last stored value - // If same value, we create no local state and we refer to the previous - ««« TODO to change if we switch from refering the exeMM to refering the AS (as in the ECMFA paper) -> need to compare to refs to origobjs/tracedobj - ««« TODO handle collections of datatypes - List<«getJavaFQN(valueClass)»> «uniqueVar("valueSequence")» = tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)»; - «getJavaFQN(valueClass)» «uniqueVar("previousValue")» = null; - if (!«uniqueVar("valueSequence")».isEmpty()) - «uniqueVar("previousValue")» = «uniqueVar("valueSequence")».get(«uniqueVar("valueSequence")».size() - 1); - - ««« Case many - «IF p.many» - - ««« If instances of new class, we have to make sure that there are traced versions - «IF traceability.allMutableClasses.contains(p.EType)» - - for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - storeAsTracedObject(aValue); - } - - «ENDIF» - - boolean «uniqueVar("noChange")»= true; - if («uniqueVar("previousValue")» != null) { - - if («uniqueVar("previousValue")».«EcoreCraftingUtil.stringGetter(p)».size() == o_cast - .«EcoreCraftingUtil.stringGetter(p)».size()) { - - ««« We this is an ordered collection, we have to compare in the correct order - «IF p.ordered» - java.util.Iterator<«getJavaFQN(p.EType,true)»> it = o_cast.«EcoreCraftingUtil.stringGetter(p)».iterator(); - for («getTracedJavaFQN(p.EType,true)» aPreviousValue : «uniqueVar("previousValue")» - .«EcoreCraftingUtil.stringGetter(p)») { - «getJavaFQN(p.EType)» aCurrentValue = it.next(); - «IF p instanceof EReference» - if (aPreviousValue != exeToTraced.get(aCurrentValue)) { - «ELSE» - if (!aPreviousValue.equals(aCurrentValue)) { - «ENDIF» - «uniqueVar("noChange")» = false; - break; - } - } - - ««« Else we simply check that the content is the same - «ELSE» - «uniqueVar("noChange")» = «uniqueVar("previousValue")».«EcoreCraftingUtil.stringGetter(p)».containsAll(«getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter( - p)»)); - «ENDIF» - ««« end case ordered - - } else { - «uniqueVar("noChange")» = false; - } - } else { - «uniqueVar("noChange")» = false; - } - - - ««« Case single - «ELSE» - - ««« If instance of new class, we have to make sure that there is a traced version - «IF traceability.allMutableClasses.contains(p.EType)» - storeAsTracedObject(o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - - - ««« Getting the content of the field - «incVar("content")» - ««« - ««« Case reference - «IF p instanceof EReference» - «getTracedJavaFQN(p.EType)» «uniqueVar("content")» = null; - if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) - «uniqueVar("content")» = «stringGetterTracedValue("o_cast", p)»; - ««« - ««« Case datatype - «ELSEIF p instanceof EAttribute» - «getJavaFQN(p.EType)» «uniqueVar("content")» = o_cast.«EcoreCraftingUtil.stringGetter(p)»; - «ENDIF» - ««« end declaring/getting content - - «IF getJavaFQN(p.EType) == "java.lang.Byte" - || getJavaFQN(p.EType) == "java.lang.Short" - || getJavaFQN(p.EType) == "java.lang.Integer" - || getJavaFQN(p.EType) == "java.lang.Long" - || getJavaFQN(p.EType) == "java.lang.Boolean" - || getJavaFQN(p.EType) == "java.lang.Float" - || getJavaFQN(p.EType) == "java.lang.Double" - || getJavaFQN(p.EType) == "java.lang.String"» - boolean «uniqueVar("noChange")» = «uniqueVar("previousValue")» != null - && «uniqueVar("previousValue")».«EcoreCraftingUtil.stringGetter(p)» != null - && «uniqueVar("previousValue")».«EcoreCraftingUtil.stringGetter(p)».equals(«uniqueVar("content")»); - «ELSE» - boolean «uniqueVar("noChange")» = «uniqueVar("previousValue")» != null - && «uniqueVar("previousValue")».«EcoreCraftingUtil.stringGetter(p)» == «uniqueVar("content")»; - «ENDIF» - - - - - «ENDIF» - ««« end collection/single - - - - if («uniqueVar("noChange")») { - newState.«EcoreCraftingUtil.stringGetter(refGlobalToState)».add(«uniqueVar("previousValue")»); - - } // Else we create one - else { - changed = true; - «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; - - - - ««« Case collection - ««« TODO: handle collections of datatypes! - «IF p.many» - - «IF p instanceof EReference» - newValue.«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)»)); - «ELSE» - newValue.«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - - ««« Case single - «ELSE» - - newValue.«EcoreCraftingUtil.stringSetter(p, uniqueVar("content"))»; - - - «ENDIF» - ««« end collection/Single - - tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)».add(newValue); - newState.«EcoreCraftingUtil.stringGetter(refGlobalToState)».add(newValue); - } - - «ENDFOR» - } - «ENDFOR» - } - - boolean createNewState = lastState == null || (!onlyIfChange || changed); - if (createNewState) { - - final «getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» currentStep = context.peekFirst(); - if (currentStep != null && currentStep instanceof «getJavaFQN(TracePackage.eINSTANCE.bigStep)») { - final «getJavaFQN(traceability.traceMMExplorer.stateClass)» startingState = lastState; - final «getJavaFQN(traceability.traceMMExplorer.stateClass)» endingState = newState; - addImplicitStep(currentStep, startingState, endingState); - } - - lastState = newState; - traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_TraceToStates)».add(lastState); - } - - // Undoing the new state created for nothing - else { - - newState.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_StateToStep_started)».clear(); - newState.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_StateToStep_ended)».clear(); - - «FOR p : traceability.allMutableProperties.sortBy[FQN]» - «val EReference tuple = traceability.getStateClassToValueClass(p)» - newState.«EcoreCraftingUtil.stringGetter(tuple)».clear(); - «ENDFOR» - } - - return createNewState; - - }''' -} - -private def String generateGoToMethods() { - return ''' - @Override - public void goTo(EObject state) { - - if (state instanceof «getJavaFQN(traceability.traceMMExplorer.stateClass)») { - «getJavaFQN(traceability.traceMMExplorer.stateClass)» stateToGo = («getJavaFQN( - traceability.traceMMExplorer.stateClass)») state; - - «FOR p : traceability.allMutableProperties.sortBy[FQN]» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass stateClass = ptrace.getEType as EClass» - - for («getJavaFQN(stateClass)» value : stateToGo.«EcoreCraftingUtil.stringGetter( - TraceMMStrings.ref_createGlobalToState(stateClass))») { - - - ««« Case in which we can use the "originalObject" reference and simply set its values - «IF p.eContainer instanceof ClassExtension» - - ««« We have to test at runtime because we can't know at design time the type of the object containing the property - ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. - «FOR concreteSubType : getConcreteSubtypesTraceClassOf(ptrace.getEContainingClass).sortBy[name]» - if (value.«EcoreCraftingUtil.stringGetter("parent")» instanceof «getJavaFQN(concreteSubType)») { - «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» - «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») value.«EcoreCraftingUtil.stringGetter("parent")»; - «IF !origRefs.isEmpty» - «val EReference origRef = origRefs.get(0)» - «IF p.many» - «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(ptrace.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(ptrace.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; - originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); - originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value",p)»); - «ELSE» - «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p)»; - «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter( - origRef)»).«EcoreCraftingUtil.stringGetter(p)»; - if (current != toset) - ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter( - p, "toset")»; - «ENDIF» - «ENDIF» - - } - «ENDFOR» - - ««« Case in which we have to recreate/restore execution objects in the model - «ELSEIF p.eContainer instanceof EClass» - «getJavaFQN(p.EContainingClass)» exeObject = («getJavaFQN(p.EContainingClass)») «getTracedToExeMethodName»(value.getParent()); - «IF p.many» - exeObject.«EcoreCraftingUtil.stringGetter(p)».clear(); - - «IF p instanceof EReference» - exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) «getTracedToExeMethodName»(value.«EcoreCraftingUtil.stringGetter(p)»)); - «ELSE» - exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) value.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - «ELSE» - exeObject.«EcoreCraftingUtil.stringSetter(p, stringGetterExeValue("value",p))»; - «ENDIF» - - «ENDIF» - - - - } - - - - «ENDFOR» - } else { - goToValue(state); - } - } - - @Override - public void goTo(int stepNumber) { - «getJavaFQN(traceability.traceMMExplorer.getStateClass)» stateToGo = traceRoot.«EcoreCraftingUtil.stringGetter( - TraceMMStrings.ref_TraceToStates)».get(stepNumber); - goTo(stateToGo); - } - - private void goToValue(EObject value) { - Object states = emfGet(value, "states"); - if (states != null) { - if (states instanceof List) { - // We get the first state in which this value existed - Object state = ((List) states).get(0); - if (state instanceof «getJavaFQN(traceability.traceMMExplorer.getStateClass)») { - goTo((«getJavaFQN(traceability.traceMMExplorer.getStateClass)») state); - } - } - } - }''' -} - -private def String generateGenericEMFHelperMethods() { - return ''' - @SuppressWarnings("unchecked") - private static void emfAdd(EObject o, String property, Object value) { - for (EReference r : o.eClass().getEAllReferences()) { - if (r.getName().equalsIgnoreCase(property)) { - Object coll = o.eGet(r); - if (coll instanceof Collection) { - ((Collection) coll).add(value); - return; - } - } - } - } - - private static Object emfGet(EObject o, String property) { - for (EReference r : o.eClass().getEAllReferences()) { - if (r.getName().equalsIgnoreCase(property)) { - return o.eGet(r); - } - } - return null; - }''' -} - -private def String generateAddStepMethods() { - return ''' - - @Override - public void addStep(String stepRule, Map params) { - addStep(stepRule, params, this.getTraceSize()-1); - } - - «««TODO how to get the parameters of the operation call? Not possible with current gemoc - private void addStep(String stepRule, Map params, int stateIndex) { - - «getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» toPush = null; - - if (stateIndex >= 0) { - - «getJavaFQN(traceability.traceMMExplorer.stateClass)» state = this.traceRoot.getStatesTrace().get(stateIndex); - - - «val stepRules = traceability.mmext.rules» - «IF !stepRules.empty» - «FOR stepRule : stepRules.sortBy[baseFQN] SEPARATOR "else"» - «val stepCallerClass = stepRule.containingClass» - «val possibleCallerClasses = abstractSyntax.EClassifiers - .filter[c|c instanceof EClass] - .map[c|c as EClass] - .filter[c|c.equals(stepCallerClass)||c.EAllSuperTypes.contains(stepCallerClass)] - .toSet» - - «val EClass stepClass = traceability.getStepClassFromStepRule(stepRule)» - «val String varName = stepClass.name.toFirstLower.replace(" ", "") + "Instance"» - «IF possibleCallerClasses.empty» - if (stepRule.equalsIgnoreCase("«getBaseFQN(stepRule)»")) { - «ELSE» - if ( - «FOR possibleCallerClass: possibleCallerClasses.sortBy[name] SEPARATOR " || "» - stepRule.equalsIgnoreCase("«getActualFQN(possibleCallerClass, stepRule)»") - «ENDFOR» - ) { - «ENDIF» - // First we create the step - «getJavaFQN(stepClass)» «varName» = «EcoreCraftingUtil.stringCreate(stepClass)»; - «varName».«EcoreCraftingUtil.stringSetter(TraceMMStrings.ref_StepToState_starting, "state")»; - - if (!context.isEmpty() && context.getFirst() != null){ - emfAdd(context.getFirst(), "«StepStrings.ref_BigStepToSub»", «varName»); - } else { - traceRoot.getRootStep().getSubSteps().add(«varName»); - } - toPush = «varName»; - - ««« TODO if we want to use this method in the context of gemoc, need to fill the MSEOccurrence params with those from here - «IF !gemoc» - ««« TODO rely on information in Rule instead of the structural features? - «val properties = stepClass.EAllStructuralFeatures.filter[f| - !TracePackage.eINSTANCE.smallStep.EStructuralFeatures.contains(f) && - !TracePackage.eINSTANCE.bigStep.EStructuralFeatures.contains(f) && - !traceability.traceMMExplorer.getSpecificStepClass.EStructuralFeatures.contains(f) && - !f.name.equals(StepStrings.ref_BigStepToSub) - && !f.EContainingClass.name.equals("MSEOccurrence")]» - «IF !properties.empty» - if (params != null) { - for (String k : params.keySet()) { - - switch(k) { - «FOR p : properties.sortBy[name]» - case "«p.name»": - Object «uniqueVar("v")» = params.get(k); - «val type = getEventParamRuntimeType(p)» - if («uniqueVar("v")» instanceof «getJavaFQN(type)») - «IF type == p.EType» - «varName».«EcoreCraftingUtil.stringSetter(p, "(" + getJavaFQN(p.EType) + ")"+uniqueVar("v"))»; - «ELSE» - «varName».«EcoreCraftingUtil.stringSetter(p, "(" + getJavaFQN(p.EType) + ")exeToTraced.get("+uniqueVar("v"+")"))»; - «ENDIF» - - break; - - «incVar("v")» - «ENDFOR» - } - } - } - «ENDIF» - «ENDIF» - - // Then we add it to its trace - this.traceRoot.«EcoreCraftingUtil.stringGetter(traceability.getStepSequence(stepClass))».add(«varName»); - } - «ENDFOR» - - - «ENDIF» - - } - - context.push(toPush); - - } - - private void addImplicitStep(«getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» currentStep, - «getJavaFQN(traceability.traceMMExplorer.stateClass)» startingState, - «getJavaFQN(traceability.traceMMExplorer.stateClass)» endingState) { - - «IF !stepRules.empty && !traceability.bigStepClasses.empty» - «getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» implicitStep = null; - «FOR bigStepClass : traceability.bigStepClasses.sortBy[name] SEPARATOR "else"» - if (currentStep instanceof «getJavaFQN(bigStepClass)») { - implicitStep = «EcoreCraftingUtil.stringCreateImplicitStep(bigStepClass)»; - } - «ENDFOR» - if (implicitStep != null) { - implicitStep.setStartingState(startingState); - implicitStep.setEndingState(endingState); - emfAdd(currentStep, "subSteps", implicitStep); - } - «ENDIF» - } - - «IF gemoc» - @Override - public boolean addStep(fr.inria.diverse.trace.commons.model.trace.MSEOccurrence mseOccurrence) { - - «getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» step = null; - - if (mseOccurrence != null && mseOccurrence instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)») { - - step = («getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)») mseOccurrence; - - if (mseModel == null) { - mseModel = fr.inria.diverse.trace.commons.model.trace.MseFactory.eINSTANCE.createMSEModel(); - traceResource.getContents().add(mseModel); - } - - mseModel.getOwnedMSEs().add(step.getMseoccurrence().getMse()); - - // Creating generic (or almost generic) links - «getJavaFQN(traceability.traceMMExplorer.stateClass)» state = this.traceRoot.getStatesTrace().get(this.getTraceSize()-1); - step.setStartingState(state); - if (!context.isEmpty() && context.getFirst() != null) { - emfAdd(context.getFirst(), "subSteps", step); - } else { - traceRoot.getRootStep().getSubSteps().add(step); - } - - // Adding step in its dedicated sequence/dimension - «IF !stepRules.empty» - «FOR stepRule : stepRules.sortBy[baseFQN] SEPARATOR "else"» - «val EClass stepClass = traceability.getStepClassFromStepRule(stepRule)» - «val String varName = stepClass.name.toFirstLower.replace(" ", "") + "Instance"» - if (step instanceof «getJavaFQN(stepClass)») { - «getJavaFQN(stepClass)» «varName» = («getJavaFQN(stepClass)») step; - this.traceRoot.«EcoreCraftingUtil.stringGetter(traceability.getStepSequence(stepClass))».add(«varName»); - } - «ENDFOR» - «ENDIF» - } - context.push(step); - - return (step != null); - } - - «ENDIF» - - - @Override - public void endStep(String stepRule, Object returnValue) { - «getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» popped = context.pop(); - if (popped != null) - popped.«EcoreCraftingUtil.stringSetter(TraceMMStrings.ref_StepToState_ending, "lastState")»; - }''' -} - - private def String generateInitAndSaveTraceMethods() { - return ''' - - @Override - public void initTrace() { - // Create root - this.traceRoot = «EcoreCraftingUtil.stringCreate(traceability.traceMMExplorer.getSpecificTraceClass)»; - - // Put in the resource - traceResource.getContents().add(traceRoot); - - // Initializing the map exeobject -> tracedobject - this.exeToTraced = new HashMap(); - } - - public void loadTrace(«getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)» traceRoot) { - this.traceRoot = traceRoot; - this.exeToTraced = new HashMap(); - «FOR mutClass : traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name]» - «val traced = traceability.getTracedClass(mutClass)» - for («getJavaFQN(traced)» tracedObject : traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))») { - «FOR p : getAllMutablePropertiesOf(mutClass).sortBy[FQN]» - «val EReference ptrace = traceability.getTraceOf(p)» - traces.add(new GenericValueTrace(tracedObject.«EcoreCraftingUtil.stringGetter(ptrace)», this)); - «ENDFOR» - } - «ENDFOR» - } - - @Override - public void save() { - try { - traceResource.save(null); - } catch (java.io.IOException e) { - e.printStackTrace(); - } - } - - @Override - public void save(URI uri) { - try { - traceResource.setURI(uri); - traceResource.save(null); - } catch (java.io.IOException e) { - e.printStackTrace(); - } - } - ''' - } - - private def String generateGetDescriptionMethods() { - return ''' - - @Override - public String getDescriptionOfExecutionState(int index) { - StringBuilder result = new StringBuilder(); - «getJavaFQN(traceability.traceMMExplorer.getStateClass)» gs = traceRoot.«EcoreCraftingUtil.stringGetter( - TraceMMStrings.ref_TraceToStates)».get(index); - - «FOR p : traceability.allMutableProperties.sortBy[FQN]» - «val EReference refGlobalToState = traceability.getStateClassToValueClass(p)» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass stateClass = ptrace.getEType as EClass» - - if (!gs.«EcoreCraftingUtil.stringGetter(refGlobalToState)».isEmpty()) - result.append("\n«p.name.toFirstUpper» values:"); - for («getJavaFQN(stateClass)» currentState : gs.«EcoreCraftingUtil.stringGetter(refGlobalToState)») { - «IF p.many» - String d = ""; - List<«getTracedJavaFQN(p.EType,true)»> l = currentState.«EcoreCraftingUtil.stringGetter(p)»; - int s = l.size(); - for (int i=0;i0) { - d += l.get(s-1).toString(); - } - result.append("\n\t" + "["+d+"]"); - «ELSE» - result.append("\n\t" + currentState.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - } - «ENDFOR» - - if (!gs.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_StateToStep_started)».isEmpty()) { - result.append("\n\nStarting steps: "); - for («getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» m : gs.«EcoreCraftingUtil.stringGetter( - TraceMMStrings.ref_StateToStep_started)») { - result.append("\n\t" + m.eClass().getName()); - if (m.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_StepToState_ending)» != null) { - result.append(" (ends at state "+ traceRoot.getStatesTrace().indexOf(m.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_StepToState_ending)») +")"); - } - } - } - - result.deleteCharAt(0); - return result.toString(); - } - - @Override - public String getDescriptionOfValue(EObject value) { - «FOR p : traceability.allMutableProperties.sortBy[FQN] SEPARATOR " else " AFTER " else "» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass stateClass = ptrace.getEType as EClass» - if (value instanceof «getJavaFQN(stateClass)») { - return "«getJavaFQN(stateClass)»: "+ ((«getJavaFQN(stateClass)»)value).«EcoreCraftingUtil.stringGetter(p)»; - } - «ENDFOR» - return "ERROR"; - } - - @Override - public Object getContainedValue(EObject value) { - «FOR p : traceability.allMutableProperties.sortBy[FQN] SEPARATOR " else " AFTER " else "» - «val EReference ptrace = traceability.getTraceOf(p)» - «val EClass stateClass = ptrace.getEType as EClass» - if (value instanceof «getJavaFQN(stateClass)») { - return ((«getJavaFQN(stateClass)»)value).«EcoreCraftingUtil.stringGetter(p)»; - } - «ENDFOR» - return null; - } - - ''' - } - - private def String generateStateQueryMethods() { - return ''' - @Override - public EObject getExecutionState(int index) { - return traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_TraceToStates)».get(index); - } - - - @Override - public int getTraceSize() { - return traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_TraceToStates)».size(); - } - - - - @Override - public int getNumberOfValueTraces() { - return traces.size(); - } - - @Override - public Set getAllCurrentValues(int stateIndex) { - «getJavaFQN(traceability.traceMMExplorer.getStateClass)» currentState = this.traceRoot.getStatesTrace().get(stateIndex); - // We find all current values - Set currentValues = new HashSet(); - if (currentState != null) { - «FOR p : traceability.allMutableProperties.sortBy[FQN]» - «val EReference refGlobalToState = traceability.getStateClassToValueClass(p)» - currentValues.addAll(currentState.«EcoreCraftingUtil.stringGetter(refGlobalToState)»); - «ENDFOR» - } - return currentValues; - } - - public List getAllValueTraces() { - return traces; - } - - @Override - public int getStateOrValueIndex(EObject stateOrValue) { - int idx = traceRoot.getStatesTrace().indexOf(stateOrValue); - if (idx == -1) { - final Object states = emfGet(stateOrValue, "states"); - if (states != null) { - if (states instanceof List) { - // We get the first state in which this value existed - Object valueState = ((List) states).get(0); - if (valueState instanceof «getJavaFQN(traceability.traceMMExplorer.getStateClass)») { - idx = traceRoot.getStatesTrace().indexOf(valueState); - } - } - } - } - return idx; - }''' - } - - private def String generateStepQueryMethods() { - return ''' - @Override - public String currentBigStep() { - if(!context.isEmpty() && context.getFirst() != null) - return context.getFirst().eClass().getName(); - else - return null; - } - - @Override - public List getStepsForStates( - int startingState, int endingState) { - Predicate predicate = (s) -> { - final int stepStartingState = s.getStartingIndex(); - final int stepEndingState = s.getEndingIndex(); - return (stepEndingState == -1 || stepEndingState >= startingState) && stepStartingState <= endingState; - }; - return traceRoot.getRootStep().getSubSteps().stream() - .map(s -> createLazyGenericStep(s, null, predicate)) - .filter(predicate) - .collect(Collectors.toList()); - } - - @SuppressWarnings("unchecked") - private List generateSubSteps(«getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» step, - fr.inria.diverse.trace.api.IStep parent) { - - final List<«getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)»> subSteps = (List<«getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)»>) emfGet(step, "subSteps"); - final List result = new ArrayList<>(); - - if (subSteps != null && !subSteps.isEmpty()) { - for («getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» subStep : subSteps) { - result.add(createLazyGenericStep(subStep,parent)); - } - } - - return result; - } - - private fr.inria.diverse.trace.api.IStep createLazyGenericStep( - «getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» step, - fr.inria.diverse.trace.api.IStep parent) { - return createLazyGenericStep(step, parent, null); - } - - private fr.inria.diverse.trace.api.IStep createLazyGenericStep(«getJavaFQN(traceability.traceMMExplorer.getSpecificStepClass)» step, fr.inria.diverse.trace.api.IStep parent, Predicate predicate) { - fr.inria.diverse.trace.api.IStep result = null; - - «FOR Rule r : this.traceability.mmext.rules.sortBy[baseFQN] SEPARATOR "else" » - «val stepClass = this.traceability.getStepClassFromStepRule(r)» - if (step instanceof «getJavaFQN(stepClass)») { - «getJavaFQN(stepClass)» step_cast = («getJavaFQN(stepClass)») step; - int startIndex = this.traceRoot.getStatesTrace().indexOf(step.getStartingState()); - int endIndex = this.traceRoot.getStatesTrace().indexOf(step.getEndingState()); - - result = new fr.inria.diverse.trace.api.impl.PartiallyLazyGenericStep("«getJavaFQN(r.containingClass)»", "«r.operation.name»", startIndex, endIndex, parent,(s)->generateSubSteps(step_cast,s),predicate); - «IF r.containingClass != null» - result.addParameter("caller", (step_cast.getCaller())); - «ENDIF» - result.addParameter("this", step); - - «FOR a : r.operation.EParameters» - ««« TODO - «ENDFOR» - } - «ENDFOR» - «FOR implicitStepClass : this.traceability.implicitStepClasses.sortBy[name]» - else if (step instanceof «getJavaFQN(implicitStepClass)») { - int startIndex = this.traceRoot.getStatesTrace().indexOf(step.getStartingState()); - int endIndex = this.traceRoot.getStatesTrace().indexOf(step.getEndingState()); - - result = new fr.inria.diverse.trace.api.impl.GenericStep("«getJavaFQN(traceability.getImplicitStepContainingClass(implicitStepClass))»", "implicitStep",startIndex,endIndex,parent,new ArrayList<>()); - result.addParameter("this", step); - } - «ENDFOR» - - return result; - } - - ''' - } - - - private def String generateIsPartialTraceManager() { - return ''' - @Override - public boolean isPartialTraceManager() { - return «partialTraceManagement»; - } - ''' - } - - private def String generateSetTraceRoot() { - return - ''' - @Override - public void setTraceRoot(EObject object) { - if (object instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») { - traceRoot = («getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») object; - } - } - ''' - } - - private def String generateTraceManagerClass() { - return '''package «packageQN»; - - «generateImports» - -public class «className» implements «IF gemoc» fr.inria.diverse.trace.gemoc.api.IGemocTraceManager «ELSE» ITraceManager «ENDIF»{ - - «generateFields» - «generateConstructor» - «IF gemoc» - «generateAddInitialStateMethod» - «generateAddNewObjectToStateMethods» - «generateAddStateUsingListenerMethods» - «ELSE» - «generateAddStateMethods» - «ENDIF» - «generateAddStepMethods» - «generateGoToMethods» - «generateInitAndSaveTraceMethods» - «generateGetDescriptionMethods» - «generateStoreAsTracedMethods» - «generateGenericEMFHelperMethods» - «generateStateQueryMethods» - «generateStepQueryMethods» - «generateGetAllResourcesMethod» - «generateExeToFromTracedGenericMethods» - «generateIsPartialTraceManager» - «generateSetTraceRoot» -} - ''' - - - } - -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend index 6cca7a65d..9bdec70b2 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend @@ -34,8 +34,8 @@ class TraceNotifierGeneratorJava { this.traceability = traceability this.refGenPackages = refGenPackages - stateFQN = getJavaFQN(traceability.traceMMExplorer.stateClass) - valueFQN = getJavaFQN(traceability.traceMMExplorer.valueClass) + stateFQN = getJavaFQN(traceability.traceMMExplorer.getSpecificStateClass) + valueFQN = getJavaFQN(traceability.traceMMExplorer.getSpecificValueClass) specificStepFQN = getJavaFQN(traceability.traceMMExplorer.specificStepClass) } @@ -78,6 +78,10 @@ class TraceNotifierGeneratorJava { import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange; + import fr.inria.diverse.trace.commons.model.trace.Dimension; + import fr.inria.diverse.trace.commons.model.trace.State; + import fr.inria.diverse.trace.commons.model.trace.Step; + import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceListener; import fr.inria.diverse.trace.gemoc.api.ITraceNotifier; ''' @@ -115,11 +119,11 @@ class TraceNotifierGeneratorJava { public void notifyListener(ITraceListener listener) { final List changes = traceListener.getChanges(listener); if (!changes.isEmpty()) { - final List startedSteps = new ArrayList<>(); - final List endedSteps = new ArrayList<>(); - final List newStates = new ArrayList<>(); - final List newValues = new ArrayList<>(); - final List> newDimensions = new ArrayList<>(); + final List startedSteps = new ArrayList<>(); + final List endedSteps = new ArrayList<>(); + final List newStates = new ArrayList<>(); + final List newValues = new ArrayList<>(); + final List> newDimensions = new ArrayList<>(); changes.forEach(c -> { if (c instanceof NewObjectModelChange) { final EObject o = c.getChangedObject(); @@ -137,8 +141,8 @@ class TraceNotifierGeneratorJava { «IF !mutProps.empty» } else if (o instanceof «getJavaFQN(traced)») { «FOR p : mutProps» - «val EReference ptrace = traceability.getTraceOf(p)» - newDimensions.add(((«getJavaFQN(traced)») o).«EcoreCraftingUtil.stringGetter(ptrace)»); + «val EReference pdimension = traceability.getDimensionRef(p)» + newDimensions.add(((«getJavaFQN(traced)») o).«EcoreCraftingUtil.stringGetter(pdimension)»); «ENDFOR» «ENDIF» «ENDFOR» diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index 208f6ee8f..8586246ed 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -21,13 +21,18 @@ import org.eclipse.emf.ecore.EObject; +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; +import fr.inria.diverse.trace.commons.model.trace.GenericTrace; +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StateWrapper; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StepWrapper; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.ValueWrapper; import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; @@ -144,6 +149,8 @@ public class MultidimensionalTimelineRenderer extends Pane implements ITraceView private static final int CURRENT_BIGSTEP = 2; private Consumer> displayMenu = null; + + private Trace, TracedObject>, State> trace; public MultidimensionalTimelineRenderer() { headerPane = new VBox(); @@ -415,13 +422,13 @@ private String computeStateLabel(int stateNumber) { } } - private void fillStateLine(HBox line, List stateWrappers, int selectedState) { + private void fillStateLine(HBox line, List stateWrappers, int selectedState) { final Color currentColor = Color.CORAL; final Color otherColor = Color.SLATEBLUE; final int height = DIAMETER; final int width = DIAMETER; final int currentStateIndex = Math.max(0, currentState.intValue()); - final int diff = stateWrappers.isEmpty() ? 0 : currentStateIndex - stateWrappers.get(0).stateIndex; + final int diff = stateWrappers.isEmpty() ? 0 : currentStateIndex - traceExtractor.getStateIndex(stateWrappers.get(0)); final List> colorGroups = stateColoration ? computeColorGroups(stateWrappers) : Collections.emptyList(); @@ -450,13 +457,14 @@ private void fillStateLine(HBox line, List stateWrappers, int sele line.setTranslateX(-(UNIT * diff)); } - for (StateWrapper stateWrapper : stateWrappers) { + for (State stateWrapper : stateWrappers) { + final int stateIndex = traceExtractor.getStateIndex(stateWrapper); final Rectangle rectangle; - if (selectedState == stateWrapper.stateIndex) { + if (selectedState == stateIndex) { rectangle = new Rectangle(width, height, currentColor); } else { if (stateColoration && !colorPalette.isEmpty()) { - final int idx = stateToColor[stateWrapper.stateIndex % stateToColor.length]; + final int idx = stateToColor[stateIndex % stateToColor.length]; if (idx != -1) { rectangle = new Rectangle(width, height, colorPalette.get(idx)); } else { @@ -469,14 +477,14 @@ private void fillStateLine(HBox line, List stateWrappers, int sele rectangle.setArcHeight(height); rectangle.setArcWidth(width); - rectangle.setUserData(stateWrapper.state); + rectangle.setUserData(stateWrapper); rectangle.addEventHandler(MouseEvent.MOUSE_CLICKED, (e) -> { if (e.getClickCount() > 1 && e.getButton() == MouseButton.PRIMARY) { Object o = rectangle.getUserData(); traceExplorer.jump((EObject) o); } if (e.getClickCount() == 1 && e.getButton() == MouseButton.SECONDARY) { - lastClickedState = stateWrapper.stateIndex; + lastClickedState = stateIndex; final List enabledItems = new ArrayList<>(); enabledItems.add(stateWrapper.breakable); enabledItems.add(true); @@ -486,10 +494,10 @@ private void fillStateLine(HBox line, List stateWrappers, int sele displayGridBinding = displayGridBinding.or(rectangle.hoverProperty()); - final String s = traceExtractor.getStateDescription(stateWrapper.stateIndex); + final String s = traceExtractor.getStateDescription(stateIndex); final Tooltip t = new Tooltip(s); Tooltip.install(rectangle, t); - Label text = new Label(computeStateLabel(stateWrapper.stateIndex)); + Label text = new Label(computeStateLabel(stateIndex)); text.setTextOverrun(OverrunStyle.ELLIPSIS); text.setAlignment(Pos.CENTER); text.setMouseTransparent(true); @@ -509,7 +517,7 @@ private void fillStateLine(HBox line, List stateWrappers, int sele } } - private void fillValueLine(HBox line, int idx, List valueWrappers, int selectedState) { + private void fillValueLine(HBox line, int idx, List valueWrappers, int selectedState) { final Color currentColor = Color.DARKORANGE; final Color otherColor = Color.DARKBLUE; final int height = V_HEIGHT; @@ -525,26 +533,30 @@ private void fillValueLine(HBox line, int idx, List valueWrappers, line.setTranslateX(-(UNIT * diff)); } - for (ValueWrapper valueWrapper : valueWrappers) { - if (valueWrapper.firstStateIndex > stateIndex) { + for (Value valueWrapper : valueWrappers) { + final int firstStateIndex = traceExtractor.getValueFirstStateIndex(valueWrapper); + final int lastStateIndex = traceExtractor.getValueLastStateIndex(valueWrapper); + + + if (firstStateIndex > stateIndex) { // When the first visible value starts after the first state, // we fill the space with a transparent rectangle. - int width = DIAMETER + UNIT * (valueWrapper.firstStateIndex - stateIndex - 1); + int width = DIAMETER + UNIT * (firstStateIndex - stateIndex - 1); final Rectangle rectangle = new Rectangle(width, height, Color.TRANSPARENT); line.getChildren().add(rectangle); HBox.setMargin(rectangle, MARGIN_INSETS); } final Rectangle rectangle; - final int width = DIAMETER + UNIT * (valueWrapper.lastStateIndex - valueWrapper.firstStateIndex); - if (selectedState >= valueWrapper.firstStateIndex && selectedState <= valueWrapper.lastStateIndex) { + final int width = DIAMETER + UNIT * (lastStateIndex - firstStateIndex); + if (selectedState >= firstStateIndex && selectedState <= lastStateIndex) { rectangle = new Rectangle(width, height, currentColor); } else { rectangle = new Rectangle(width, height, otherColor); } rectangle.setArcHeight(height); rectangle.setArcWidth(DIAMETER / 2); - rectangle.setUserData(valueWrapper.value); + rectangle.setUserData(valueWrapper); rectangle.addEventHandler(MouseEvent.MOUSE_CLICKED, (e) -> { if (e.getClickCount() > 1 && e.getButton() == MouseButton.PRIMARY) { Object o = rectangle.getUserData(); @@ -554,19 +566,21 @@ private void fillValueLine(HBox line, int idx, List valueWrappers, displayGridBinding = displayGridBinding.or(rectangle.hoverProperty()); - final String s = traceExtractor.getValueDescription(idx, valueWrapper.firstStateIndex); + final String s = traceExtractor.getValueDescription(idx, firstStateIndex); final Tooltip t = new Tooltip(s); Tooltip.install(rectangle, t); line.getChildren().add(rectangle); HBox.setMargin(rectangle, MARGIN_INSETS); - stateIndex = valueWrapper.lastStateIndex + 1; + stateIndex = lastStateIndex + 1; } } - private NumberExpression createSteps(StepWrapper stepWrapper, int depth, int currentStateStartIndex, + private NumberExpression createSteps(Step stepWrapper, int depth, int currentStateStartIndex, int selectedStateIndex, List accumulator, Object[] stepTargets) { + final int startingIndex = stepWrapper. + final boolean endedStep = stepWrapper.endingIndex != -1; final int stepStartingIndex = stepWrapper.startingIndex; @@ -596,7 +610,7 @@ private NumberExpression createSteps(StepWrapper stepWrapper, int depth, int cur NumberExpression yOffset = new SimpleDoubleProperty(0); if (subSteps != null && !subSteps.isEmpty()) { for (Step subStep : subSteps) { - final StepWrapper subStepWrapper = traceExtractor.getStepWrapper(subStep); + final Step subStepWrapper = traceExtractor.getStepWrapper(subStep); if (subStepWrapper.startingIndex != subStepWrapper.endingIndex) { yOffset = Bindings.max(yOffset, createSteps(subStepWrapper, depth + 1, currentStateStartIndex, selectedStateIndex, accumulator, stepTargets)); @@ -606,17 +620,15 @@ private NumberExpression createSteps(StepWrapper stepWrapper, int depth, int cur lineTo.yProperty().bind(yOffset.add(DIAMETER / 2 + V_MARGIN)); - final Step step = stepWrapper.step; - - if (stepTargets[CURRENT_FORWARD_STEP] == step) { + if (stepTargets[CURRENT_FORWARD_STEP] == stepWrapper) { path.setStroke(Color.DARKORANGE); - } else if (stepTargets[CURRENT_BACKWARD_STEP] == step) { + } else if (stepTargets[CURRENT_BACKWARD_STEP] == stepWrapper) { path.setStroke(Color.DARKGREEN); - } else if (stepTargets[CURRENT_BIGSTEP] == step) { + } else if (stepTargets[CURRENT_BIGSTEP] == stepWrapper) { path.setStroke(Color.DARKRED); } else { path.setStroke(Color.DARKBLUE); - if (!traceExplorer.getCallStack().contains(step) && (stepStartingIndex > selectedStateIndex + if (!traceExplorer.getCallStack().contains(stepWrapper) && (stepStartingIndex > selectedStateIndex || (stepStartingIndex == selectedStateIndex && endedStep))) { path.getStrokeDashArray().addAll(5., 5.); path.setStrokeLineCap(StrokeLineCap.ROUND); @@ -689,7 +701,7 @@ protected boolean computeValue() { // ---------------- Steps creation - final List rootSteps = traceExtractor.getStepWrappers(currentStateStartIndex - 1, + final List rootSteps = traceExtractor.getStepWrappers(currentStateStartIndex - 1, currentStateEndIndex + 1); final List steps = new ArrayList<>(); @@ -709,7 +721,7 @@ protected boolean computeValue() { stepTargets[CURRENT_BIGSTEP] = tmp; } - for (StepWrapper stepWrapper : rootSteps) { + for (Step stepWrapper : rootSteps) { if (stepWrapper.startingIndex != stepWrapper.endingIndex) { createSteps(stepWrapper, 0, currentStateStartIndex, selectedStateIndex, steps, stepTargets); } @@ -811,8 +823,8 @@ public Supplier getLastClickedStateSupplier() { return lastClickedStateSupplier; } - private List> computeColorGroups(List stateWrappers) { - final Map eObjectToWrapper = new HashMap<>(); + private List> computeColorGroups(List stateWrappers) { + final Map eObjectToWrapper = new HashMap<>(); final List states = stateWrappers.stream() .map(w -> { eObjectToWrapper.put(w.state, w); From d66587750f700592804839f581e84bd7ce4af72d Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Tue, 24 Jan 2017 09:22:39 +0100 Subject: [PATCH 081/267] Fixing header copyright (in both java and xtend files) --- .../ui/debug/AnnotationMutableFieldExtractor.xtend | 12 +++++++++++- .../debug/IntrospectiveMutableFieldExtractor.xtend | 12 +++++++++++- .../engine/ui/debug/MutableFieldNameProvider.xtend | 12 +++++++++++- ...tractCommandBasedSequentialExecutionEngine.xtend | 12 +++++++++++- .../engine/core/SequentialExecutionException.xtend | 12 +++++++++++- .../src/gemoc_execution_trace/Branch.java | 13 +++++++++++-- .../src/gemoc_execution_trace/Choice.java | 10 ++++++++++ .../src/gemoc_execution_trace/ContextState.java | 10 ++++++++++ .../gemoc_execution_trace/ExecutionTraceModel.java | 10 ++++++++++ .../Gemoc_execution_traceFactory.java | 10 ++++++++++ .../Gemoc_execution_tracePackage.java | 10 ++++++++++ .../src/gemoc_execution_trace/ModelState.java | 10 ++++++++++ .../src/gemoc_execution_trace/SolverState.java | 10 ++++++++++ .../src/gemoc_execution_trace/impl/BranchImpl.java | 10 ++++++++++ .../src/gemoc_execution_trace/impl/ChoiceImpl.java | 10 ++++++++++ .../impl/ContextStateImpl.java | 10 ++++++++++ .../impl/ExecutionTraceModelImpl.java | 10 ++++++++++ .../impl/Gemoc_execution_traceFactoryImpl.java | 10 ++++++++++ .../impl/Gemoc_execution_tracePackageImpl.java | 10 ++++++++++ .../gemoc_execution_trace/impl/ModelStateImpl.java | 10 ++++++++++ .../gemoc_execution_trace/impl/SolverStateImpl.java | 10 ++++++++++ .../util/Gemoc_execution_traceAdapterFactory.java | 10 ++++++++++ .../util/Gemoc_execution_traceSwitch.java | 10 ++++++++++ .../gemoc_execution_trace/Branch.java | 10 ++++++++++ .../gemoc_execution_trace/Choice.java | 10 ++++++++++ .../gemoc_execution_trace/ContextState.java | 10 ++++++++++ .../gemoc_execution_trace/ExecutionTraceModel.java | 10 ++++++++++ .../Gemoc_execution_traceFactory.java | 10 ++++++++++ .../Gemoc_execution_tracePackage.java | 10 ++++++++++ .../gemoc_execution_trace/ModelState.java | 10 ++++++++++ .../gemoc_execution_trace/SolverState.java | 10 ++++++++++ .../gemoc_execution_trace/impl/BranchImpl.java | 10 ++++++++++ .../gemoc_execution_trace/impl/ChoiceImpl.java | 10 ++++++++++ .../impl/ContextStateImpl.java | 10 ++++++++++ .../impl/ExecutionTraceModelImpl.java | 10 ++++++++++ .../impl/Gemoc_execution_traceFactoryImpl.java | 10 ++++++++++ .../impl/Gemoc_execution_tracePackageImpl.java | 10 ++++++++++ .../gemoc_execution_trace/impl/ModelStateImpl.java | 10 ++++++++++ .../gemoc_execution_trace/impl/SolverStateImpl.java | 10 ++++++++++ .../util/Gemoc_execution_traceAdapterFactory.java | 10 ++++++++++ .../util/Gemoc_execution_traceSwitch.java | 10 ++++++++++ .../OmniscientGenericSequentialModelDebugger.xtend | 12 +++++++++++- .../javaengine/ui/launcher/XtextLocator.java | 10 ++++++++++ .../GemocSequentialPropertyTester.java | 1 - .../sequential/javaxdsml/ide/ui/menu/AddDSA.xtend | 12 +++++++++++- .../.checkstyle | 13 +++++++++++++ .../fr.inria.diverse.trace.commons.model/.project | 6 ++++++ .../trace/commons/model/helper/StepHelper.java | 10 ++++++++++ .../model/trace/AddonExtensionParameter.java | 10 ++++++++++ .../commons/model/trace/AnimatorURIParameter.java | 10 ++++++++++ .../diverse/trace/commons/model/trace/BigStep.java | 10 ++++++++++ .../commons/model/trace/EntryPointParameter.java | 10 ++++++++++ .../trace/commons/model/trace/GenericMSE.java | 10 ++++++++++ .../commons/model/trace/GenericParallelStep.java | 10 ++++++++++ .../commons/model/trace/GenericSequentialStep.java | 10 ++++++++++ .../trace/commons/model/trace/GenericSmallStep.java | 10 ++++++++++ .../trace/InitializationArgumentsParameter.java | 10 ++++++++++ .../model/trace/InitializationMethodParameter.java | 10 ++++++++++ .../commons/model/trace/LanguageNameParameter.java | 10 ++++++++++ .../commons/model/trace/LaunchConfiguration.java | 10 ++++++++++ .../model/trace/LaunchConfigurationParameter.java | 10 ++++++++++ .../diverse/trace/commons/model/trace/MSE.java | 10 ++++++++++ .../diverse/trace/commons/model/trace/MSEModel.java | 10 ++++++++++ .../trace/commons/model/trace/MSEOccurrence.java | 10 ++++++++++ .../commons/model/trace/ModelRootParameter.java | 10 ++++++++++ .../commons/model/trace/ModelURIParameter.java | 10 ++++++++++ .../trace/commons/model/trace/ParallelStep.java | 10 ++++++++++ .../model/trace/RepresentationURIParameter.java | 10 ++++++++++ .../trace/commons/model/trace/SequentialStep.java | 10 ++++++++++ .../trace/commons/model/trace/SmallStep.java | 10 ++++++++++ .../diverse/trace/commons/model/trace/Step.java | 10 ++++++++++ .../diverse/trace/commons/model/trace/Trace.java | 10 ++++++++++ .../trace/commons/model/trace/TraceFactory.java | 10 ++++++++++ .../trace/commons/model/trace/TracePackage.java | 10 ++++++++++ .../trace/impl/AddonExtensionParameterImpl.java | 10 ++++++++++ .../model/trace/impl/AnimatorURIParameterImpl.java | 10 ++++++++++ .../trace/commons/model/trace/impl/BigStepImpl.java | 10 ++++++++++ .../model/trace/impl/EntryPointParameterImpl.java | 10 ++++++++++ .../commons/model/trace/impl/GenericMSEImpl.java | 10 ++++++++++ .../model/trace/impl/GenericParallelStepImpl.java | 10 ++++++++++ .../model/trace/impl/GenericSequentialStepImpl.java | 10 ++++++++++ .../model/trace/impl/GenericSmallStepImpl.java | 10 ++++++++++ .../impl/InitializationArgumentsParameterImpl.java | 10 ++++++++++ .../impl/InitializationMethodParameterImpl.java | 10 ++++++++++ .../model/trace/impl/LanguageNameParameterImpl.java | 10 ++++++++++ .../model/trace/impl/LaunchConfigurationImpl.java | 10 ++++++++++ .../impl/LaunchConfigurationParameterImpl.java | 10 ++++++++++ .../trace/commons/model/trace/impl/MSEImpl.java | 10 ++++++++++ .../commons/model/trace/impl/MSEModelImpl.java | 10 ++++++++++ .../commons/model/trace/impl/MSEOccurrenceImpl.java | 10 ++++++++++ .../model/trace/impl/ModelRootParameterImpl.java | 10 ++++++++++ .../model/trace/impl/ModelURIParameterImpl.java | 10 ++++++++++ .../commons/model/trace/impl/ParallelStepImpl.java | 10 ++++++++++ .../model/trace/impl/SequentialStepImpl.java | 10 ++++++++++ .../commons/model/trace/impl/SmallStepImpl.java | 10 ++++++++++ .../trace/commons/model/trace/impl/StepImpl.java | 10 ++++++++++ .../commons/model/trace/impl/TraceFactoryImpl.java | 10 ++++++++++ .../trace/commons/model/trace/impl/TraceImpl.java | 10 ++++++++++ .../commons/model/trace/impl/TracePackageImpl.java | 10 ++++++++++ .../model/trace/util/TraceAdapterFactory.java | 10 ++++++++++ .../trace/commons/model/trace/util/TraceSwitch.java | 10 ++++++++++ .../diverse/trace/commons/EMFCompareUtil.xtend | 10 ++++++++++ .../inria/diverse/trace/commons/EclipseUtil.xtend | 12 +++++++++++- .../diverse/trace/commons/EcoreCraftingUtil.xtend | 10 ++++++++++ .../commons/ExecutionMetamodelTraceability.xtend | 10 ++++++++++ .../trace/commons/tracemetamodel/StepStrings.xtend | 10 ++++++++++ .../provider/TracingAnnotationsItemProvider.java | 10 ++++++++++ .../provider/TracingannotationsEditPlugin.java | 10 ++++++++++ ...racingannotationsItemProviderAdapterFactory.java | 10 ++++++++++ .../TracingannotationsActionBarContributor.java | 10 ++++++++++ .../presentation/TracingannotationsEditor.java | 10 ++++++++++ .../TracingannotationsEditorPlugin.java | 10 ++++++++++ .../presentation/TracingannotationsModelWizard.java | 10 ++++++++++ .../src/tracingannotations/TracingAnnotations.java | 10 ++++++++++ .../TracingannotationsFactory.java | 10 ++++++++++ .../TracingannotationsPackage.java | 10 ++++++++++ .../impl/TracingAnnotationsImpl.java | 10 ++++++++++ .../impl/TracingannotationsFactoryImpl.java | 10 ++++++++++ .../impl/TracingannotationsPackageImpl.java | 10 ++++++++++ .../util/TracingannotationsAdapterFactory.java | 10 ++++++++++ .../util/TracingannotationsSwitch.java | 10 ++++++++++ ...raceAddonGeneratorIntegrationConfiguration.xtend | 10 ++++++++++ .../GenericEngineTraceAddonGenerator.xtend | 10 ++++++++++ .../generator/TraceAddonGeneratorIntegration.xtend | 10 ++++++++++ ...raceAddonGeneratorIntegrationConfiguration.xtend | 10 ++++++++++ .../trace/gemoc/traceaddon/AbstractTraceAddon.xtend | 10 ++++++++++ .../gemoc/traceaddon/GenericTraceConstructor.java | 10 ++++++++++ .../gemoc/traceaddon/GenericTraceEngineAddon.java | 10 ++++++++++ .../gemoc/traceaddon/GenericTraceExplorer.java | 10 ++++++++++ .../gemoc/traceaddon/GenericTraceExtractor.java | 10 ++++++++++ .../gemoc/traceaddon/GenericTraceStepFactory.java | 10 ++++++++++ 131 files changed, 1308 insertions(+), 11 deletions(-) create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/.checkstyle diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend index 54a49f284..889fd3817 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend @@ -1,4 +1,14 @@ -package org.gemoc.executionframework.engine.ui.debug +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ + package org.gemoc.executionframework.engine.ui.debug import java.text.DecimalFormat import java.text.NumberFormat diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend index 5ed26cec3..8cfc83080 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend @@ -1,4 +1,14 @@ -package org.gemoc.executionframework.engine.ui.debug +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ + package org.gemoc.executionframework.engine.ui.debug import java.util.ArrayList import java.util.Arrays diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/MutableFieldNameProvider.xtend b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/MutableFieldNameProvider.xtend index 0d21aba3b..64e17a93b 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/MutableFieldNameProvider.xtend +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/MutableFieldNameProvider.xtend @@ -1,4 +1,14 @@ -package org.gemoc.executionframework.engine.ui.debug +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ + package org.gemoc.executionframework.engine.ui.debug import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend index 804060947..5319eb3df 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend @@ -1,4 +1,14 @@ -package org.gemoc.executionframework.engine.core +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ + package org.gemoc.executionframework.engine.core import org.eclipse.emf.transaction.RecordingCommand diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend index ab6a465dd..16a52a415 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend @@ -1,4 +1,14 @@ -package org.gemoc.executionframework.engine.core; +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ + package org.gemoc.executionframework.engine.core; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence import org.eclipse.emf.transaction.RollbackException diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Branch.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Branch.java index 7e5a6a641..1dce137b9 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Branch.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Branch.java @@ -1,5 +1,14 @@ -/** - */ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ + package gemoc_execution_trace; import org.eclipse.emf.common.util.EList; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Choice.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Choice.java index cde0e1be3..be136fad1 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Choice.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Choice.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ContextState.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ContextState.java index c16ed0923..b30752fd1 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ContextState.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ContextState.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ExecutionTraceModel.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ExecutionTraceModel.java index 80134897d..92e82675c 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ExecutionTraceModel.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ExecutionTraceModel.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_traceFactory.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_traceFactory.java index 70c3f3fe1..b45d24ea6 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_traceFactory.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_traceFactory.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_tracePackage.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_tracePackage.java index 266b19e24..843018b2a 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_tracePackage.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_tracePackage.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ModelState.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ModelState.java index bc3ea11ed..2d6e2feb6 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ModelState.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ModelState.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/SolverState.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/SolverState.java index e9599f494..caacd982d 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/SolverState.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/SolverState.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/BranchImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/BranchImpl.java index 355cd5154..3af8b232a 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/BranchImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/BranchImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ChoiceImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ChoiceImpl.java index 52f81f84c..5cb4aa7e7 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ChoiceImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ChoiceImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ContextStateImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ContextStateImpl.java index ce609b600..7bcc20f69 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ContextStateImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ContextStateImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java index a6a935835..e864ffbb8 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java index 0b4ec5adf..e2d7a8246 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java index 36fcd0308..4ebe111b0 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ModelStateImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ModelStateImpl.java index 300b9315d..aa962a7b9 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ModelStateImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ModelStateImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/SolverStateImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/SolverStateImpl.java index 9ce5e834a..e22d1cdba 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/SolverStateImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/SolverStateImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java index b243fda12..a3085195f 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace.util; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java index 866137c3e..a9ab09559 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package gemoc_execution_trace.util; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java index 4125fbd4d..0fe4b05da 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java index 4f0347fb0..90313de9e 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java index efb4f9213..c81e80d4d 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java index efef3cb32..a89790a0c 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java index 823a93bb7..d18a2260f 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java index 73fd19fb8..4ded4758a 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java index 2a4655658..f2661287d 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java index fa3864131..196f1d2e1 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java index c4a3b242f..64ffd691d 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java index dd8590414..fbb19a894 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java index 0ee01d923..8fa24baa2 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java index 653bf1611..78cd855d6 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java index 0137b1af9..b079e6fa2 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java index 59fc1efa9..f40e2f7dd 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java index e8d5c6075..ffdcdec59 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java index 1cc67502b..3e46c5a33 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java index 01a9ede92..c214aa446 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.util; diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java index 31f7e2afe..733536b87 100644 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java +++ b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.util; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend index 520ea8930..30b6fece8 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend @@ -1,4 +1,14 @@ -package org.gemoc.execution.sequential.javaengine.ui.debug; +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ + package org.gemoc.execution.sequential.javaengine.ui.debug; import fr.inria.diverse.trace.commons.model.trace.MSE import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java index 2de38eb7a..8dc2015f3 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package org.gemoc.execution.sequential.javaengine.ui.launcher; import org.eclipse.emf.ecore.EObject; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java index b0d5169a7..e4e5a0a79 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java @@ -1,4 +1,3 @@ - /******************************************************************************* * Copyright (c) 2016 Inria and others. * All rights reserved. This program and the accompanying materials diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/menu/AddDSA.xtend b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/menu/AddDSA.xtend index b9e2738ea..0c278f34b 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/menu/AddDSA.xtend +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/menu/AddDSA.xtend @@ -1,4 +1,14 @@ -package org.gemoc.execution.sequential.javaxdsml.ide.ui.menu +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ + package org.gemoc.execution.sequential.javaxdsml.ide.ui.menu import fr.inria.diverse.melange.metamodel.melange.Language import java.util.List diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.checkstyle b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.checkstyle new file mode 100644 index 000000000..2d51ed574 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.checkstyle @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project index b035adff4..712814e81 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project @@ -20,9 +20,15 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java index e3346dd62..5fb1f2bc2 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.commons.model.helper; import java.util.ArrayList; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java index 560e7e910..4af6ddc40 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java index 1a2079167..2aa100873 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java index a107fa20e..b89b5d0a9 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java index b8cc38f5e..2af31f6c7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java index 0cecb477f..8cedbf28a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java index abf74ecc1..6e305c28d 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java index bcaa243a9..e627d21d3 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java index b6ffacb94..d9cbe3a65 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java index ad087250e..2043d1a98 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java index e6cad0b9e..4715e6b04 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java index 34c8086d0..ae2a63e36 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java index fadb3951e..040e2ea77 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java index eade4106d..d94ea4356 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java index 3cb6663af..1fceb18a6 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java index e8dce1532..751d68448 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java index 4a1773fb2..3dd704ecf 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java index 10b4d2ae1..1c78b4fbf 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java index 4e229ac6a..b013c925e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java index 320ef91da..eba7e415d 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/RepresentationURIParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/RepresentationURIParameter.java index 9d7e05acb..d3e6b5360 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/RepresentationURIParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/RepresentationURIParameter.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java index 81c621ead..3a00b51bd 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java index 01d162326..08c08fe9e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java index 323b786e4..d53f5e7d4 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java index f95d7dfa3..15e26e376 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java index fffb8760c..b40fcf9d5 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java index a72c5e786..115fc6386 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java index bc8fefaac..dffa3f11a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java index aafd1ba2b..c55df4cd7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java index 1884c165d..022c9987a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java index 190b3af5b..6fb02dfa7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java index 85e737e50..d8bdeed20 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java index a542606c1..0355969bb 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java index 9e078dcd6..4fd6e7164 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java index f7a3208c7..c2a858d89 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java index c16cf5f04..6ce24eaba 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java index 31b9949e0..47ecd470a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java index 8edf99348..1fe0b2211 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java index c3e3afe44..c93561382 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java index 6e0794083..57f824078 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java index 7be75fa67..df9ad5a00 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java index 4b5ca8752..dff67d1ca 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java index 11e20adba..38215e2c6 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java index c0a1c7711..fd4276813 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java index 7a9f09403..31ebae740 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java index 23e3f79e6..11f33bc76 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java index 3f9c786d8..f5487a55f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java index 50c9c62f1..0230e6b71 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java index 76f348768..a9631be34 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java index f9ebeed3b..958263ed7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java index a2d5669b3..85ca1d82c 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java index 57cc4b52a..15e9038ee 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java index 57f67b3c2..179ae14a0 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.util; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java index 9f44759f2..02b2f8946 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.util; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EMFCompareUtil.xtend b/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EMFCompareUtil.xtend index ca15db3b3..6c9f21095 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EMFCompareUtil.xtend +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EMFCompareUtil.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.commons import org.eclipse.emf.ecore.EObject diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EclipseUtil.xtend b/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EclipseUtil.xtend index 27714b233..cf80e33db 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EclipseUtil.xtend +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EclipseUtil.xtend @@ -1,4 +1,14 @@ -package fr.inria.diverse.trace.commons +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ + package fr.inria.diverse.trace.commons import java.io.File import java.io.FileInputStream diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EcoreCraftingUtil.xtend b/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EcoreCraftingUtil.xtend index 85b43f738..78621d283 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EcoreCraftingUtil.xtend +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EcoreCraftingUtil.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.commons import org.eclipse.emf.ecore.EReference diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/ExecutionMetamodelTraceability.xtend b/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/ExecutionMetamodelTraceability.xtend index 3aded7b78..58dcad6a5 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/ExecutionMetamodelTraceability.xtend +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/ExecutionMetamodelTraceability.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.commons import org.eclipse.emf.ecore.EModelElement diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/tracemetamodel/StepStrings.xtend b/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/tracemetamodel/StepStrings.xtend index e013ca1fb..d0be3582c 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/tracemetamodel/StepStrings.xtend +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/tracemetamodel/StepStrings.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.commons.tracemetamodel import org.eclipse.emf.ecore.EClass diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingAnnotationsItemProvider.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingAnnotationsItemProvider.java index 9ab002afa..19cea04bf 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingAnnotationsItemProvider.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingAnnotationsItemProvider.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.provider; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsEditPlugin.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsEditPlugin.java index b9a617b18..fd4eb4c0b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsEditPlugin.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsEditPlugin.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.provider; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsItemProviderAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsItemProviderAdapterFactory.java index e313f7324..1049ab5da 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsItemProviderAdapterFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsItemProviderAdapterFactory.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.provider; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsActionBarContributor.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsActionBarContributor.java index 4db7ff5b8..d0fa68b72 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsActionBarContributor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsActionBarContributor.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.presentation; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java index 5fe030c73..a8b5b1127 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.presentation; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditorPlugin.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditorPlugin.java index 22fefa125..c0a3036f7 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditorPlugin.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditorPlugin.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.presentation; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsModelWizard.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsModelWizard.java index 58c7cfd22..1a61d3424 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsModelWizard.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsModelWizard.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.presentation; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingAnnotations.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingAnnotations.java index af19d7193..c6949e6c0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingAnnotations.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingAnnotations.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsFactory.java index ea7a4c2d5..9f7d60e16 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsFactory.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsPackage.java index 0e6623fc1..c922c5efe 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsPackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsPackage.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingAnnotationsImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingAnnotationsImpl.java index 3e3e3dc31..e18407336 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingAnnotationsImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingAnnotationsImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.impl; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsFactoryImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsFactoryImpl.java index 3f7356e95..b0dfdd0b1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsFactoryImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsFactoryImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.impl; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsPackageImpl.java index 434b46fb3..e286ae4e9 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsPackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsPackageImpl.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.impl; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsAdapterFactory.java index e59ebe4fb..6a49412f2 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsAdapterFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsAdapterFactory.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.util; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsSwitch.java b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsSwitch.java index 6ecb3eda0..1020aa383 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsSwitch.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsSwitch.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ /** */ package tracingannotations.util; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/src/fr/inria/diverse/trace/gemoc/generator/k3/K3TraceAddonGeneratorIntegrationConfiguration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/src/fr/inria/diverse/trace/gemoc/generator/k3/K3TraceAddonGeneratorIntegrationConfiguration.xtend index 73632144f..b792857db 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/src/fr/inria/diverse/trace/gemoc/generator/k3/K3TraceAddonGeneratorIntegrationConfiguration.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/src/fr/inria/diverse/trace/gemoc/generator/k3/K3TraceAddonGeneratorIntegrationConfiguration.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.generator.k3 import fr.inria.diverse.melange.metamodel.melange.Language diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index 17683db0c..fdbcfe166 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.generator import ecorext.Ecorext diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend index df3965c6a..f02cc59ec 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.generator import ecorext.Ecorext diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegrationConfiguration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegrationConfiguration.xtend index cb332b23e..0af15cbd9 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegrationConfiguration.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegrationConfiguration.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.generator import ecorext.Ecorext diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index f4f48fa66..eb989e358 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.traceaddon import com.google.common.collect.BiMap diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index c05c5ace9..5202978b5 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.traceaddon; import java.util.Deque; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java index ccb30978a..f4b8379ca 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.traceaddon; import java.util.Map; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java index 1a0982134..5e70a07b1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.traceaddon; import java.util.ArrayList; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index c09eccc2a..a40b1c143 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.traceaddon; import java.util.ArrayList; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java index 0dd0b03cc..e03337554 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.traceaddon; import java.util.List; From fc1dc48b7f1eb076c7043211fbb000a2c59cfc28 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 27 Jan 2017 11:20:20 +0100 Subject: [PATCH 082/267] Fixing header copyright (in both java and xtend files) --- .../codestyle/GemocCheckstyle6Configuration-Light.xml | 9 ++++++--- .../ui/launcher/AbstractSequentialGemocLauncher.java | 1 - .../engine/core/AbstractSequentialExecutionEngine.java | 10 ++++++++++ .../executionframework/eventmanager/Activator.java | 10 ++++++++++ .../eventmanager/views/EventManagerRenderer.java | 10 ++++++++++ .../eventmanager/views/EventManagerViewPart.java | 10 ++++++++++ .../eventmanager/views/EventPane.java | 10 ++++++++++ .../eventmanager/views/EventTableView.java | 10 ++++++++++ .../src/org/gemoc/executionframework/ui/Activator.java | 8 ++++++++ .../ui/commands/XDSMLProject2TraceAddonHandler.xtend | 10 ++++++++++ .../diverse/trace/gemoc/ui/launch/EcoreFileFilter.java | 2 +- 11 files changed, 85 insertions(+), 5 deletions(-) diff --git a/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml b/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml index 50f872969..73ef979ac 100644 --- a/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml +++ b/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml @@ -5,9 +5,8 @@ This configuration file was written by the eclipse-cs plugin configuration editor --> @@ -15,22 +14,26 @@ check the header and comments + + + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java index 764017da0..52076a392 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java @@ -40,7 +40,6 @@ import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.gemoc.xdsmlframework.api.core.ExecutionMode; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.commons.messagingsystem.api.MessagingSystem; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index b102d24de..06e059c78 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -8,6 +8,16 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ +/* ****************************************************************************** + * C opyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + * ******************************************************************************/ package org.gemoc.executionframework.engine.core; import java.io.IOException; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java index 7edad625e..a4807ae6c 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package org.gemoc.executionframework.eventmanager; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java index c26aeec54..b1b42591a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package org.gemoc.executionframework.eventmanager.views; import java.util.ArrayList; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java index 7a8e779a4..cbf52fd79 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package org.gemoc.executionframework.eventmanager.views; import org.eclipse.swt.SWT; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java index 2dfbe947a..f2cd900af 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package org.gemoc.executionframework.eventmanager.views; import org.eclipse.emf.ecore.EClass; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java index af6a9aa2e..a5c5806db 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package org.gemoc.executionframework.eventmanager.views; import java.util.ArrayList; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java index 31b6ffd70..e6412c901 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java @@ -19,8 +19,11 @@ import org.gemoc.executionframework.ui.views.engine.EngineSelectionManager; import org.osgi.framework.BundleContext; + /** * The activator class controls the plug-in life cycle + * + * @author dvojtise */ public class Activator extends AbstractUIPlugin { @@ -62,6 +65,7 @@ public Activator() { * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext * ) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -74,6 +78,10 @@ public void start(BundleContext context) throws Exception { * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext * ) */ + /* (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend index bb0065cb2..815c06981 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.ui.commands import fr.inria.diverse.melange.metamodel.melange.Language diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/launch/EcoreFileFilter.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/launch/EcoreFileFilter.java index f81213bd9..652f626f1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/launch/EcoreFileFilter.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/launch/EcoreFileFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014 Université de Rennes 1. + * Copyright (c) 2014, 2015 Université de Rennes 1. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at From 11341625159642861bb8eda73e00e5fe030b9d78 Mon Sep 17 00:00:00 2001 From: d-leroy Date: Mon, 30 Jan 2017 13:53:21 +0100 Subject: [PATCH 083/267] Reworked metamodel --- .../AbstractSequentialExecutionEngine.java | 2 +- .../views/EventManagerRenderer.java | 4 +- .../eventmanager/views/EventTableView.java | 24 +- .../model/GenericTrace.aird | 837 ++++++++++++------ .../model/GenericTrace.ecore | 204 ++++- .../model/GenericTrace.genmodel | 115 --- .../commons/model/helper/StepHelper.java | 2 +- .../trace/commons/model/trace/BigStep.java | 2 +- .../trace/commons/model/trace/Dimension.java | 2 +- .../model/trace/GenericParallelStep.java | 2 +- .../model/trace/GenericSequentialStep.java | 2 +- .../commons/model/trace/GenericSmallStep.java | 2 +- .../commons/model/trace/GenericState.java | 80 +- .../commons/model/trace/GenericStep.java | 81 +- .../commons/model/trace/GenericValue.java | 28 +- .../commons/model/trace/ParallelStep.java | 2 +- .../commons/model/trace/SequentialStep.java | 2 +- .../trace/commons/model/trace/SmallStep.java | 2 +- .../trace/commons/model/trace/State.java | 51 +- .../trace/commons/model/trace/Step.java | 56 +- .../trace/commons/model/trace/Trace.java | 10 +- .../commons/model/trace/TraceFactory.java | 4 +- .../commons/model/trace/TracePackage.java | 813 +++++++++++++++-- .../commons/model/trace/TracedObject.java | 4 +- .../trace/commons/model/trace/Value.java | 19 +- .../commons/model/trace/impl/BigStepImpl.java | 3 +- .../model/trace/impl/DimensionImpl.java | 2 +- .../trace/impl/GenericParallelStepImpl.java | 295 +++++- .../trace/impl/GenericReferenceValueImpl.java | 2 - .../trace/impl/GenericSequentialStepImpl.java | 295 +++++- .../trace/impl/GenericSmallStepImpl.java | 294 +++++- .../model/trace/impl/GenericStateImpl.java | 154 +++- .../model/trace/impl/GenericStepImpl.java | 281 +++++- .../model/trace/impl/GenericValueImpl.java | 56 +- .../model/trace/impl/ParallelStepImpl.java | 3 +- .../model/trace/impl/SequentialStepImpl.java | 3 +- .../model/trace/impl/SmallStepImpl.java | 3 +- .../commons/model/trace/impl/StateImpl.java | 124 ++- .../commons/model/trace/impl/StepImpl.java | 96 +- .../model/trace/impl/TraceFactoryImpl.java | 8 +- .../commons/model/trace/impl/TraceImpl.java | 22 +- .../model/trace/impl/TracePackageImpl.java | 323 ++++++- .../model/trace/impl/TracedObjectImpl.java | 6 +- .../commons/model/trace/impl/ValueImpl.java | 72 +- .../model/trace/util/TraceAdapterFactory.java | 20 +- .../commons/model/trace/util/TraceSwitch.java | 34 +- .../trace/gemoc/api/ITraceExplorer.java | 17 +- .../trace/gemoc/api/ITraceExtractor.java | 37 +- .../trace/gemoc/api/ITraceListener.java | 10 +- .../traceaddon/GenericTraceConstructor.java | 6 + .../traceaddon/GenericTraceExplorer.java | 219 +++-- .../traceaddon/GenericTraceExtractor.java | 185 ++-- .../model/base.aird | 314 +++++-- 53 files changed, 4281 insertions(+), 953 deletions(-) delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index b102d24de..e9667fc95 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -70,7 +70,7 @@ private void manageEvents() { if (mse != null) { EObject container = mse.eContainer(); if (container instanceof SequentialStep) { - IEventManager eventManager = EventManagerRegistry.getInstance().findEventManager(null); + IEventManager eventManager = EventManagerRegistry.getInstance().findEventManager(); if (eventManager != null) { eventManager.manageEvents(); } diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java index c26aeec54..e50fc9a3e 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java @@ -181,7 +181,7 @@ public void engineStarted(IExecutionEngine executionEngine) { @Override public void engineInitialized(IExecutionEngine executionEngine) { - setEventManager(EventManagerRegistry.getInstance().findEventManager(null)); + setEventManager(EventManagerRegistry.getInstance().findEventManager()); } @Override @@ -191,9 +191,9 @@ public void engineAboutToStop(IExecutionEngine engine) { @Override public void engineStopped(IExecutionEngine engine) { executedModel = null; - eventList.clear(); eventTypeToEventTableView.clear(); Platform.runLater(() -> { + eventList.clear(); scrollPane.setContent(null); }); } diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java index af6a9aa2e..e8fe5d77a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java @@ -81,6 +81,29 @@ public void refreshEvents() { Platform.runLater(() -> { referenceToMatchingModelElements.clear(); gatherPotentialParameters(); + +// final List newEvents = computeAllPossibleEvents().stream().filter(m -> { +// return !events.stream().anyMatch(event -> { +// return m.entrySet().stream().allMatch(entry -> { +// final EReference ref = entry.getKey(); +// final Object val1 = event.eGet(ref); +// final EObject val2 = entry.getValue(); +// return val1 == val2; +// }); +// }); +// }).map(m -> { +// final EObject event = factory.create(eventClass); +// m.entrySet().forEach(entry -> { +// event.eSet(entry.getKey(), entry.getValue()); +// }); +// return event; +// }).filter(event -> canDisplayEventFunction.apply(event)).collect(Collectors.toList()); +// +// final List toRemove = events.stream().filter(event -> canDisplayEventFunction.apply(event)).collect(Collectors.toList()); +// +// events.removeAll(toRemove); +// events.addAll(newEvents); + events.clear(); events.addAll(computeAllPossibleEvents().stream().map(m -> { final EObject event = factory.create(eventClass); @@ -90,7 +113,6 @@ public void refreshEvents() { return event; }).filter(event -> canDisplayEventFunction.apply(event)).collect(Collectors.toList())); }); - } private void gatherPotentialParameters() { diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird index ca8b8fd5d..1b5b50e02 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird @@ -21,12 +21,6 @@ - - - bold - - - @@ -67,6 +61,25 @@ + + + + + + + + + + + + + bold + + + + + + @@ -82,7 +95,7 @@ - + @@ -99,7 +112,7 @@ - + @@ -120,7 +133,7 @@ - + @@ -129,7 +142,7 @@ - + @@ -154,16 +167,27 @@ - + + + + + + + + + + + + - + @@ -177,6 +201,17 @@ + + + + + + + + + + + @@ -186,6 +221,17 @@ + + + + + + + + + + + @@ -206,6 +252,17 @@ + + + + + + + + + + + @@ -226,6 +283,17 @@ + + + + + + + + + + + @@ -297,18 +365,6 @@ - - - - - - - - - - - - @@ -329,10 +385,6 @@ - - - - @@ -360,45 +412,55 @@ + + + + + + + + + + + - - - - - + - - - + + + - - - + + + - - + + - - - - - + + + - - - + + + + + + + + - + @@ -411,7 +473,7 @@ - + @@ -493,7 +555,7 @@ - + @@ -530,11 +592,19 @@ + + + + + + + + - + @@ -603,7 +673,7 @@ - + @@ -612,7 +682,7 @@ - + @@ -625,7 +695,7 @@ - + @@ -638,7 +708,7 @@ - + @@ -651,7 +721,7 @@ - + @@ -664,7 +734,7 @@ - + @@ -677,7 +747,7 @@ - + @@ -686,7 +756,7 @@ - + @@ -695,7 +765,7 @@ - + @@ -704,7 +774,7 @@ - + @@ -713,7 +783,7 @@ - + @@ -722,7 +792,7 @@ - + @@ -731,7 +801,7 @@ - + @@ -740,7 +810,7 @@ - + @@ -749,11 +819,19 @@ - + + + + + + + + + @@ -771,7 +849,7 @@ - + @@ -824,7 +902,7 @@ - + @@ -856,7 +934,7 @@ - + @@ -864,9 +942,9 @@ - + - + @@ -1128,17 +1206,17 @@ - + - + - + - + @@ -1320,17 +1398,17 @@ - + - + - + - + @@ -1464,35 +1542,147 @@ - + - + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1638,13 +1828,24 @@ - + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic @@ -1661,10 +1862,18 @@ + + + + + + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic @@ -1673,10 +1882,18 @@ + + + + + + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic @@ -1693,10 +1910,18 @@ + + + + + + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + @@ -1712,10 +1937,18 @@ + + + + + + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + @@ -1726,7 +1959,7 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + @@ -1737,7 +1970,7 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + @@ -1748,7 +1981,7 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + @@ -1791,30 +2024,6 @@ - - - - - bold - - - - - - - - - - - - - - - - - - - @@ -1886,7 +2095,8 @@ - + + routingStyle italic @@ -1895,99 +2105,106 @@ - + - + + - + italic - + - + - + + - + italic - + - + - + + routingStyle - + italic - + - + - + + routingStyle - + italic - + - + - + + routingStyle - + italic - + - + - + + routingStyle - + italic - + - + - + + routingStyle - + italic - + @@ -2026,14 +2243,6 @@ - - - - - - - - @@ -2058,25 +2267,28 @@ - + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - - - - - - - - @@ -2104,13 +2316,27 @@ - + - - - - + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + @@ -2123,22 +2349,6 @@ - - - - - - - - - - - - - - - - @@ -2178,7 +2388,7 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + @@ -2187,13 +2397,13 @@ - + routingStyle - + italic - + @@ -2350,6 +2560,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -2415,35 +2628,53 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + - - - + + + + + + + + + + + + + + + + + + + - + - + + + routingStyle - + italic - + @@ -2956,87 +3187,107 @@ - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic + + + + + + + + + + + + + + + + - + - + + - + italic - + - + - + + - + italic - + - + - + + routingStyle - + italic - + - + - + + routingStyle - + italic - + - + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - - - + + + @@ -3067,23 +3318,24 @@ - + - + + routingStyle - + italic - + - - - - + + + + @@ -3091,15 +3343,102 @@ - - - - - - + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + bold + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + labelSize - + labelSize diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index 9bf972cdd..9d89ba905 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -5,7 +5,7 @@ + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> @@ -32,52 +32,125 @@ + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + - + + + + + + + + + + - + + - + + + + + + + + - - - - + + + + + + + + + + + + + + + + @@ -94,7 +167,11 @@ eType="#//LaunchConfiguration" containment="true"/> - + + + + + @@ -102,7 +179,9 @@ - + + + @@ -110,13 +189,39 @@ - + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + @@ -136,14 +241,32 @@ - - + + -
+
- + + +
+ + + + +
+ + + + + + + + + @@ -160,19 +283,19 @@ - - + - + - + - - - + + + + + + + + + + + -
+
- + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel deleted file mode 100644 index 18e496be5..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel +++ /dev/null @@ -1,115 +0,0 @@ - - - GenericTrace.ecore - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java index e3346dd62..5b55c76b3 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java @@ -36,7 +36,7 @@ public static List collectAllMSEOccurrences(Step instruction) { return res; } if (instruction instanceof BigStep){ - for(Object o : ((BigStep)instruction).getSubSteps()){ + for(Object o : ((BigStep)instruction).getSubSteps()){ Step s = (Step)o; res.addAll(collectAllMSEOccurrences(s)); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java index a107fa20e..0b0d58364 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java @@ -20,7 +20,7 @@ * @model abstract="true" * @generated */ -public interface BigStep extends Step { +public interface BigStep, StateSubType extends State> extends Step { /** * Returns the value of the 'Sub Steps' containment reference list. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java index 3de42296f..5d22b289f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java @@ -22,7 +22,7 @@ * @model abstract="true" * @generated */ -public interface Dimension extends EObject { +public interface Dimension> extends EObject { /** * Returns the value of the 'Values' containment reference list. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java index 14606241c..216278174 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java @@ -13,5 +13,5 @@ * @model * @generated */ -public interface GenericParallelStep extends ParallelStep, GenericStep { +public interface GenericParallelStep extends ParallelStep, GenericStep { } // GenericParallelStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java index 2674469db..b6274f6d4 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java @@ -13,5 +13,5 @@ * @model * @generated */ -public interface GenericSequentialStep extends SequentialStep, GenericStep { +public interface GenericSequentialStep extends SequentialStep, GenericStep { } // GenericSequentialStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java index 2f2478f9c..cf2675dda 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java @@ -13,5 +13,5 @@ * @model * @generated */ -public interface GenericSmallStep extends SmallStep, GenericStep { +public interface GenericSmallStep extends SmallStep, GenericStep { } // GenericSmallStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java index 217b106ea..057a2eada 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java @@ -14,29 +14,80 @@ * The following features are supported: *

*
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValues Values}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesRef Values Ref}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef Started Steps Ref}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedStepsRef Ended Steps Ref}
    • *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState() * @model * @generated */ -public interface GenericState extends State { +public interface GenericState extends State { /** - * Returns the value of the 'Values' reference list. + * Returns the value of the 'Values Ref' reference list. * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericValue}. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates States}'. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesRef States Ref}'. + * + *

+ * If the meaning of the 'Values Ref' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Values Ref' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState_ValuesRef() + * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesRef + * @model opposite="statesRef" + * @generated + */ + EList getValuesRef(); + + /** + * Returns the value of the 'Started Steps Ref' reference list. + * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericStep}. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef Starting State Ref}'. + * + *

+ * If the meaning of the 'Started Steps Ref' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Started Steps Ref' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState_StartedStepsRef() + * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef + * @model opposite="startingStateRef" + * @generated + */ + EList getStartedStepsRef(); + + /** + * Returns the value of the 'Ended Steps Ref' reference list. + * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericStep}. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef Ending State Ref}'. + * + *

+ * If the meaning of the 'Ended Steps Ref' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Ended Steps Ref' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState_EndedStepsRef() + * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef + * @model opposite="endingStateRef" + * @generated + */ + EList getEndedStepsRef(); + + /** * *

* If the meaning of the 'Values' reference list isn't clear, * there really should be more of a description here... *

* - * @return the value of the 'Values' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState_Values() - * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates - * @model opposite="states" + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getValuesRef();'" * @generated */ EList getValues(); @@ -45,8 +96,17 @@ public interface GenericState extends State { * * * @model kind="operation" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList result = new org.eclipse.emf.common.util.BasicEList();\nresult.addAll(getValues());\nreturn result;'" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getStartedStepsRef();'" + * @generated + */ + EList getStartedSteps(); + + /** + * + * + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getEndedStepsRef();'" * @generated */ - EList getValuesView(); + EList getEndedSteps(); } // GenericState diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java index 697e8b8d6..a0dd1a2ff 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java @@ -8,10 +8,89 @@ * A representation of the model object 'Generic Step'. * * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef Starting State Ref}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef Ending State Ref}
    • + *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericStep() * @model abstract="true" * @generated */ -public interface GenericStep extends Step { +public interface GenericStep extends Step { + + /** + * Returns the value of the 'Starting State Ref' reference. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef Started Steps Ref}'. + * + *

+ * If the meaning of the 'Starting State Ref' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Starting State Ref' reference. + * @see #setStartingStateRef(GenericState) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericStep_StartingStateRef() + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef + * @model opposite="startedStepsRef" required="true" + * @generated + */ + GenericState getStartingStateRef(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef Starting State Ref}' reference. + * + * + * @param value the new value of the 'Starting State Ref' reference. + * @see #getStartingStateRef() + * @generated + */ + void setStartingStateRef(GenericState value); + + /** + * Returns the value of the 'Ending State Ref' reference. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedStepsRef Ended Steps Ref}'. + * + *

+ * If the meaning of the 'Ending State Ref' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Ending State Ref' reference. + * @see #setEndingStateRef(GenericState) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericStep_EndingStateRef() + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedStepsRef + * @model opposite="endedStepsRef" + * @generated + */ + GenericState getEndingStateRef(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef Ending State Ref}' reference. + * + * + * @param value the new value of the 'Ending State Ref' reference. + * @see #getEndingStateRef() + * @generated + */ + void setEndingStateRef(GenericState value); + + /** + * + * + * @model kind="operation" required="true" + * @generated + */ + GenericState getStartingState(); + + /** + * + * + * @model kind="operation" + * @generated + */ + GenericState getEndingState(); } // GenericStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java index 03b39cf8b..2384fa59f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java @@ -14,39 +14,43 @@ * The following features are supported: *

*
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates States}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesRef States Ref}
    • *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericValue() * @model abstract="true" * @generated */ -public interface GenericValue extends Value { +public interface GenericValue extends Value { /** - * Returns the value of the 'States' reference list. + * Returns the value of the 'States Ref' reference list. * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericState}. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValues Values}'. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesRef Values Ref}'. * *

- * If the meaning of the 'States' reference list isn't clear, + * If the meaning of the 'States Ref' reference list isn't clear, * there really should be more of a description here... *

* - * @return the value of the 'States' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericValue_States() - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValues - * @model opposite="values" + * @return the value of the 'States Ref' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericValue_StatesRef() + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesRef + * @model opposite="valuesRef" * @generated */ - EList getStates(); + EList getStatesRef(); /** * + *

+ * If the meaning of the 'States' reference list isn't clear, + * there really should be more of a description here... + *

* * @model kind="operation" required="true" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList result = new org.eclipse.emf.common.util.BasicEList();\nresult.addAll(getStates());\nreturn result;'" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getStatesRef();'" * @generated */ - EList getStatesView(); + EList getStates(); } // GenericValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java index 320ef91da..22209ff81 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java @@ -13,5 +13,5 @@ * @model * @generated */ -public interface ParallelStep extends BigStep { +public interface ParallelStep, StateSubType extends State> extends BigStep { } // ParallelStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java index 81c621ead..3e96a6353 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java @@ -13,5 +13,5 @@ * @model * @generated */ -public interface SequentialStep extends BigStep { +public interface SequentialStep, StateSubType extends State> extends BigStep { } // SequentialStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java index 01d162326..4758d7752 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java @@ -13,5 +13,5 @@ * @model abstract="true" * @generated */ -public interface SmallStep extends Step { +public interface SmallStep> extends Step { } // SmallStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java index 84a20693a..8a0503c50 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java @@ -10,18 +10,63 @@ * A representation of the model object 'State'. * * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getValues Values}
    • + *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState() * @model abstract="true" * @generated */ -public interface State extends EObject { +public interface State, ValueSubType extends Value> extends EObject { /** + * Returns the value of the 'Started Steps' reference list. * + *

+ * If the meaning of the 'Started Steps' reference list isn't clear, + * there really should be more of a description here... + *

* - * @model kind="operation" + * @return the value of the 'Started Steps' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_StartedSteps() + * @model transient="true" volatile="true" derived="true" * @generated */ - EList getValuesView(); + EList getStartedSteps(); + + /** + * Returns the value of the 'Ended Steps' reference list. + * + *

+ * If the meaning of the 'Ended Steps' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Ended Steps' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_EndedSteps() + * @model transient="true" volatile="true" derived="true" + * @generated + */ + EList getEndedSteps(); + + /** + * Returns the value of the 'Values' reference list. + * + *

+ * If the meaning of the 'Values' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Values' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_Values() + * @model transient="true" volatile="true" derived="true" + * @generated + */ + EList getValues(); } // State diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java index 323b786e4..4eb13d5d1 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java @@ -14,13 +14,15 @@ *

*
    *
  • {@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}
    • *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep() * @model abstract="true" * @generated */ -public interface Step extends EObject { +public interface Step> extends EObject { /** * Returns the value of the 'Mseoccurrence' containment reference. * @@ -47,4 +49,56 @@ public interface Step extends EObject { */ void setMseoccurrence(MSEOccurrence value); + /** + * Returns the value of the 'Starting State' reference. + * + *

+ * If the meaning of the 'Starting State' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Starting State' reference. + * @see #setStartingState(State) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_StartingState() + * @model required="true" transient="true" volatile="true" derived="true" + * @generated + */ + StateSubType getStartingState(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}' reference. + * + * + * @param value the new value of the 'Starting State' reference. + * @see #getStartingState() + * @generated + */ + void setStartingState(StateSubType value); + + /** + * Returns the value of the 'Ending State' reference. + * + *

+ * If the meaning of the 'Ending State' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Ending State' reference. + * @see #setEndingState(State) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_EndingState() + * @model transient="true" volatile="true" derived="true" + * @generated + */ + StateSubType getEndingState(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}' reference. + * + * + * @param value the new value of the 'Ending State' reference. + * @see #getEndingState() + * @generated + */ + void setEndingState(StateSubType value); + } // Step diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java index 1d0da5d57..2e10b8d48 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java @@ -25,7 +25,7 @@ * @model abstract="true" * @generated */ -public interface Trace extends EObject { +public interface Trace, TracedObjectSubtype extends TracedObject, StateSubType extends State> extends EObject { /** * Returns the value of the 'Root Step' containment reference. * @@ -35,9 +35,9 @@ public interface Trace extends E *

* * @return the value of the 'Root Step' containment reference. - * @see #setRootStep(Object) + * @see #setRootStep(Step) * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_RootStep() - * @model kind="reference" containment="true" required="true" + * @model containment="true" required="true" * @generated */ StepSubType getRootStep(); @@ -62,7 +62,7 @@ public interface Trace extends E * * @return the value of the 'Traced Objects' containment reference list. * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_TracedObjects() - * @model kind="reference" containment="true" + * @model containment="true" * @generated */ EList getTracedObjects(); @@ -77,7 +77,7 @@ public interface Trace extends E * * @return the value of the 'States' containment reference list. * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_States() - * @model kind="reference" containment="true" + * @model containment="true" * @generated */ EList getStates(); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java index 728384d29..a45f87fd2 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java @@ -56,7 +56,7 @@ public interface TraceFactory extends EFactory { * @return a new object of class 'Sequential Step'. * @generated */ - SequentialStep createSequentialStep(); + , StateSubType extends State> SequentialStep createSequentialStep(); /** * Returns a new object of class 'Parallel Step'. @@ -65,7 +65,7 @@ public interface TraceFactory extends EFactory { * @return a new object of class 'Parallel Step'. * @generated */ - ParallelStep createParallelStep(); + , StateSubType extends State> ParallelStep createParallelStep(); /** * Returns a new object of class 'Generic Sequential Step'. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java index 05708bf75..49c704ac6 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java @@ -334,6 +334,24 @@ public interface TracePackage extends EPackage { */ int STEP__MSEOCCURRENCE = 0; + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int STEP__STARTING_STATE = 1; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int STEP__ENDING_STATE = 2; + /** * The number of structural features of the 'Step' class. * @@ -341,7 +359,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int STEP_FEATURE_COUNT = 1; + int STEP_FEATURE_COUNT = 3; /** * The number of operations of the 'Step' class. @@ -371,6 +389,24 @@ public interface TracePackage extends EPackage { */ int BIG_STEP__MSEOCCURRENCE = STEP__MSEOCCURRENCE; + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int BIG_STEP__STARTING_STATE = STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int BIG_STEP__ENDING_STATE = STEP__ENDING_STATE; + /** * The feature id for the 'Sub Steps' containment reference list. * @@ -417,6 +453,24 @@ public interface TracePackage extends EPackage { */ int SMALL_STEP__MSEOCCURRENCE = STEP__MSEOCCURRENCE; + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int SMALL_STEP__STARTING_STATE = STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int SMALL_STEP__ENDING_STATE = STEP__ENDING_STATE; + /** * The number of structural features of the 'Small Step' class. * @@ -454,6 +508,24 @@ public interface TracePackage extends EPackage { */ int SEQUENTIAL_STEP__MSEOCCURRENCE = BIG_STEP__MSEOCCURRENCE; + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int SEQUENTIAL_STEP__STARTING_STATE = BIG_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int SEQUENTIAL_STEP__ENDING_STATE = BIG_STEP__ENDING_STATE; + /** * The feature id for the 'Sub Steps' containment reference list. * @@ -500,6 +572,24 @@ public interface TracePackage extends EPackage { */ int PARALLEL_STEP__MSEOCCURRENCE = BIG_STEP__MSEOCCURRENCE; + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int PARALLEL_STEP__STARTING_STATE = BIG_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int PARALLEL_STEP__ENDING_STATE = BIG_STEP__ENDING_STATE; + /** * The feature id for the 'Sub Steps' containment reference list. * @@ -546,6 +636,24 @@ public interface TracePackage extends EPackage { */ int GENERIC_SEQUENTIAL_STEP__MSEOCCURRENCE = SEQUENTIAL_STEP__MSEOCCURRENCE; + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP__STARTING_STATE = SEQUENTIAL_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP__ENDING_STATE = SEQUENTIAL_STEP__ENDING_STATE; + /** * The feature id for the 'Sub Steps' containment reference list. * @@ -555,6 +663,24 @@ public interface TracePackage extends EPackage { */ int GENERIC_SEQUENTIAL_STEP__SUB_STEPS = SEQUENTIAL_STEP__SUB_STEPS; + /** + * The feature id for the 'Starting State Ref' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF = SEQUENTIAL_STEP_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Ending State Ref' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF = SEQUENTIAL_STEP_FEATURE_COUNT + 1; + /** * The number of structural features of the 'Generic Sequential Step' class. * @@ -562,7 +688,25 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_SEQUENTIAL_STEP_FEATURE_COUNT = SEQUENTIAL_STEP_FEATURE_COUNT + 0; + int GENERIC_SEQUENTIAL_STEP_FEATURE_COUNT = SEQUENTIAL_STEP_FEATURE_COUNT + 2; + + /** + * The operation id for the 'Get Starting State' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP___GET_STARTING_STATE = SEQUENTIAL_STEP_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Get Ending State' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP___GET_ENDING_STATE = SEQUENTIAL_STEP_OPERATION_COUNT + 1; /** * The number of operations of the 'Generic Sequential Step' class. @@ -571,7 +715,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_SEQUENTIAL_STEP_OPERATION_COUNT = SEQUENTIAL_STEP_OPERATION_COUNT + 0; + int GENERIC_SEQUENTIAL_STEP_OPERATION_COUNT = SEQUENTIAL_STEP_OPERATION_COUNT + 2; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericParallelStepImpl Generic Parallel Step}' class. @@ -592,6 +736,24 @@ public interface TracePackage extends EPackage { */ int GENERIC_PARALLEL_STEP__MSEOCCURRENCE = PARALLEL_STEP__MSEOCCURRENCE; + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP__STARTING_STATE = PARALLEL_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP__ENDING_STATE = PARALLEL_STEP__ENDING_STATE; + /** * The feature id for the 'Sub Steps' containment reference list. * @@ -601,6 +763,24 @@ public interface TracePackage extends EPackage { */ int GENERIC_PARALLEL_STEP__SUB_STEPS = PARALLEL_STEP__SUB_STEPS; + /** + * The feature id for the 'Starting State Ref' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP__STARTING_STATE_REF = PARALLEL_STEP_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Ending State Ref' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP__ENDING_STATE_REF = PARALLEL_STEP_FEATURE_COUNT + 1; + /** * The number of structural features of the 'Generic Parallel Step' class. * @@ -608,7 +788,25 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_PARALLEL_STEP_FEATURE_COUNT = PARALLEL_STEP_FEATURE_COUNT + 0; + int GENERIC_PARALLEL_STEP_FEATURE_COUNT = PARALLEL_STEP_FEATURE_COUNT + 2; + + /** + * The operation id for the 'Get Starting State' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP___GET_STARTING_STATE = PARALLEL_STEP_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Get Ending State' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP___GET_ENDING_STATE = PARALLEL_STEP_OPERATION_COUNT + 1; /** * The number of operations of the 'Generic Parallel Step' class. @@ -617,7 +815,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_PARALLEL_STEP_OPERATION_COUNT = PARALLEL_STEP_OPERATION_COUNT + 0; + int GENERIC_PARALLEL_STEP_OPERATION_COUNT = PARALLEL_STEP_OPERATION_COUNT + 2; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSmallStepImpl Generic Small Step}' class. @@ -638,6 +836,42 @@ public interface TracePackage extends EPackage { */ int GENERIC_SMALL_STEP__MSEOCCURRENCE = SMALL_STEP__MSEOCCURRENCE; + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP__STARTING_STATE = SMALL_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP__ENDING_STATE = SMALL_STEP__ENDING_STATE; + + /** + * The feature id for the 'Starting State Ref' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP__STARTING_STATE_REF = SMALL_STEP_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Ending State Ref' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP__ENDING_STATE_REF = SMALL_STEP_FEATURE_COUNT + 1; + /** * The number of structural features of the 'Generic Small Step' class. * @@ -645,7 +879,25 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_SMALL_STEP_FEATURE_COUNT = SMALL_STEP_FEATURE_COUNT + 0; + int GENERIC_SMALL_STEP_FEATURE_COUNT = SMALL_STEP_FEATURE_COUNT + 2; + + /** + * The operation id for the 'Get Starting State' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP___GET_STARTING_STATE = SMALL_STEP_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Get Ending State' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP___GET_ENDING_STATE = SMALL_STEP_OPERATION_COUNT + 1; /** * The number of operations of the 'Generic Small Step' class. @@ -654,7 +906,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_SMALL_STEP_OPERATION_COUNT = SMALL_STEP_OPERATION_COUNT + 0; + int GENERIC_SMALL_STEP_OPERATION_COUNT = SMALL_STEP_OPERATION_COUNT + 2; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl Trace}' class. @@ -805,22 +1057,22 @@ public interface TracePackage extends EPackage { int VALUE = 15; /** - * The number of structural features of the 'Value' class. + * The feature id for the 'States' reference list. * * * @generated * @ordered */ - int VALUE_FEATURE_COUNT = 0; + int VALUE__STATES = 0; /** - * The operation id for the 'Get States View' operation. + * The number of structural features of the 'Value' class. * * * @generated * @ordered */ - int VALUE___GET_STATES_VIEW = 0; + int VALUE_FEATURE_COUNT = 1; /** * The number of operations of the 'Value' class. @@ -829,7 +1081,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int VALUE_OPERATION_COUNT = 1; + int VALUE_OPERATION_COUNT = 0; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. @@ -842,22 +1094,40 @@ public interface TracePackage extends EPackage { int STATE = 16; /** - * The number of structural features of the 'State' class. + * The feature id for the 'Started Steps' reference list. + * + * + * @generated + * @ordered + */ + int STATE__STARTED_STEPS = 0; + + /** + * The feature id for the 'Ended Steps' reference list. + * + * + * @generated + * @ordered + */ + int STATE__ENDED_STEPS = 1; + + /** + * The feature id for the 'Values' reference list. * * * @generated * @ordered */ - int STATE_FEATURE_COUNT = 0; + int STATE__VALUES = 2; /** - * The operation id for the 'Get Values View' operation. + * The number of structural features of the 'State' class. * * * @generated * @ordered */ - int STATE___GET_VALUES_VIEW = 0; + int STATE_FEATURE_COUNT = 3; /** * The number of operations of the 'State' class. @@ -866,7 +1136,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int STATE_OPERATION_COUNT = 1; + int STATE_OPERATION_COUNT = 0; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl Generic Value}' class. @@ -885,7 +1155,16 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_VALUE__STATES = VALUE_FEATURE_COUNT + 0; + int GENERIC_VALUE__STATES = VALUE__STATES; + + /** + * The feature id for the 'States Ref' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_VALUE__STATES_REF = VALUE_FEATURE_COUNT + 0; /** * The number of structural features of the 'Generic Value' class. @@ -897,13 +1176,13 @@ public interface TracePackage extends EPackage { int GENERIC_VALUE_FEATURE_COUNT = VALUE_FEATURE_COUNT + 1; /** - * The operation id for the 'Get States View' operation. + * The operation id for the 'Get States' operation. * * * @generated * @ordered */ - int GENERIC_VALUE___GET_STATES_VIEW = VALUE_OPERATION_COUNT + 0; + int GENERIC_VALUE___GET_STATES = VALUE_OPERATION_COUNT + 0; /** * The number of operations of the 'Generic Value' class. @@ -933,6 +1212,15 @@ public interface TracePackage extends EPackage { */ int GENERIC_REFERENCE_VALUE__STATES = GENERIC_VALUE__STATES; + /** + * The feature id for the 'States Ref' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_REFERENCE_VALUE__STATES_REF = GENERIC_VALUE__STATES_REF; + /** * The feature id for the 'Reference Value' reference. * @@ -952,13 +1240,13 @@ public interface TracePackage extends EPackage { int GENERIC_REFERENCE_VALUE_FEATURE_COUNT = GENERIC_VALUE_FEATURE_COUNT + 1; /** - * The operation id for the 'Get States View' operation. + * The operation id for the 'Get States' operation. * * * @generated * @ordered */ - int GENERIC_REFERENCE_VALUE___GET_STATES_VIEW = GENERIC_VALUE___GET_STATES_VIEW; + int GENERIC_REFERENCE_VALUE___GET_STATES = GENERIC_VALUE___GET_STATES; /** * The number of operations of the 'Generic Reference Value' class. @@ -1062,6 +1350,24 @@ public interface TracePackage extends EPackage { */ int GENERIC_STATE = 20; + /** + * The feature id for the 'Started Steps' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE__STARTED_STEPS = STATE__STARTED_STEPS; + + /** + * The feature id for the 'Ended Steps' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE__ENDED_STEPS = STATE__ENDED_STEPS; + /** * The feature id for the 'Values' reference list. * @@ -1069,7 +1375,34 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_STATE__VALUES = STATE_FEATURE_COUNT + 0; + int GENERIC_STATE__VALUES = STATE__VALUES; + + /** + * The feature id for the 'Values Ref' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE__VALUES_REF = STATE_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Started Steps Ref' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE__STARTED_STEPS_REF = STATE_FEATURE_COUNT + 1; + + /** + * The feature id for the 'Ended Steps Ref' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE__ENDED_STEPS_REF = STATE_FEATURE_COUNT + 2; /** * The number of structural features of the 'Generic State' class. @@ -1078,16 +1411,34 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_STATE_FEATURE_COUNT = STATE_FEATURE_COUNT + 1; + int GENERIC_STATE_FEATURE_COUNT = STATE_FEATURE_COUNT + 3; + + /** + * The operation id for the 'Get Values' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE___GET_VALUES = STATE_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Get Started Steps' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE___GET_STARTED_STEPS = STATE_OPERATION_COUNT + 1; /** - * The operation id for the 'Get Values View' operation. + * The operation id for the 'Get Ended Steps' operation. * * * @generated * @ordered */ - int GENERIC_STATE___GET_VALUES_VIEW = STATE_OPERATION_COUNT + 0; + int GENERIC_STATE___GET_ENDED_STEPS = STATE_OPERATION_COUNT + 2; /** * The number of operations of the 'Generic State' class. @@ -1096,7 +1447,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_STATE_OPERATION_COUNT = STATE_OPERATION_COUNT + 1; + int GENERIC_STATE_OPERATION_COUNT = STATE_OPERATION_COUNT + 3; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl Generic Trace}' class. @@ -1181,6 +1532,15 @@ public interface TracePackage extends EPackage { */ int GENERIC_ATTRIBUTE_VALUE__STATES = GENERIC_VALUE__STATES; + /** + * The feature id for the 'States Ref' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_ATTRIBUTE_VALUE__STATES_REF = GENERIC_VALUE__STATES_REF; + /** * The number of structural features of the 'Generic Attribute Value' class. * @@ -1191,13 +1551,13 @@ public interface TracePackage extends EPackage { int GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_VALUE_FEATURE_COUNT + 0; /** - * The operation id for the 'Get States View' operation. + * The operation id for the 'Get States' operation. * * * @generated * @ordered */ - int GENERIC_ATTRIBUTE_VALUE___GET_STATES_VIEW = GENERIC_VALUE___GET_STATES_VIEW; + int GENERIC_ATTRIBUTE_VALUE___GET_STATES = GENERIC_VALUE___GET_STATES; /** * The number of operations of the 'Generic Attribute Value' class. @@ -1227,6 +1587,15 @@ public interface TracePackage extends EPackage { */ int BOOLEAN_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + /** + * The feature id for the 'States Ref' reference list. + * + * + * @generated + * @ordered + */ + int BOOLEAN_ATTRIBUTE_VALUE__STATES_REF = GENERIC_ATTRIBUTE_VALUE__STATES_REF; + /** * The feature id for the 'Attribute Value' attribute. * @@ -1246,13 +1615,13 @@ public interface TracePackage extends EPackage { int BOOLEAN_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; /** - * The operation id for the 'Get States View' operation. + * The operation id for the 'Get States' operation. * * * @generated * @ordered */ - int BOOLEAN_ATTRIBUTE_VALUE___GET_STATES_VIEW = GENERIC_ATTRIBUTE_VALUE___GET_STATES_VIEW; + int BOOLEAN_ATTRIBUTE_VALUE___GET_STATES = GENERIC_ATTRIBUTE_VALUE___GET_STATES; /** * The number of operations of the 'Boolean Attribute Value' class. @@ -1282,6 +1651,15 @@ public interface TracePackage extends EPackage { */ int INTEGER_ATTRIBUTEVALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + /** + * The feature id for the 'States Ref' reference list. + * + * + * @generated + * @ordered + */ + int INTEGER_ATTRIBUTEVALUE__STATES_REF = GENERIC_ATTRIBUTE_VALUE__STATES_REF; + /** * The feature id for the 'Attribute Value' attribute. * @@ -1301,13 +1679,13 @@ public interface TracePackage extends EPackage { int INTEGER_ATTRIBUTEVALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; /** - * The operation id for the 'Get States View' operation. + * The operation id for the 'Get States' operation. * * * @generated * @ordered */ - int INTEGER_ATTRIBUTEVALUE___GET_STATES_VIEW = GENERIC_ATTRIBUTE_VALUE___GET_STATES_VIEW; + int INTEGER_ATTRIBUTEVALUE___GET_STATES = GENERIC_ATTRIBUTE_VALUE___GET_STATES; /** * The number of operations of the 'Integer Attributevalue' class. @@ -1337,6 +1715,15 @@ public interface TracePackage extends EPackage { */ int STRING_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + /** + * The feature id for the 'States Ref' reference list. + * + * + * @generated + * @ordered + */ + int STRING_ATTRIBUTE_VALUE__STATES_REF = GENERIC_ATTRIBUTE_VALUE__STATES_REF; + /** * The feature id for the 'Attribute Value' attribute. * @@ -1356,13 +1743,13 @@ public interface TracePackage extends EPackage { int STRING_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; /** - * The operation id for the 'Get States View' operation. + * The operation id for the 'Get States' operation. * * * @generated * @ordered */ - int STRING_ATTRIBUTE_VALUE___GET_STATES_VIEW = GENERIC_ATTRIBUTE_VALUE___GET_STATES_VIEW; + int STRING_ATTRIBUTE_VALUE___GET_STATES = GENERIC_ATTRIBUTE_VALUE___GET_STATES; /** * The number of operations of the 'String Attribute Value' class. @@ -1771,6 +2158,42 @@ public interface TracePackage extends EPackage { */ int GENERIC_STEP__MSEOCCURRENCE = STEP__MSEOCCURRENCE; + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP__STARTING_STATE = STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP__ENDING_STATE = STEP__ENDING_STATE; + + /** + * The feature id for the 'Starting State Ref' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP__STARTING_STATE_REF = STEP_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Ending State Ref' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP__ENDING_STATE_REF = STEP_FEATURE_COUNT + 1; + /** * The number of structural features of the 'Generic Step' class. * @@ -1778,7 +2201,25 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_STEP_FEATURE_COUNT = STEP_FEATURE_COUNT + 0; + int GENERIC_STEP_FEATURE_COUNT = STEP_FEATURE_COUNT + 2; + + /** + * The operation id for the 'Get Starting State' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP___GET_STARTING_STATE = STEP_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Get Ending State' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP___GET_ENDING_STATE = STEP_OPERATION_COUNT + 1; /** * The number of operations of the 'Generic Step' class. @@ -1787,7 +2228,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_STEP_OPERATION_COUNT = STEP_OPERATION_COUNT + 0; + int GENERIC_STEP_OPERATION_COUNT = STEP_OPERATION_COUNT + 2; /** * The meta object id for the 'ISerializable' data type. @@ -1966,6 +2407,28 @@ public interface TracePackage extends EPackage { */ EReference getStep_Mseoccurrence(); + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}'. + * + * + * @return the meta object for the reference 'Starting State'. + * @see fr.inria.diverse.trace.commons.model.trace.Step#getStartingState() + * @see #getStep() + * @generated + */ + EReference getStep_StartingState(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}'. + * + * + * @return the meta object for the reference 'Ending State'. + * @see fr.inria.diverse.trace.commons.model.trace.Step#getEndingState() + * @see #getStep() + * @generated + */ + EReference getStep_EndingState(); + /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. * @@ -2154,14 +2617,15 @@ public interface TracePackage extends EPackage { EClass getValue(); /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.Value#getStatesView() Get States View}' operation. + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.Value#getStates States}'. * * - * @return the meta object for the 'Get States View' operation. - * @see fr.inria.diverse.trace.commons.model.trace.Value#getStatesView() + * @return the meta object for the reference list 'States'. + * @see fr.inria.diverse.trace.commons.model.trace.Value#getStates() + * @see #getValue() * @generated */ - EOperation getValue__GetStatesView(); + EReference getValue_States(); /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. @@ -2174,14 +2638,37 @@ public interface TracePackage extends EPackage { EClass getState(); /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.State#getValuesView() Get Values View}' operation. + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}'. * * - * @return the meta object for the 'Get Values View' operation. - * @see fr.inria.diverse.trace.commons.model.trace.State#getValuesView() + * @return the meta object for the reference list 'Started Steps'. + * @see fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps() + * @see #getState() * @generated */ - EOperation getState__GetValuesView(); + EReference getState_StartedSteps(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}'. + * + * + * @return the meta object for the reference list 'Ended Steps'. + * @see fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps() + * @see #getState() + * @generated + */ + EReference getState_EndedSteps(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getValues Values}'. + * + * + * @return the meta object for the reference list 'Values'. + * @see fr.inria.diverse.trace.commons.model.trace.State#getValues() + * @see #getState() + * @generated + */ + EReference getState_Values(); /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue Generic Reference Value}'. @@ -2246,25 +2733,67 @@ public interface TracePackage extends EPackage { EClass getGenericState(); /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValues Values}'. + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesRef Values Ref}'. * * - * @return the meta object for the reference list 'Values'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValues() + * @return the meta object for the reference list 'Values Ref'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesRef() + * @see #getGenericState() + * @generated + */ + EReference getGenericState_ValuesRef(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef Started Steps Ref}'. + * + * + * @return the meta object for the reference list 'Started Steps Ref'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef() + * @see #getGenericState() + * @generated + */ + EReference getGenericState_StartedStepsRef(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedStepsRef Ended Steps Ref}'. + * + * + * @return the meta object for the reference list 'Ended Steps Ref'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedStepsRef() * @see #getGenericState() * @generated */ - EReference getGenericState_Values(); + EReference getGenericState_EndedStepsRef(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValues() Get Values}' operation. + * + * + * @return the meta object for the 'Get Values' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValues() + * @generated + */ + EOperation getGenericState__GetValues(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedSteps() Get Started Steps}' operation. + * + * + * @return the meta object for the 'Get Started Steps' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedSteps() + * @generated + */ + EOperation getGenericState__GetStartedSteps(); /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesView() Get Values View}' operation. + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedSteps() Get Ended Steps}' operation. * * - * @return the meta object for the 'Get Values View' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesView() + * @return the meta object for the 'Get Ended Steps' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedSteps() * @generated */ - EOperation getGenericState__GetValuesView(); + EOperation getGenericState__GetEndedSteps(); /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericTrace Generic Trace}'. @@ -2492,6 +3021,48 @@ public interface TracePackage extends EPackage { */ EClass getGenericStep(); + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef Starting State Ref}'. + * + * + * @return the meta object for the reference 'Starting State Ref'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef() + * @see #getGenericStep() + * @generated + */ + EReference getGenericStep_StartingStateRef(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef Ending State Ref}'. + * + * + * @return the meta object for the reference 'Ending State Ref'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef() + * @see #getGenericStep() + * @generated + */ + EReference getGenericStep_EndingStateRef(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingState() Get Starting State}' operation. + * + * + * @return the meta object for the 'Get Starting State' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingState() + * @generated + */ + EOperation getGenericStep__GetStartingState(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingState() Get Ending State}' operation. + * + * + * @return the meta object for the 'Get Ending State' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingState() + * @generated + */ + EOperation getGenericStep__GetEndingState(); + /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue Generic Value}'. * @@ -2503,25 +3074,25 @@ public interface TracePackage extends EPackage { EClass getGenericValue(); /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates States}'. + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesRef States Ref}'. * * - * @return the meta object for the reference list 'States'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates() + * @return the meta object for the reference list 'States Ref'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesRef() * @see #getGenericValue() * @generated */ - EReference getGenericValue_States(); + EReference getGenericValue_StatesRef(); /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesView() Get States View}' operation. + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates() Get States}' operation. * * - * @return the meta object for the 'Get States View' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesView() + * @return the meta object for the 'Get States' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates() * @generated */ - EOperation getGenericValue__GetStatesView(); + EOperation getGenericValue__GetStates(); /** * Returns the meta object for data type 'ISerializable'. @@ -2694,6 +3265,22 @@ interface Literals { */ EReference STEP__MSEOCCURRENCE = eINSTANCE.getStep_Mseoccurrence(); + /** + * The meta object literal for the 'Starting State' reference feature. + * + * + * @generated + */ + EReference STEP__STARTING_STATE = eINSTANCE.getStep_StartingState(); + + /** + * The meta object literal for the 'Ending State' reference feature. + * + * + * @generated + */ + EReference STEP__ENDING_STATE = eINSTANCE.getStep_EndingState(); + /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl Big Step}' class. * @@ -2861,12 +3448,12 @@ interface Literals { EClass VALUE = eINSTANCE.getValue(); /** - * The meta object literal for the 'Get States View' operation. + * The meta object literal for the 'States' reference list feature. * * * @generated */ - EOperation VALUE___GET_STATES_VIEW = eINSTANCE.getValue__GetStatesView(); + EReference VALUE__STATES = eINSTANCE.getValue_States(); /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. @@ -2879,12 +3466,28 @@ interface Literals { EClass STATE = eINSTANCE.getState(); /** - * The meta object literal for the 'Get Values View' operation. + * The meta object literal for the 'Started Steps' reference list feature. * * * @generated */ - EOperation STATE___GET_VALUES_VIEW = eINSTANCE.getState__GetValuesView(); + EReference STATE__STARTED_STEPS = eINSTANCE.getState_StartedSteps(); + + /** + * The meta object literal for the 'Ended Steps' reference list feature. + * + * + * @generated + */ + EReference STATE__ENDED_STEPS = eINSTANCE.getState_EndedSteps(); + + /** + * The meta object literal for the 'Values' reference list feature. + * + * + * @generated + */ + EReference STATE__VALUES = eINSTANCE.getState_Values(); /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl Generic Reference Value}' class. @@ -2943,20 +3546,52 @@ interface Literals { EClass GENERIC_STATE = eINSTANCE.getGenericState(); /** - * The meta object literal for the 'Values' reference list feature. + * The meta object literal for the 'Values Ref' reference list feature. + * + * + * @generated + */ + EReference GENERIC_STATE__VALUES_REF = eINSTANCE.getGenericState_ValuesRef(); + + /** + * The meta object literal for the 'Started Steps Ref' reference list feature. + * + * + * @generated + */ + EReference GENERIC_STATE__STARTED_STEPS_REF = eINSTANCE.getGenericState_StartedStepsRef(); + + /** + * The meta object literal for the 'Ended Steps Ref' reference list feature. + * + * + * @generated + */ + EReference GENERIC_STATE__ENDED_STEPS_REF = eINSTANCE.getGenericState_EndedStepsRef(); + + /** + * The meta object literal for the 'Get Values' operation. * * * @generated */ - EReference GENERIC_STATE__VALUES = eINSTANCE.getGenericState_Values(); + EOperation GENERIC_STATE___GET_VALUES = eINSTANCE.getGenericState__GetValues(); /** - * The meta object literal for the 'Get Values View' operation. + * The meta object literal for the 'Get Started Steps' operation. * * * @generated */ - EOperation GENERIC_STATE___GET_VALUES_VIEW = eINSTANCE.getGenericState__GetValuesView(); + EOperation GENERIC_STATE___GET_STARTED_STEPS = eINSTANCE.getGenericState__GetStartedSteps(); + + /** + * The meta object literal for the 'Get Ended Steps' operation. + * + * + * @generated + */ + EOperation GENERIC_STATE___GET_ENDED_STEPS = eINSTANCE.getGenericState__GetEndedSteps(); /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl Generic Trace}' class. @@ -3166,6 +3801,38 @@ interface Literals { */ EClass GENERIC_STEP = eINSTANCE.getGenericStep(); + /** + * The meta object literal for the 'Starting State Ref' reference feature. + * + * + * @generated + */ + EReference GENERIC_STEP__STARTING_STATE_REF = eINSTANCE.getGenericStep_StartingStateRef(); + + /** + * The meta object literal for the 'Ending State Ref' reference feature. + * + * + * @generated + */ + EReference GENERIC_STEP__ENDING_STATE_REF = eINSTANCE.getGenericStep_EndingStateRef(); + + /** + * The meta object literal for the 'Get Starting State' operation. + * + * + * @generated + */ + EOperation GENERIC_STEP___GET_STARTING_STATE = eINSTANCE.getGenericStep__GetStartingState(); + + /** + * The meta object literal for the 'Get Ending State' operation. + * + * + * @generated + */ + EOperation GENERIC_STEP___GET_ENDING_STATE = eINSTANCE.getGenericStep__GetEndingState(); + /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl Generic Value}' class. * @@ -3177,20 +3844,20 @@ interface Literals { EClass GENERIC_VALUE = eINSTANCE.getGenericValue(); /** - * The meta object literal for the 'States' reference list feature. + * The meta object literal for the 'States Ref' reference list feature. * * * @generated */ - EReference GENERIC_VALUE__STATES = eINSTANCE.getGenericValue_States(); + EReference GENERIC_VALUE__STATES_REF = eINSTANCE.getGenericValue_StatesRef(); /** - * The meta object literal for the 'Get States View' operation. + * The meta object literal for the 'Get States' operation. * * * @generated */ - EOperation GENERIC_VALUE___GET_STATES_VIEW = eINSTANCE.getGenericValue__GetStatesView(); + EOperation GENERIC_VALUE___GET_STATES = eINSTANCE.getGenericValue__GetStates(); /** * The meta object literal for the 'ISerializable' data type. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java index 4fc3fe478..7e1ab99df 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java @@ -22,7 +22,7 @@ * @model abstract="true" * @generated */ -public interface TracedObject extends EObject { +public interface TracedObject> extends EObject { /** * Returns the value of the 'Dimensions' containment reference list. * @@ -33,7 +33,7 @@ public interface TracedObject extends EObject { * * @return the value of the 'Dimensions' containment reference list. * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTracedObject_Dimensions() - * @model kind="reference" containment="true" + * @model containment="true" * @generated */ EList getDimensions(); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java index c6de0bd64..073a1c1ca 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java @@ -10,19 +10,32 @@ * A representation of the model object 'Value'. * * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Value#getStates States}
    • + *
* * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue() * @model abstract="true" * @generated */ -public interface Value extends EObject { +public interface Value> extends EObject { /** + * Returns the value of the 'States' reference list. * + *

+ * If the meaning of the 'States' reference list isn't clear, + * there really should be more of a description here... + *

* - * @model kind="operation" required="true" + * @return the value of the 'States' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue_States() + * @model transient="true" volatile="true" derived="true" * @generated */ - EList getStatesView(); + EList getStates(); } // Value diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java index 1884c165d..b317200b9 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java @@ -3,6 +3,7 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TracePackage; @@ -31,7 +32,7 @@ * * @generated */ -public abstract class BigStepImpl extends StepImpl implements BigStep { +public abstract class BigStepImpl, StateSubType extends State> extends StepImpl implements BigStep { /** * The cached value of the '{@link #getSubSteps() Sub Steps}' containment reference list. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java index d10d2064c..127127cab 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java @@ -33,7 +33,7 @@ * * @generated */ -public abstract class DimensionImpl extends MinimalEObjectImpl.Container implements Dimension { +public abstract class DimensionImpl> extends MinimalEObjectImpl.Container implements Dimension { /** * The cached value of the '{@link #getValues() Values}' containment reference list. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java index a542606c1..5fc5c3ef7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java @@ -3,19 +3,50 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.GenericParallelStep; -import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericStep; import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; /** * * An implementation of the model object 'Generic Parallel Step'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericParallelStepImpl#getStartingStateRef Starting State Ref}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericParallelStepImpl#getEndingStateRef Ending State Ref}
    • + *
* * @generated */ -public class GenericParallelStepImpl extends ParallelStepImpl implements GenericParallelStep { +public class GenericParallelStepImpl extends ParallelStepImpl implements GenericParallelStep { + /** + * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. + * + * + * @see #getStartingStateRef() + * @generated + * @ordered + */ + protected GenericState startingStateRef; + /** + * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. + * + * + * @see #getEndingStateRef() + * @generated + * @ordered + */ + protected GenericState endingStateRef; + /** * * @@ -35,4 +66,264 @@ protected EClass eStaticClass() { return TracePackage.Literals.GENERIC_PARALLEL_STEP; } + /** + * + * + * @generated + */ + public GenericState getStartingStateRef() { + if (startingStateRef != null && startingStateRef.eIsProxy()) { + InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; + startingStateRef = (GenericState)eResolveProxy(oldStartingStateRef); + if (startingStateRef != oldStartingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); + } + } + return startingStateRef; + } + + /** + * + * + * @generated + */ + public GenericState basicGetStartingStateRef() { + return startingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetStartingStateRef(GenericState newStartingStateRef, NotificationChain msgs) { + GenericState oldStartingStateRef = startingStateRef; + startingStateRef = newStartingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setStartingStateRef(GenericState newStartingStateRef) { + if (newStartingStateRef != startingStateRef) { + NotificationChain msgs = null; + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + if (newStartingStateRef != null) + msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + msgs = basicSetStartingStateRef(newStartingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); + } + + /** + * + * + * @generated + */ + public GenericState getEndingStateRef() { + if (endingStateRef != null && endingStateRef.eIsProxy()) { + InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; + endingStateRef = (GenericState)eResolveProxy(oldEndingStateRef); + if (endingStateRef != oldEndingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); + } + } + return endingStateRef; + } + + /** + * + * + * @generated + */ + public GenericState basicGetEndingStateRef() { + return endingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetEndingStateRef(GenericState newEndingStateRef, NotificationChain msgs) { + GenericState oldEndingStateRef = endingStateRef; + endingStateRef = newEndingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setEndingStateRef(GenericState newEndingStateRef) { + if (newEndingStateRef != endingStateRef) { + NotificationChain msgs = null; + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + if (newEndingStateRef != null) + msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + msgs = basicSetEndingStateRef(newEndingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + return basicSetStartingStateRef((GenericState)otherEnd, msgs); + case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + return basicSetEndingStateRef((GenericState)otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: + return basicSetStartingStateRef(null, msgs); + case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: + return basicSetEndingStateRef(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: + if (resolve) return getStartingStateRef(); + return basicGetStartingStateRef(); + case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: + if (resolve) return getEndingStateRef(); + return basicGetEndingStateRef(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: + setStartingStateRef((GenericState)newValue); + return; + case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: + setEndingStateRef((GenericState)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: + setStartingStateRef((GenericState)null); + return; + case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: + setEndingStateRef((GenericState)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: + return startingStateRef != null; + case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: + return endingStateRef != null; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { + if (baseClass == GenericStep.class) { + switch (derivedFeatureID) { + case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_STEP__STARTING_STATE_REF; + case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_STEP__ENDING_STATE_REF; + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { + if (baseClass == GenericStep.class) { + switch (baseFeatureID) { + case TracePackage.GENERIC_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF; + case TracePackage.GENERIC_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + } //GenericParallelStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java index accfd8878..631143778 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java @@ -60,7 +60,6 @@ protected EClass eStaticClass() { * * @generated */ - @SuppressWarnings("unchecked") public EObject getReferenceValue() { if (referenceValue != null && referenceValue.eIsProxy()) { InternalEObject oldReferenceValue = (InternalEObject)referenceValue; @@ -114,7 +113,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { * * @generated */ - @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java index 9e078dcd6..84c8e50e0 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java @@ -3,19 +3,50 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; -import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericStep; import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; /** * * An implementation of the model object 'Generic Sequential Step'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSequentialStepImpl#getStartingStateRef Starting State Ref}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSequentialStepImpl#getEndingStateRef Ending State Ref}
    • + *
* * @generated */ -public class GenericSequentialStepImpl extends SequentialStepImpl implements GenericSequentialStep { +public class GenericSequentialStepImpl extends SequentialStepImpl implements GenericSequentialStep { + /** + * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. + * + * + * @see #getStartingStateRef() + * @generated + * @ordered + */ + protected GenericState startingStateRef; + /** + * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. + * + * + * @see #getEndingStateRef() + * @generated + * @ordered + */ + protected GenericState endingStateRef; + /** * * @@ -35,4 +66,264 @@ protected EClass eStaticClass() { return TracePackage.Literals.GENERIC_SEQUENTIAL_STEP; } + /** + * + * + * @generated + */ + public GenericState getStartingStateRef() { + if (startingStateRef != null && startingStateRef.eIsProxy()) { + InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; + startingStateRef = (GenericState)eResolveProxy(oldStartingStateRef); + if (startingStateRef != oldStartingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); + } + } + return startingStateRef; + } + + /** + * + * + * @generated + */ + public GenericState basicGetStartingStateRef() { + return startingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetStartingStateRef(GenericState newStartingStateRef, NotificationChain msgs) { + GenericState oldStartingStateRef = startingStateRef; + startingStateRef = newStartingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setStartingStateRef(GenericState newStartingStateRef) { + if (newStartingStateRef != startingStateRef) { + NotificationChain msgs = null; + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + if (newStartingStateRef != null) + msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + msgs = basicSetStartingStateRef(newStartingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); + } + + /** + * + * + * @generated + */ + public GenericState getEndingStateRef() { + if (endingStateRef != null && endingStateRef.eIsProxy()) { + InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; + endingStateRef = (GenericState)eResolveProxy(oldEndingStateRef); + if (endingStateRef != oldEndingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); + } + } + return endingStateRef; + } + + /** + * + * + * @generated + */ + public GenericState basicGetEndingStateRef() { + return endingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetEndingStateRef(GenericState newEndingStateRef, NotificationChain msgs) { + GenericState oldEndingStateRef = endingStateRef; + endingStateRef = newEndingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setEndingStateRef(GenericState newEndingStateRef) { + if (newEndingStateRef != endingStateRef) { + NotificationChain msgs = null; + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + if (newEndingStateRef != null) + msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + msgs = basicSetEndingStateRef(newEndingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + return basicSetStartingStateRef((GenericState)otherEnd, msgs); + case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + return basicSetEndingStateRef((GenericState)otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: + return basicSetStartingStateRef(null, msgs); + case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: + return basicSetEndingStateRef(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: + if (resolve) return getStartingStateRef(); + return basicGetStartingStateRef(); + case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: + if (resolve) return getEndingStateRef(); + return basicGetEndingStateRef(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: + setStartingStateRef((GenericState)newValue); + return; + case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: + setEndingStateRef((GenericState)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: + setStartingStateRef((GenericState)null); + return; + case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: + setEndingStateRef((GenericState)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: + return startingStateRef != null; + case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: + return endingStateRef != null; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { + if (baseClass == GenericStep.class) { + switch (derivedFeatureID) { + case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_STEP__STARTING_STATE_REF; + case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_STEP__ENDING_STATE_REF; + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { + if (baseClass == GenericStep.class) { + switch (baseFeatureID) { + case TracePackage.GENERIC_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF; + case TracePackage.GENERIC_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + } //GenericSequentialStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java index f7a3208c7..cd3ea1dc5 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java @@ -3,18 +3,50 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.GenericSmallStep; +import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericStep; import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; /** * * An implementation of the model object 'Generic Small Step'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSmallStepImpl#getStartingStateRef Starting State Ref}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSmallStepImpl#getEndingStateRef Ending State Ref}
    • + *
* * @generated */ -public class GenericSmallStepImpl extends SmallStepImpl implements GenericSmallStep { +public class GenericSmallStepImpl extends SmallStepImpl implements GenericSmallStep { + /** + * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. + * + * + * @see #getStartingStateRef() + * @generated + * @ordered + */ + protected GenericState startingStateRef; + /** + * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. + * + * + * @see #getEndingStateRef() + * @generated + * @ordered + */ + protected GenericState endingStateRef; + /** * * @@ -34,4 +66,264 @@ protected EClass eStaticClass() { return TracePackage.Literals.GENERIC_SMALL_STEP; } + /** + * + * + * @generated + */ + public GenericState getStartingStateRef() { + if (startingStateRef != null && startingStateRef.eIsProxy()) { + InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; + startingStateRef = (GenericState)eResolveProxy(oldStartingStateRef); + if (startingStateRef != oldStartingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); + } + } + return startingStateRef; + } + + /** + * + * + * @generated + */ + public GenericState basicGetStartingStateRef() { + return startingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetStartingStateRef(GenericState newStartingStateRef, NotificationChain msgs) { + GenericState oldStartingStateRef = startingStateRef; + startingStateRef = newStartingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setStartingStateRef(GenericState newStartingStateRef) { + if (newStartingStateRef != startingStateRef) { + NotificationChain msgs = null; + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + if (newStartingStateRef != null) + msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + msgs = basicSetStartingStateRef(newStartingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); + } + + /** + * + * + * @generated + */ + public GenericState getEndingStateRef() { + if (endingStateRef != null && endingStateRef.eIsProxy()) { + InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; + endingStateRef = (GenericState)eResolveProxy(oldEndingStateRef); + if (endingStateRef != oldEndingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); + } + } + return endingStateRef; + } + + /** + * + * + * @generated + */ + public GenericState basicGetEndingStateRef() { + return endingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetEndingStateRef(GenericState newEndingStateRef, NotificationChain msgs) { + GenericState oldEndingStateRef = endingStateRef; + endingStateRef = newEndingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setEndingStateRef(GenericState newEndingStateRef) { + if (newEndingStateRef != endingStateRef) { + NotificationChain msgs = null; + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + if (newEndingStateRef != null) + msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + msgs = basicSetEndingStateRef(newEndingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + return basicSetStartingStateRef((GenericState)otherEnd, msgs); + case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + return basicSetEndingStateRef((GenericState)otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: + return basicSetStartingStateRef(null, msgs); + case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: + return basicSetEndingStateRef(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: + if (resolve) return getStartingStateRef(); + return basicGetStartingStateRef(); + case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: + if (resolve) return getEndingStateRef(); + return basicGetEndingStateRef(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: + setStartingStateRef((GenericState)newValue); + return; + case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: + setEndingStateRef((GenericState)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: + setStartingStateRef((GenericState)null); + return; + case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: + setEndingStateRef((GenericState)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: + return startingStateRef != null; + case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: + return endingStateRef != null; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { + if (baseClass == GenericStep.class) { + switch (derivedFeatureID) { + case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_STEP__STARTING_STATE_REF; + case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_STEP__ENDING_STATE_REF; + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { + if (baseClass == GenericStep.class) { + switch (baseFeatureID) { + case TracePackage.GENERIC_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF; + case TracePackage.GENERIC_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + } //GenericSmallStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java index 117880341..66a40b6ca 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java @@ -3,10 +3,9 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.GenericState; +import fr.inria.diverse.trace.commons.model.trace.GenericStep; import fr.inria.diverse.trace.commons.model.trace.GenericValue; import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import fr.inria.diverse.trace.commons.model.trace.Value; import java.lang.reflect.InvocationTargetException; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; @@ -24,22 +23,41 @@ * The following features are implemented: *

*
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl#getValues Values}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl#getValuesRef Values Ref}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl#getStartedStepsRef Started Steps Ref}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl#getEndedStepsRef Ended Steps Ref}
    • *
* * @generated */ -public class GenericStateImpl extends StateImpl implements GenericState { +public class GenericStateImpl extends StateImpl implements GenericState { /** - * The cached value of the '{@link #getValues() Values}' reference list. + * The cached value of the '{@link #getValuesRef() Values Ref}' reference list. * * - * @see #getValues() + * @see #getValuesRef() * @generated * @ordered */ - protected EList values; - + protected EList valuesRef; + /** + * The cached value of the '{@link #getStartedStepsRef() Started Steps Ref}' reference list. + * + * + * @see #getStartedStepsRef() + * @generated + * @ordered + */ + protected EList startedStepsRef; + /** + * The cached value of the '{@link #getEndedStepsRef() Ended Steps Ref}' reference list. + * + * + * @see #getEndedStepsRef() + * @generated + * @ordered + */ + protected EList endedStepsRef; /** * * @@ -64,11 +82,44 @@ protected EClass eStaticClass() { * * @generated */ - public EList getValues() { - if (values == null) { - values = new EObjectWithInverseResolvingEList.ManyInverse(GenericValue.class, this, TracePackage.GENERIC_STATE__VALUES, TracePackage.GENERIC_VALUE__STATES); + public EList getValuesRef() { + if (valuesRef == null) { + valuesRef = new EObjectWithInverseResolvingEList.ManyInverse(GenericValue.class, this, TracePackage.GENERIC_STATE__VALUES_REF, TracePackage.GENERIC_VALUE__STATES_REF); + } + return valuesRef; + } + + /** + * + * + * @generated + */ + public EList getStartedStepsRef() { + if (startedStepsRef == null) { + startedStepsRef = new EObjectWithInverseResolvingEList(GenericStep.class, this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, TracePackage.GENERIC_STEP__STARTING_STATE_REF); + } + return startedStepsRef; + } + + /** + * + * + * @generated + */ + public EList getEndedStepsRef() { + if (endedStepsRef == null) { + endedStepsRef = new EObjectWithInverseResolvingEList(GenericStep.class, this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, TracePackage.GENERIC_STEP__ENDING_STATE_REF); } - return values; + return endedStepsRef; + } + + /** + * + * + * @generated + */ + public EList getValues() { + return getValuesRef(); } /** @@ -76,10 +127,17 @@ public EList getValues() { * * @generated */ - public EList getValuesView() { - final EList result = new org.eclipse.emf.common.util.BasicEList(); - result.addAll(getValues()); - return result; + public EList getStartedSteps() { + return getStartedStepsRef(); + } + + /** + * + * + * @generated + */ + public EList getEndedSteps() { + return getEndedStepsRef(); } /** @@ -91,8 +149,12 @@ public EList getValuesView() { @Override public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES: - return ((InternalEList)(InternalEList)getValues()).basicAdd(otherEnd, msgs); + case TracePackage.GENERIC_STATE__VALUES_REF: + return ((InternalEList)(InternalEList)getValuesRef()).basicAdd(otherEnd, msgs); + case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: + return ((InternalEList)(InternalEList)getStartedStepsRef()).basicAdd(otherEnd, msgs); + case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: + return ((InternalEList)(InternalEList)getEndedStepsRef()).basicAdd(otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -105,8 +167,12 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES: - return ((InternalEList)getValues()).basicRemove(otherEnd, msgs); + case TracePackage.GENERIC_STATE__VALUES_REF: + return ((InternalEList)getValuesRef()).basicRemove(otherEnd, msgs); + case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: + return ((InternalEList)getStartedStepsRef()).basicRemove(otherEnd, msgs); + case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: + return ((InternalEList)getEndedStepsRef()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -119,8 +185,12 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES: - return getValues(); + case TracePackage.GENERIC_STATE__VALUES_REF: + return getValuesRef(); + case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: + return getStartedStepsRef(); + case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: + return getEndedStepsRef(); } return super.eGet(featureID, resolve, coreType); } @@ -134,9 +204,17 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES: - getValues().clear(); - getValues().addAll((Collection)newValue); + case TracePackage.GENERIC_STATE__VALUES_REF: + getValuesRef().clear(); + getValuesRef().addAll((Collection)newValue); + return; + case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: + getStartedStepsRef().clear(); + getStartedStepsRef().addAll((Collection)newValue); + return; + case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: + getEndedStepsRef().clear(); + getEndedStepsRef().addAll((Collection)newValue); return; } super.eSet(featureID, newValue); @@ -150,8 +228,14 @@ public void eSet(int featureID, Object newValue) { @Override public void eUnset(int featureID) { switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES: - getValues().clear(); + case TracePackage.GENERIC_STATE__VALUES_REF: + getValuesRef().clear(); + return; + case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: + getStartedStepsRef().clear(); + return; + case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: + getEndedStepsRef().clear(); return; } super.eUnset(featureID); @@ -165,8 +249,12 @@ public void eUnset(int featureID) { @Override public boolean eIsSet(int featureID) { switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES: - return values != null && !values.isEmpty(); + case TracePackage.GENERIC_STATE__VALUES_REF: + return valuesRef != null && !valuesRef.isEmpty(); + case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: + return startedStepsRef != null && !startedStepsRef.isEmpty(); + case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: + return endedStepsRef != null && !endedStepsRef.isEmpty(); } return super.eIsSet(featureID); } @@ -179,8 +267,12 @@ public boolean eIsSet(int featureID) { @Override public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { - case TracePackage.GENERIC_STATE___GET_VALUES_VIEW: - return getValuesView(); + case TracePackage.GENERIC_STATE___GET_VALUES: + return getValues(); + case TracePackage.GENERIC_STATE___GET_STARTED_STEPS: + return getStartedSteps(); + case TracePackage.GENERIC_STATE___GET_ENDED_STEPS: + return getEndedSteps(); } return super.eInvoke(operationID, arguments); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java index 82a900d31..a01cd4a9f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java @@ -2,19 +2,50 @@ */ package fr.inria.diverse.trace.commons.model.trace.impl; +import fr.inria.diverse.trace.commons.model.trace.GenericState; import fr.inria.diverse.trace.commons.model.trace.GenericStep; import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; /** * * An implementation of the model object 'Generic Step'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl#getStartingStateRef Starting State Ref}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl#getEndingStateRef Ending State Ref}
    • + *
* * @generated */ -public abstract class GenericStepImpl extends StepImpl implements GenericStep { +public abstract class GenericStepImpl extends StepImpl implements GenericStep { + /** + * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. + * + * + * @see #getStartingStateRef() + * @generated + * @ordered + */ + protected GenericState startingStateRef; + /** + * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. + * + * + * @see #getEndingStateRef() + * @generated + * @ordered + */ + protected GenericState endingStateRef; + /** * * @@ -34,4 +65,252 @@ protected EClass eStaticClass() { return TracePackage.Literals.GENERIC_STEP; } + /** + * + * + * This is specialized for the more specific type known in this context. + * @generated + */ + @Override + public void setStartingState(GenericState newStartingState) { + super.setStartingState(newStartingState); + } + + /** + * + * + * This is specialized for the more specific type known in this context. + * @generated + */ + @Override + public void setEndingState(GenericState newEndingState) { + super.setEndingState(newEndingState); + } + + /** + * + * + * @generated + */ + public GenericState getStartingStateRef() { + if (startingStateRef != null && startingStateRef.eIsProxy()) { + InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; + startingStateRef = (GenericState)eResolveProxy(oldStartingStateRef); + if (startingStateRef != oldStartingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); + } + } + return startingStateRef; + } + + /** + * + * + * @generated + */ + public GenericState basicGetStartingStateRef() { + return startingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetStartingStateRef(GenericState newStartingStateRef, NotificationChain msgs) { + GenericState oldStartingStateRef = startingStateRef; + startingStateRef = newStartingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setStartingStateRef(GenericState newStartingStateRef) { + if (newStartingStateRef != startingStateRef) { + NotificationChain msgs = null; + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + if (newStartingStateRef != null) + msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + msgs = basicSetStartingStateRef(newStartingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); + } + + /** + * + * + * @generated + */ + public GenericState getEndingStateRef() { + if (endingStateRef != null && endingStateRef.eIsProxy()) { + InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; + endingStateRef = (GenericState)eResolveProxy(oldEndingStateRef); + if (endingStateRef != oldEndingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); + } + } + return endingStateRef; + } + + /** + * + * + * @generated + */ + public GenericState basicGetEndingStateRef() { + return endingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetEndingStateRef(GenericState newEndingStateRef, NotificationChain msgs) { + GenericState oldEndingStateRef = endingStateRef; + endingStateRef = newEndingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setEndingStateRef(GenericState newEndingStateRef) { + if (newEndingStateRef != endingStateRef) { + NotificationChain msgs = null; + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + if (newEndingStateRef != null) + msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + msgs = basicSetEndingStateRef(newEndingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_STEP__STARTING_STATE_REF: + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); + return basicSetStartingStateRef((GenericState)otherEnd, msgs); + case TracePackage.GENERIC_STEP__ENDING_STATE_REF: + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); + return basicSetEndingStateRef((GenericState)otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.GENERIC_STEP__STARTING_STATE_REF: + return basicSetStartingStateRef(null, msgs); + case TracePackage.GENERIC_STEP__ENDING_STATE_REF: + return basicSetEndingStateRef(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.GENERIC_STEP__STARTING_STATE_REF: + if (resolve) return getStartingStateRef(); + return basicGetStartingStateRef(); + case TracePackage.GENERIC_STEP__ENDING_STATE_REF: + if (resolve) return getEndingStateRef(); + return basicGetEndingStateRef(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.GENERIC_STEP__STARTING_STATE_REF: + setStartingStateRef((GenericState)newValue); + return; + case TracePackage.GENERIC_STEP__ENDING_STATE_REF: + setEndingStateRef((GenericState)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_STEP__STARTING_STATE_REF: + setStartingStateRef((GenericState)null); + return; + case TracePackage.GENERIC_STEP__ENDING_STATE_REF: + setEndingStateRef((GenericState)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_STEP__STARTING_STATE_REF: + return startingStateRef != null; + case TracePackage.GENERIC_STEP__ENDING_STATE_REF: + return endingStateRef != null; + } + return super.eIsSet(featureID); + } + } //GenericStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java index 71589ac7a..dace4d113 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java @@ -4,7 +4,6 @@ import fr.inria.diverse.trace.commons.model.trace.GenericState; import fr.inria.diverse.trace.commons.model.trace.GenericValue; -import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import java.lang.reflect.InvocationTargetException; @@ -24,22 +23,21 @@ * The following features are implemented: *

*
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl#getStates States}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl#getStatesRef States Ref}
    • *
* * @generated */ -public abstract class GenericValueImpl extends ValueImpl implements GenericValue { +public abstract class GenericValueImpl extends ValueImpl implements GenericValue { /** - * The cached value of the '{@link #getStates() States}' reference list. + * The cached value of the '{@link #getStatesRef() States Ref}' reference list. * * - * @see #getStates() + * @see #getStatesRef() * @generated * @ordered */ - protected EList states; - + protected EList statesRef; /** * * @@ -64,11 +62,11 @@ protected EClass eStaticClass() { * * @generated */ - public EList getStates() { - if (states == null) { - states = new EObjectWithInverseResolvingEList.ManyInverse(GenericState.class, this, TracePackage.GENERIC_VALUE__STATES, TracePackage.GENERIC_STATE__VALUES); + public EList getStatesRef() { + if (statesRef == null) { + statesRef = new EObjectWithInverseResolvingEList.ManyInverse(GenericState.class, this, TracePackage.GENERIC_VALUE__STATES_REF, TracePackage.GENERIC_STATE__VALUES_REF); } - return states; + return statesRef; } /** @@ -76,10 +74,8 @@ public EList getStates() { * * @generated */ - public EList getStatesView() { - final EList result = new org.eclipse.emf.common.util.BasicEList(); - result.addAll(getStates()); - return result; + public EList getStates() { + return getStatesRef(); } /** @@ -91,8 +87,8 @@ public EList getStatesView() { @Override public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES: - return ((InternalEList)(InternalEList)getStates()).basicAdd(otherEnd, msgs); + case TracePackage.GENERIC_VALUE__STATES_REF: + return ((InternalEList)(InternalEList)getStatesRef()).basicAdd(otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -105,8 +101,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES: - return ((InternalEList)getStates()).basicRemove(otherEnd, msgs); + case TracePackage.GENERIC_VALUE__STATES_REF: + return ((InternalEList)getStatesRef()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -119,8 +115,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES: - return getStates(); + case TracePackage.GENERIC_VALUE__STATES_REF: + return getStatesRef(); } return super.eGet(featureID, resolve, coreType); } @@ -134,9 +130,9 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES: - getStates().clear(); - getStates().addAll((Collection)newValue); + case TracePackage.GENERIC_VALUE__STATES_REF: + getStatesRef().clear(); + getStatesRef().addAll((Collection)newValue); return; } super.eSet(featureID, newValue); @@ -150,8 +146,8 @@ public void eSet(int featureID, Object newValue) { @Override public void eUnset(int featureID) { switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES: - getStates().clear(); + case TracePackage.GENERIC_VALUE__STATES_REF: + getStatesRef().clear(); return; } super.eUnset(featureID); @@ -165,8 +161,8 @@ public void eUnset(int featureID) { @Override public boolean eIsSet(int featureID) { switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES: - return states != null && !states.isEmpty(); + case TracePackage.GENERIC_VALUE__STATES_REF: + return statesRef != null && !statesRef.isEmpty(); } return super.eIsSet(featureID); } @@ -179,8 +175,8 @@ public boolean eIsSet(int featureID) { @Override public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { - case TracePackage.GENERIC_VALUE___GET_STATES_VIEW: - return getStatesView(); + case TracePackage.GENERIC_VALUE___GET_STATES: + return getStates(); } return super.eInvoke(operationID, arguments); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java index 23e3f79e6..49328f144 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java @@ -3,6 +3,7 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.ParallelStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TracePackage; @@ -15,7 +16,7 @@ * * @generated */ -public class ParallelStepImpl extends BigStepImpl implements ParallelStep { +public class ParallelStepImpl, StateSubType extends State> extends BigStepImpl implements ParallelStep { /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java index 3f9c786d8..c01eb16e9 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java @@ -3,6 +3,7 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TracePackage; @@ -15,7 +16,7 @@ * * @generated */ -public class SequentialStepImpl extends BigStepImpl implements SequentialStep { +public class SequentialStepImpl, StateSubType extends State> extends BigStepImpl implements SequentialStep { /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java index 50c9c62f1..368c9512f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java @@ -3,6 +3,7 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.SmallStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; @@ -14,7 +15,7 @@ * * @generated */ -public abstract class SmallStepImpl extends StepImpl implements SmallStep { +public abstract class SmallStepImpl> extends StepImpl implements SmallStep { /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java index 425bec2fb..c16335488 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java @@ -3,10 +3,10 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.commons.model.trace.Value; - -import java.lang.reflect.InvocationTargetException; +import java.util.Collection; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; @@ -15,10 +15,18 @@ * * An implementation of the model object 'State'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getStartedSteps Started Steps}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getEndedSteps Ended Steps}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getValues Values}
    • + *
* * @generated */ -public abstract class StateImpl extends MinimalEObjectImpl.Container implements State { +public abstract class StateImpl, ValueSubType extends Value> extends MinimalEObjectImpl.Container implements State { /** * * @@ -43,24 +51,120 @@ protected EClass eStaticClass() { * * @generated */ - public EList getValuesView() { - // TODO: implement this method + public EList getStartedSteps() { + // TODO: implement this method to return the 'Started Steps' reference list + // Ensure that you remove @generated or mark it @generated NOT + // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting + // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. + throw new UnsupportedOperationException(); + } + + /** + * + * + * @generated + */ + public EList getEndedSteps() { + // TODO: implement this method to return the 'Ended Steps' reference list // Ensure that you remove @generated or mark it @generated NOT + // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting + // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. throw new UnsupportedOperationException(); } + /** + * + * + * @generated + */ + public EList getValues() { + // TODO: implement this method to return the 'Values' reference list + // Ensure that you remove @generated or mark it @generated NOT + // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting + // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. + throw new UnsupportedOperationException(); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + return getStartedSteps(); + case TracePackage.STATE__ENDED_STEPS: + return getEndedSteps(); + case TracePackage.STATE__VALUES: + return getValues(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + getStartedSteps().clear(); + getStartedSteps().addAll((Collection)newValue); + return; + case TracePackage.STATE__ENDED_STEPS: + getEndedSteps().clear(); + getEndedSteps().addAll((Collection)newValue); + return; + case TracePackage.STATE__VALUES: + getValues().clear(); + getValues().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + getStartedSteps().clear(); + return; + case TracePackage.STATE__ENDED_STEPS: + getEndedSteps().clear(); + return; + case TracePackage.STATE__VALUES: + getValues().clear(); + return; + } + super.eUnset(featureID); + } + /** * * * @generated */ @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case TracePackage.STATE___GET_VALUES_VIEW: - return getValuesView(); + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + return !getStartedSteps().isEmpty(); + case TracePackage.STATE__ENDED_STEPS: + return !getEndedSteps().isEmpty(); + case TracePackage.STATE__VALUES: + return !getValues().isEmpty(); } - return super.eInvoke(operationID, arguments); + return super.eIsSet(featureID); } } //StateImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java index 76f348768..be9915e0d 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java @@ -3,6 +3,7 @@ package fr.inria.diverse.trace.commons.model.trace.impl; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TracePackage; @@ -24,11 +25,13 @@ *

*
    *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getMseoccurrence Mseoccurrence}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getStartingState Starting State}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getEndingState Ending State}
    • *
* * @generated */ -public abstract class StepImpl extends MinimalEObjectImpl.Container implements Step { +public abstract class StepImpl> extends MinimalEObjectImpl.Container implements Step { /** * The cached value of the '{@link #getMseoccurrence() Mseoccurrence}' containment reference. * @@ -101,6 +104,74 @@ else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STEP__MSEOCCURRENCE, newMseoccurrence, newMseoccurrence)); } + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + public StateSubType getStartingState() { + StateSubType startingState = basicGetStartingState(); + return startingState != null && startingState.eIsProxy() ? (StateSubType)eResolveProxy((InternalEObject)startingState) : startingState; + } + + /** + * + * + * @generated + */ + public StateSubType basicGetStartingState() { + // TODO: implement this method to return the 'Starting State' reference + // -> do not perform proxy resolution + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * + * + * @generated + */ + public void setStartingState(StateSubType newStartingState) { + // TODO: implement this method to set the 'Starting State' reference + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + public StateSubType getEndingState() { + StateSubType endingState = basicGetEndingState(); + return endingState != null && endingState.eIsProxy() ? (StateSubType)eResolveProxy((InternalEObject)endingState) : endingState; + } + + /** + * + * + * @generated + */ + public StateSubType basicGetEndingState() { + // TODO: implement this method to return the 'Ending State' reference + // -> do not perform proxy resolution + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * + * + * @generated + */ + public void setEndingState(StateSubType newEndingState) { + // TODO: implement this method to set the 'Ending State' reference + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + /** * * @@ -125,6 +196,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case TracePackage.STEP__MSEOCCURRENCE: return getMseoccurrence(); + case TracePackage.STEP__STARTING_STATE: + if (resolve) return getStartingState(); + return basicGetStartingState(); + case TracePackage.STEP__ENDING_STATE: + if (resolve) return getEndingState(); + return basicGetEndingState(); } return super.eGet(featureID, resolve, coreType); } @@ -134,12 +211,19 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { * * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { case TracePackage.STEP__MSEOCCURRENCE: setMseoccurrence((MSEOccurrence)newValue); return; + case TracePackage.STEP__STARTING_STATE: + setStartingState((StateSubType)newValue); + return; + case TracePackage.STEP__ENDING_STATE: + setEndingState((StateSubType)newValue); + return; } super.eSet(featureID, newValue); } @@ -155,6 +239,12 @@ public void eUnset(int featureID) { case TracePackage.STEP__MSEOCCURRENCE: setMseoccurrence((MSEOccurrence)null); return; + case TracePackage.STEP__STARTING_STATE: + setStartingState((StateSubType)null); + return; + case TracePackage.STEP__ENDING_STATE: + setEndingState((StateSubType)null); + return; } super.eUnset(featureID); } @@ -169,6 +259,10 @@ public boolean eIsSet(int featureID) { switch (featureID) { case TracePackage.STEP__MSEOCCURRENCE: return mseoccurrence != null; + case TracePackage.STEP__STARTING_STATE: + return basicGetStartingState() != null; + case TracePackage.STEP__ENDING_STATE: + return basicGetEndingState() != null; } return super.eIsSet(featureID); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java index 026ca8581..97f8227b5 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java @@ -152,8 +152,8 @@ public GenericMSE createGenericMSE() { * * @generated */ - public SequentialStep createSequentialStep() { - SequentialStepImpl sequentialStep = new SequentialStepImpl(); + public , StateSubType extends State> SequentialStep createSequentialStep() { + SequentialStepImpl sequentialStep = new SequentialStepImpl(); return sequentialStep; } @@ -162,8 +162,8 @@ public SequentialStep createSequentialSt * * @generated */ - public ParallelStep createParallelStep() { - ParallelStepImpl parallelStep = new ParallelStepImpl(); + public , StateSubType extends State> ParallelStep createParallelStep() { + ParallelStepImpl parallelStep = new ParallelStepImpl(); return parallelStep; } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java index f927b0736..f68f13bd6 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java @@ -2,27 +2,25 @@ */ package fr.inria.diverse.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; +import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; + /** * * An implementation of the model object 'Trace'. @@ -39,7 +37,7 @@ * * @generated */ -public abstract class TraceImpl extends MinimalEObjectImpl.Container implements Trace { +public abstract class TraceImpl, TracedObjectSubtype extends TracedObject, StateSubType extends State> extends MinimalEObjectImpl.Container implements Trace { /** * The cached value of the '{@link #getRootStep() Root Step}' containment reference. * @@ -149,7 +147,7 @@ else if (eNotificationRequired()) */ public EList getTracedObjects() { if (tracedObjects == null) { - tracedObjects = new EObjectContainmentEList(EObject.class, this, TracePackage.TRACE__TRACED_OBJECTS); + tracedObjects = new EObjectContainmentEList(TracedObject.class, this, TracePackage.TRACE__TRACED_OBJECTS); } return tracedObjects; } @@ -161,7 +159,7 @@ public EList getTracedObjects() { */ public EList getStates() { if (states == null) { - states = new EObjectContainmentEList(EObject.class, this, TracePackage.TRACE__STATES); + states = new EObjectContainmentEList(State.class, this, TracePackage.TRACE__STATES); } return states; } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java index 7a4ef2e2a..461b6ef4f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java @@ -542,6 +542,24 @@ public EReference getStep_Mseoccurrence() { return (EReference)stepEClass.getEStructuralFeatures().get(0); } + /** + * + * + * @generated + */ + public EReference getStep_StartingState() { + return (EReference)stepEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EReference getStep_EndingState() { + return (EReference)stepEClass.getEStructuralFeatures().get(2); + } + /** * * @@ -709,8 +727,8 @@ public EClass getValue() { * * @generated */ - public EOperation getValue__GetStatesView() { - return valueEClass.getEOperations().get(0); + public EReference getValue_States() { + return (EReference)valueEClass.getEStructuralFeatures().get(0); } /** @@ -727,8 +745,26 @@ public EClass getState() { * * @generated */ - public EOperation getState__GetValuesView() { - return stateEClass.getEOperations().get(0); + public EReference getState_StartedSteps() { + return (EReference)stateEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getState_EndedSteps() { + return (EReference)stateEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EReference getState_Values() { + return (EReference)stateEClass.getEStructuralFeatures().get(2); } /** @@ -790,7 +826,7 @@ public EClass getGenericState() { * * @generated */ - public EReference getGenericState_Values() { + public EReference getGenericState_ValuesRef() { return (EReference)genericStateEClass.getEStructuralFeatures().get(0); } @@ -799,10 +835,46 @@ public EReference getGenericState_Values() { * * @generated */ - public EOperation getGenericState__GetValuesView() { + public EReference getGenericState_StartedStepsRef() { + return (EReference)genericStateEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EReference getGenericState_EndedStepsRef() { + return (EReference)genericStateEClass.getEStructuralFeatures().get(2); + } + + /** + * + * + * @generated + */ + public EOperation getGenericState__GetValues() { return genericStateEClass.getEOperations().get(0); } + /** + * + * + * @generated + */ + public EOperation getGenericState__GetStartedSteps() { + return genericStateEClass.getEOperations().get(1); + } + + /** + * + * + * @generated + */ + public EOperation getGenericState__GetEndedSteps() { + return genericStateEClass.getEOperations().get(2); + } + /** * * @@ -1001,6 +1073,42 @@ public EClass getGenericStep() { return genericStepEClass; } + /** + * + * + * @generated + */ + public EReference getGenericStep_StartingStateRef() { + return (EReference)genericStepEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getGenericStep_EndingStateRef() { + return (EReference)genericStepEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EOperation getGenericStep__GetStartingState() { + return genericStepEClass.getEOperations().get(0); + } + + /** + * + * + * @generated + */ + public EOperation getGenericStep__GetEndingState() { + return genericStepEClass.getEOperations().get(1); + } + /** * * @@ -1015,7 +1123,7 @@ public EClass getGenericValue() { * * @generated */ - public EReference getGenericValue_States() { + public EReference getGenericValue_StatesRef() { return (EReference)genericValueEClass.getEStructuralFeatures().get(0); } @@ -1024,7 +1132,7 @@ public EReference getGenericValue_States() { * * @generated */ - public EOperation getGenericValue__GetStatesView() { + public EOperation getGenericValue__GetStates() { return genericValueEClass.getEOperations().get(0); } @@ -1085,6 +1193,8 @@ public void createPackageContents() { stepEClass = createEClass(STEP); createEReference(stepEClass, STEP__MSEOCCURRENCE); + createEReference(stepEClass, STEP__STARTING_STATE); + createEReference(stepEClass, STEP__ENDING_STATE); bigStepEClass = createEClass(BIG_STEP); createEReference(bigStepEClass, BIG_STEP__SUB_STEPS); @@ -1114,10 +1224,12 @@ public void createPackageContents() { createEReference(dimensionEClass, DIMENSION__VALUES); valueEClass = createEClass(VALUE); - createEOperation(valueEClass, VALUE___GET_STATES_VIEW); + createEReference(valueEClass, VALUE__STATES); stateEClass = createEClass(STATE); - createEOperation(stateEClass, STATE___GET_VALUES_VIEW); + createEReference(stateEClass, STATE__STARTED_STEPS); + createEReference(stateEClass, STATE__ENDED_STEPS); + createEReference(stateEClass, STATE__VALUES); genericReferenceValueEClass = createEClass(GENERIC_REFERENCE_VALUE); createEReference(genericReferenceValueEClass, GENERIC_REFERENCE_VALUE__REFERENCE_VALUE); @@ -1128,8 +1240,12 @@ public void createPackageContents() { genericTracedObjectEClass = createEClass(GENERIC_TRACED_OBJECT); genericStateEClass = createEClass(GENERIC_STATE); - createEReference(genericStateEClass, GENERIC_STATE__VALUES); - createEOperation(genericStateEClass, GENERIC_STATE___GET_VALUES_VIEW); + createEReference(genericStateEClass, GENERIC_STATE__VALUES_REF); + createEReference(genericStateEClass, GENERIC_STATE__STARTED_STEPS_REF); + createEReference(genericStateEClass, GENERIC_STATE__ENDED_STEPS_REF); + createEOperation(genericStateEClass, GENERIC_STATE___GET_VALUES); + createEOperation(genericStateEClass, GENERIC_STATE___GET_STARTED_STEPS); + createEOperation(genericStateEClass, GENERIC_STATE___GET_ENDED_STEPS); genericTraceEClass = createEClass(GENERIC_TRACE); @@ -1168,10 +1284,14 @@ public void createPackageContents() { initializationMethodParameterEClass = createEClass(INITIALIZATION_METHOD_PARAMETER); genericStepEClass = createEClass(GENERIC_STEP); + createEReference(genericStepEClass, GENERIC_STEP__STARTING_STATE_REF); + createEReference(genericStepEClass, GENERIC_STEP__ENDING_STATE_REF); + createEOperation(genericStepEClass, GENERIC_STEP___GET_STARTING_STATE); + createEOperation(genericStepEClass, GENERIC_STEP___GET_ENDING_STATE); genericValueEClass = createEClass(GENERIC_VALUE); - createEReference(genericValueEClass, GENERIC_VALUE__STATES); - createEOperation(genericValueEClass, GENERIC_VALUE___GET_STATES_VIEW); + createEReference(genericValueEClass, GENERIC_VALUE__STATES_REF); + createEOperation(genericValueEClass, GENERIC_VALUE___GET_STATES); // Create data types iSerializableEDataType = createEDataType(ISERIALIZABLE); @@ -1204,26 +1324,104 @@ public void initializePackageContents() { EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); // Create type parameters + ETypeParameter stepEClass_StateSubType = addETypeParameter(stepEClass, "StateSubType"); ETypeParameter bigStepEClass_StepSubtype = addETypeParameter(bigStepEClass, "StepSubtype"); + ETypeParameter bigStepEClass_StateSubType = addETypeParameter(bigStepEClass, "StateSubType"); + ETypeParameter smallStepEClass_StateSubType = addETypeParameter(smallStepEClass, "StateSubType"); ETypeParameter sequentialStepEClass_StepSubtype = addETypeParameter(sequentialStepEClass, "StepSubtype"); + ETypeParameter sequentialStepEClass_StateSubType = addETypeParameter(sequentialStepEClass, "StateSubType"); ETypeParameter parallelStepEClass_StepSubtype = addETypeParameter(parallelStepEClass, "StepSubtype"); + ETypeParameter parallelStepEClass_StateSubType = addETypeParameter(parallelStepEClass, "StateSubType"); ETypeParameter traceEClass_StepSubType = addETypeParameter(traceEClass, "StepSubType"); ETypeParameter traceEClass_TracedObjectSubtype = addETypeParameter(traceEClass, "TracedObjectSubtype"); ETypeParameter traceEClass_StateSubType = addETypeParameter(traceEClass, "StateSubType"); ETypeParameter tracedObjectEClass_DimensionSubType = addETypeParameter(tracedObjectEClass, "DimensionSubType"); ETypeParameter dimensionEClass_ValueSubType = addETypeParameter(dimensionEClass, "ValueSubType"); + ETypeParameter valueEClass_StateSubType = addETypeParameter(valueEClass, "StateSubType"); + ETypeParameter stateEClass_StepSubType = addETypeParameter(stateEClass, "StepSubType"); + ETypeParameter stateEClass_ValueSubType = addETypeParameter(stateEClass, "ValueSubType"); ETypeParameter genericTracedObjectEClass_T = addETypeParameter(genericTracedObjectEClass, "T"); ETypeParameter genericTraceEClass_StepSubType = addETypeParameter(genericTraceEClass, "StepSubType"); // Set bounds for type parameters - EGenericType g1 = createEGenericType(this.getStep()); + EGenericType g1 = createEGenericType(this.getState()); + EGenericType g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + stepEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(bigStepEClass_StateSubType); + g1.getETypeArguments().add(g2); bigStepEClass_StepSubtype.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + bigStepEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + smallStepEClass_StateSubType.getEBounds().add(g1); g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(sequentialStepEClass_StateSubType); + g1.getETypeArguments().add(g2); sequentialStepEClass_StepSubtype.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + sequentialStepEClass_StateSubType.getEBounds().add(g1); g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(parallelStepEClass_StateSubType); + g1.getETypeArguments().add(g2); parallelStepEClass_StepSubtype.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(parallelStepEClass_StepSubtype); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + parallelStepEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + traceEClass_StepSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getTracedObject()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + traceEClass_TracedObjectSubtype.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + traceEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getDimension()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + tracedObjectEClass_DimensionSubType.getEBounds().add(g1); g1 = createEGenericType(this.getValue()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); dimensionEClass_ValueSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + valueEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + stateEClass_StepSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getValue()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + stateEClass_ValueSubType.getEBounds().add(g1); g1 = createEGenericType(ecorePackage.getEObject()); genericTracedObjectEClass_T.getEBounds().add(g1); g1 = createEGenericType(this.getGenericStep()); @@ -1232,30 +1430,48 @@ public void initializePackageContents() { // Add supertypes to classes mseEClass.getESuperTypes().add(theEcorePackage.getENamedElement()); genericMSEEClass.getESuperTypes().add(this.getMSE()); - bigStepEClass.getESuperTypes().add(this.getStep()); - smallStepEClass.getESuperTypes().add(this.getStep()); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(bigStepEClass_StateSubType); + g1.getETypeArguments().add(g2); + bigStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(smallStepEClass_StateSubType); + g1.getETypeArguments().add(g2); + smallStepEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(this.getBigStep()); - EGenericType g2 = createEGenericType(sequentialStepEClass_StepSubtype); + g2 = createEGenericType(sequentialStepEClass_StepSubtype); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(sequentialStepEClass_StateSubType); g1.getETypeArguments().add(g2); sequentialStepEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(this.getBigStep()); g2 = createEGenericType(parallelStepEClass_StepSubtype); g1.getETypeArguments().add(g2); + g2 = createEGenericType(parallelStepEClass_StateSubType); + g1.getETypeArguments().add(g2); parallelStepEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(this.getSequentialStep()); - g2 = createEGenericType(this.getStep()); + g2 = createEGenericType(this.getGenericStep()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(this.getGenericState()); g1.getETypeArguments().add(g2); genericSequentialStepEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(this.getGenericStep()); genericSequentialStepEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(this.getParallelStep()); - g2 = createEGenericType(this.getStep()); + g2 = createEGenericType(this.getGenericStep()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(this.getGenericState()); g1.getETypeArguments().add(g2); genericParallelStepEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(this.getGenericStep()); genericParallelStepEClass.getEGenericSuperTypes().add(g1); - genericSmallStepEClass.getESuperTypes().add(this.getSmallStep()); - genericSmallStepEClass.getESuperTypes().add(this.getGenericStep()); + g1 = createEGenericType(this.getSmallStep()); + g2 = createEGenericType(this.getGenericState()); + g1.getETypeArguments().add(g2); + genericSmallStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(this.getGenericStep()); + genericSmallStepEClass.getEGenericSuperTypes().add(g1); genericReferenceValueEClass.getESuperTypes().add(this.getGenericValue()); g1 = createEGenericType(this.getDimension()); g2 = createEGenericType(this.getGenericValue()); @@ -1265,7 +1481,12 @@ public void initializePackageContents() { g2 = createEGenericType(this.getGenericDimension()); g1.getETypeArguments().add(g2); genericTracedObjectEClass.getEGenericSuperTypes().add(g1); - genericStateEClass.getESuperTypes().add(this.getState()); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(this.getGenericStep()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(this.getGenericValue()); + g1.getETypeArguments().add(g2); + genericStateEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(this.getTrace()); g2 = createEGenericType(genericTraceEClass_StepSubType); g1.getETypeArguments().add(g2); @@ -1288,13 +1509,19 @@ public void initializePackageContents() { initializationArgumentsParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); modelRootParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); initializationMethodParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - genericStepEClass.getESuperTypes().add(this.getStep()); - genericValueEClass.getESuperTypes().add(this.getValue()); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(this.getGenericState()); + g1.getETypeArguments().add(g2); + genericStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(this.getValue()); + g2 = createEGenericType(this.getGenericState()); + g1.getETypeArguments().add(g2); + genericValueEClass.getEGenericSuperTypes().add(g1); // Initialize classes, features, and operations; add parameters initEClass(mseOccurrenceEClass, MSEOccurrence.class, "MSEOccurrence", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getMSEOccurrence_Mse(), this.getMSE(), null, "mse", null, 1, 1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMSEOccurrence_Parameters(), theEcorePackage.getEJavaObject(), "parameters", null, 0, -1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMSEOccurrence_Parameters(), ecorePackage.getEJavaObject(), "parameters", null, 0, -1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getMSEOccurrence_Result(), ecorePackage.getEJavaObject(), "result", null, 0, -1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(mseEClass, fr.inria.diverse.trace.commons.model.trace.MSE.class, "MSE", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1316,6 +1543,10 @@ public void initializePackageContents() { initEClass(stepEClass, Step.class, "Step", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getStep_Mseoccurrence(), this.getMSEOccurrence(), null, "mseoccurrence", null, 0, 1, Step.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(stepEClass_StateSubType); + initEReference(getStep_StartingState(), g1, null, "startingState", null, 1, 1, Step.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(stepEClass_StateSubType); + initEReference(getStep_EndingState(), g1, null, "endingState", null, 0, 1, Step.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(bigStepEClass, BigStep.class, "BigStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); g1 = createEGenericType(bigStepEClass_StepSubtype); @@ -1351,12 +1582,16 @@ public void initializePackageContents() { initEReference(getDimension_Values(), g1, null, "values", null, 0, -1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(valueEClass, Value.class, "Value", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEOperation(getValue__GetStatesView(), this.getState(), "getStatesView", 1, -1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(valueEClass_StateSubType); + initEReference(getValue_States(), g1, null, "states", null, 0, -1, Value.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(stateEClass, State.class, "State", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEOperation(getState__GetValuesView(), this.getValue(), "getValuesView", 0, -1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(stateEClass_StepSubType); + initEReference(getState_StartedSteps(), g1, null, "startedSteps", null, 0, -1, State.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(stateEClass_StepSubType); + initEReference(getState_EndedSteps(), g1, null, "endedSteps", null, 0, -1, State.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(stateEClass_ValueSubType); + initEReference(getState_Values(), g1, null, "values", null, 0, -1, State.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(genericReferenceValueEClass, GenericReferenceValue.class, "GenericReferenceValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getGenericReferenceValue_ReferenceValue(), ecorePackage.getEObject(), null, "referenceValue", null, 0, 1, GenericReferenceValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1367,26 +1602,32 @@ public void initializePackageContents() { initEClass(genericTracedObjectEClass, GenericTracedObject.class, "GenericTracedObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(genericStateEClass, GenericState.class, "GenericState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenericState_Values(), this.getGenericValue(), this.getGenericValue_States(), "values", null, 0, -1, GenericState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGenericState_ValuesRef(), this.getGenericValue(), this.getGenericValue_StatesRef(), "valuesRef", null, 0, -1, GenericState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGenericState_StartedStepsRef(), this.getGenericStep(), this.getGenericStep_StartingStateRef(), "startedStepsRef", null, 0, -1, GenericState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGenericState_EndedStepsRef(), this.getGenericStep(), this.getGenericStep_EndingStateRef(), "endedStepsRef", null, 0, -1, GenericState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEOperation(getGenericState__GetValuesView(), this.getValue(), "getValuesView", 0, -1, IS_UNIQUE, IS_ORDERED); + initEOperation(getGenericState__GetValues(), this.getGenericValue(), "getValues", 0, -1, IS_UNIQUE, IS_ORDERED); + + initEOperation(getGenericState__GetStartedSteps(), this.getGenericStep(), "getStartedSteps", 0, -1, IS_UNIQUE, IS_ORDERED); + + initEOperation(getGenericState__GetEndedSteps(), this.getGenericStep(), "getEndedSteps", 0, -1, IS_UNIQUE, IS_ORDERED); initEClass(genericTraceEClass, GenericTrace.class, "GenericTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(genericAttributeValueEClass, GenericAttributeValue.class, "GenericAttributeValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(booleanAttributeValueEClass, BooleanAttributeValue.class, "BooleanAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getBooleanAttributeValue_AttributeValue(), theEcorePackage.getEBoolean(), "attributeValue", "false", 0, 1, BooleanAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getBooleanAttributeValue_AttributeValue(), ecorePackage.getEBoolean(), "attributeValue", "false", 0, 1, BooleanAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(integerAttributevalueEClass, IntegerAttributevalue.class, "IntegerAttributevalue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIntegerAttributevalue_AttributeValue(), theEcorePackage.getEInt(), "attributeValue", null, 0, 1, IntegerAttributevalue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getIntegerAttributevalue_AttributeValue(), ecorePackage.getEInt(), "attributeValue", null, 0, 1, IntegerAttributevalue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(stringAttributeValueEClass, StringAttributeValue.class, "StringAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getStringAttributeValue_AttributeValue(), theEcorePackage.getEString(), "attributeValue", null, 0, 1, StringAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getStringAttributeValue_AttributeValue(), ecorePackage.getEString(), "attributeValue", null, 0, 1, StringAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(launchConfigurationEClass, LaunchConfiguration.class, "LaunchConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getLaunchConfiguration_Parameters(), this.getLaunchConfigurationParameter(), null, "parameters", null, 0, -1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getLaunchConfiguration_Type(), theEcorePackage.getEString(), "type", null, 1, 1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getLaunchConfiguration_Type(), ecorePackage.getEString(), "type", null, 1, 1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(launchConfigurationParameterEClass, LaunchConfigurationParameter.class, "LaunchConfigurationParameter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getLaunchConfigurationParameter_Value(), ecorePackage.getEString(), "value", "", 0, 1, LaunchConfigurationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1408,11 +1649,17 @@ public void initializePackageContents() { initEClass(initializationMethodParameterEClass, InitializationMethodParameter.class, "InitializationMethodParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(genericStepEClass, GenericStep.class, "GenericStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getGenericStep_StartingStateRef(), this.getGenericState(), this.getGenericState_StartedStepsRef(), "startingStateRef", null, 1, 1, GenericStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGenericStep_EndingStateRef(), this.getGenericState(), this.getGenericState_EndedStepsRef(), "endingStateRef", null, 0, 1, GenericStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEOperation(getGenericStep__GetStartingState(), this.getGenericState(), "getStartingState", 1, 1, IS_UNIQUE, IS_ORDERED); + + initEOperation(getGenericStep__GetEndingState(), this.getGenericState(), "getEndingState", 0, 1, IS_UNIQUE, IS_ORDERED); initEClass(genericValueEClass, GenericValue.class, "GenericValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenericValue_States(), this.getGenericState(), this.getGenericState_Values(), "states", null, 0, -1, GenericValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGenericValue_StatesRef(), this.getGenericState(), this.getGenericState_ValuesRef(), "statesRef", null, 0, -1, GenericValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEOperation(getGenericValue__GetStatesView(), this.getState(), "getStatesView", 1, -1, IS_UNIQUE, IS_ORDERED); + initEOperation(getGenericValue__GetStates(), this.getGenericState(), "getStates", 1, -1, IS_UNIQUE, IS_ORDERED); // Initialize data types initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java index 036da5c3d..62168e462 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java @@ -2,6 +2,7 @@ */ package fr.inria.diverse.trace.commons.model.trace.impl; +import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.commons.model.trace.TracedObject; @@ -11,7 +12,6 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; @@ -31,7 +31,7 @@ * * @generated */ -public abstract class TracedObjectImpl extends MinimalEObjectImpl.Container implements TracedObject { +public abstract class TracedObjectImpl> extends MinimalEObjectImpl.Container implements TracedObject { /** * The cached value of the '{@link #getDimensions() Dimensions}' containment reference list. * @@ -68,7 +68,7 @@ protected EClass eStaticClass() { */ public EList getDimensions() { if (dimensions == null) { - dimensions = new EObjectContainmentEList(EObject.class, this, TracePackage.TRACED_OBJECT__DIMENSIONS); + dimensions = new EObjectContainmentEList(Dimension.class, this, TracePackage.TRACED_OBJECT__DIMENSIONS); } return dimensions; } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java index abdeabe22..1b462dc18 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java @@ -5,7 +5,7 @@ import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.commons.model.trace.Value; -import java.lang.reflect.InvocationTargetException; +import java.util.Collection; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; @@ -14,10 +14,16 @@ * * An implementation of the model object 'Value'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl#getStates States}
    • + *
* * @generated */ -public abstract class ValueImpl extends MinimalEObjectImpl.Container implements Value { +public abstract class ValueImpl> extends MinimalEObjectImpl.Container implements Value { /** * * @@ -42,9 +48,11 @@ protected EClass eStaticClass() { * * @generated */ - public EList getStatesView() { - // TODO: implement this method + public EList getStates() { + // TODO: implement this method to return the 'States' reference list // Ensure that you remove @generated or mark it @generated NOT + // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting + // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. throw new UnsupportedOperationException(); } @@ -54,12 +62,58 @@ public EList getStatesView() { * @generated */ @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case TracePackage.VALUE___GET_STATES_VIEW: - return getStatesView(); + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.VALUE__STATES: + return getStates(); } - return super.eInvoke(operationID, arguments); + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.VALUE__STATES: + getStates().clear(); + getStates().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.VALUE__STATES: + getStates().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.VALUE__STATES: + return !getStates().isEmpty(); + } + return super.eIsSet(featureID); } } //ValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java index c9ed7a2f9..79c674ddf 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java @@ -86,23 +86,23 @@ public Adapter caseGenericMSE(GenericMSE object) { return createGenericMSEAdapter(); } @Override - public Adapter caseStep(Step object) { + public > Adapter caseStep(Step object) { return createStepAdapter(); } @Override - public Adapter caseBigStep(BigStep object) { + public , StateSubType extends State> Adapter caseBigStep(BigStep object) { return createBigStepAdapter(); } @Override - public Adapter caseSmallStep(SmallStep object) { + public > Adapter caseSmallStep(SmallStep object) { return createSmallStepAdapter(); } @Override - public Adapter caseSequentialStep(SequentialStep object) { + public , StateSubType extends State> Adapter caseSequentialStep(SequentialStep object) { return createSequentialStepAdapter(); } @Override - public Adapter caseParallelStep(ParallelStep object) { + public , StateSubType extends State> Adapter caseParallelStep(ParallelStep object) { return createParallelStepAdapter(); } @Override @@ -118,23 +118,23 @@ public Adapter caseGenericSmallStep(GenericSmallStep object) { return createGenericSmallStepAdapter(); } @Override - public Adapter caseTrace(Trace object) { + public , TracedObjectSubtype extends TracedObject, StateSubType extends State> Adapter caseTrace(Trace object) { return createTraceAdapter(); } @Override - public Adapter caseTracedObject(TracedObject object) { + public > Adapter caseTracedObject(TracedObject object) { return createTracedObjectAdapter(); } @Override - public Adapter caseDimension(Dimension object) { + public > Adapter caseDimension(Dimension object) { return createDimensionAdapter(); } @Override - public Adapter caseValue(Value object) { + public > Adapter caseValue(Value object) { return createValueAdapter(); } @Override - public Adapter caseState(State object) { + public , ValueSubType extends Value> Adapter caseState(State object) { return createStateAdapter(); } @Override diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java index 6e8740dc0..438216fd8 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java @@ -98,27 +98,27 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { return result; } case TracePackage.STEP: { - Step step = (Step)theEObject; + Step step = (Step)theEObject; T1 result = caseStep(step); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.BIG_STEP: { - BigStep bigStep = (BigStep)theEObject; + BigStep bigStep = (BigStep)theEObject; T1 result = caseBigStep(bigStep); if (result == null) result = caseStep(bigStep); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.SMALL_STEP: { - SmallStep smallStep = (SmallStep)theEObject; + SmallStep smallStep = (SmallStep)theEObject; T1 result = caseSmallStep(smallStep); if (result == null) result = caseStep(smallStep); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.SEQUENTIAL_STEP: { - SequentialStep sequentialStep = (SequentialStep)theEObject; + SequentialStep sequentialStep = (SequentialStep)theEObject; T1 result = caseSequentialStep(sequentialStep); if (result == null) result = caseBigStep(sequentialStep); if (result == null) result = caseStep(sequentialStep); @@ -126,7 +126,7 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { return result; } case TracePackage.PARALLEL_STEP: { - ParallelStep parallelStep = (ParallelStep)theEObject; + ParallelStep parallelStep = (ParallelStep)theEObject; T1 result = caseParallelStep(parallelStep); if (result == null) result = caseBigStep(parallelStep); if (result == null) result = caseStep(parallelStep); @@ -181,13 +181,13 @@ protected T1 doSwitch(int classifierID, EObject theEObject) { return result; } case TracePackage.VALUE: { - Value value = (Value)theEObject; + Value value = (Value)theEObject; T1 result = caseValue(value); if (result == null) result = defaultCase(theEObject); return result; } case TracePackage.STATE: { - State state = (State)theEObject; + State state = (State)theEObject; T1 result = caseState(state); if (result == null) result = defaultCase(theEObject); return result; @@ -420,7 +420,7 @@ public T1 caseGenericMSE(GenericMSE object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseStep(Step object) { + public > T1 caseStep(Step object) { return null; } @@ -435,7 +435,7 @@ public T1 caseStep(Step object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseBigStep(BigStep object) { + public , StateSubType extends State> T1 caseBigStep(BigStep object) { return null; } @@ -450,7 +450,7 @@ public T1 caseBigStep(BigStep object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseSmallStep(SmallStep object) { + public > T1 caseSmallStep(SmallStep object) { return null; } @@ -465,7 +465,7 @@ public T1 caseSmallStep(SmallStep object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseSequentialStep(SequentialStep object) { + public , StateSubType extends State> T1 caseSequentialStep(SequentialStep object) { return null; } @@ -480,7 +480,7 @@ public T1 caseSequentialStep(SequentialStep T1 caseParallelStep(ParallelStep object) { + public , StateSubType extends State> T1 caseParallelStep(ParallelStep object) { return null; } @@ -540,7 +540,7 @@ public T1 caseGenericSmallStep(GenericSmallStep object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseTrace(Trace object) { + public , TracedObjectSubtype extends TracedObject, StateSubType extends State> T1 caseTrace(Trace object) { return null; } @@ -555,7 +555,7 @@ public T1 caseTrace(Trace T1 caseTracedObject(TracedObject object) { + public > T1 caseTracedObject(TracedObject object) { return null; } @@ -570,7 +570,7 @@ public T1 caseTracedObject(TracedObject obj * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseDimension(Dimension object) { + public > T1 caseDimension(Dimension object) { return null; } @@ -585,7 +585,7 @@ public T1 caseDimension(Dimension obj * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseValue(Value object) { + public > T1 caseValue(Value object) { return null; } @@ -600,7 +600,7 @@ public T1 caseValue(Value object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseState(State object) { + public , ValueSubType extends Value> T1 caseState(State object) { return null; } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java index 0de917e44..4337041f8 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java @@ -14,32 +14,35 @@ import org.eclipse.emf.ecore.EObject; +import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; -public interface ITraceExplorer extends ITraceViewNotifier, ITraceListener { +public interface ITraceExplorer, StateSubType extends State, TracedObjectSubType extends TracedObject, DimensionSubType extends Dimension, ValueSubType extends Value> extends ITraceViewNotifier, ITraceListener { /** * @return The current step */ - Step getCurrentForwardStep(); + StepSubType getCurrentForwardStep(); /** * @return The step (big or small) preceding the current step */ - Step getCurrentBackwardStep(); + StepSubType getCurrentBackwardStep(); /** * @return The big step containing the current step */ - Step getCurrentBigStep(); + StepSubType getCurrentBigStep(); /** * @return The index of the current state in the trace */ int getCurrentStateIndex(); - State getCurrentState(); + StateSubType getCurrentState(); /** * If o is a state, updates the explorer so that o becomes the current state. @@ -156,12 +159,12 @@ public interface ITraceExplorer extends ITraceViewNotifier, ITraceListener { * Returns the current call stack of the explorer. The current step is at the end of the list. * @return The current call stack */ - List getCallStack(); + List getCallStack(); /** * Updates the call stack of the explorer so that the provided step becomes the current step. * The state of the explorer is then recomputed accordingly. * @param step The step that will become the current step */ - void updateCallStack(Step step); + void updateCallStack(StepSubType step); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java index 73efdf888..9baee8f87 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java @@ -12,27 +12,28 @@ import java.util.List; -import org.eclipse.emf.ecore.EObject; - +import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.commons.model.trace.Value; -public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { +public interface ITraceExtractor, StateSubType extends State, TracedObjectSubType extends TracedObject, DimensionSubType extends Dimension, ValueSubType extends Value> extends ITraceViewNotifier, ITraceListener { /** * Tells the extractor to ignore or not the value trace located at the provided index. * @param trace The index of the value trace * @param ignore Wether to ignore or not the value trace */ - void ignoreValueTrace(int trace, boolean ignore); + void ignoreDimension(DimensionSubType dimension, boolean ignore); /** * Returns whether the value trace located at the provided index is ignored or not. * @param trace The index of the value trace * @return true if the value trace is ignored, false otherwise */ - boolean isValueTraceIgnored(int trace); + boolean isDimensionIgnored(DimensionSubType dimension); /** * Compares two states and returns true if their values vector are the same, false otherwise. @@ -41,20 +42,20 @@ public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { * @param respectIgnored Whether to include ignored values in the comparison or not * @return true if the values vectors of the states are the same, false otherwise */ - boolean compareStates(EObject state1, EObject state2, boolean respectIgnored); + boolean compareStates(StateSubType state1, StateSubType state2, boolean respectIgnored); /** * Computes the lists of states that have the same values vectors, for a given list of states. * @param states The list of states to process * @return The lists of states that have the same values vectors */ - List> computeStateEquivalenceClasses(List states); + List> computeStateEquivalenceClasses(List states); /** * Computes the lists of states that have the same values vectors, for all the states of the trace. * @return The lists of states that have the same values vectors */ - List> computeStateEquivalenceClasses(); + List> computeStateEquivalenceClasses(); /** * @return the launch configuration that was used to generate the trace @@ -64,7 +65,7 @@ public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { /** * @return The number of value traces in the trace */ - int getNumberOfTraces(); + int getNumberOfDimensions(); /** * Returns a description of the state located at the provided index. @@ -73,6 +74,8 @@ public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { */ String getStateDescription(int stateIndex); + String getStateDescription(StateSubType state); + /** * @return The number of states in the trace */ @@ -82,25 +85,25 @@ public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { * @param stateIndex The index of the state in the trace * @return The state */ - State getState(int stateIndex); + StateSubType getState(int stateIndex); /** * @param state The state * @return The index of the state in the trace */ - int getStateIndex(State state); + int getStateIndex(StateSubType state); /** * @param value the value * @return The index of the first state in which the value is present */ - int getValueFirstStateIndex(Value value); + int getValueFirstStateIndex(ValueSubType value); /** * @param value the value * @return The index of the last state in which the value is present */ - int getValueLastStateIndex(Value value); + int getValueLastStateIndex(ValueSubType value); /** * Returns a description of the value located on the provided value trace index and at the provided state index. @@ -110,12 +113,16 @@ public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { */ String getValueDescription(int traceIndex, int stateIndex); + String getValueDescription(ValueSubType value); + /** * Returns a label for the value trace located at the provided index * @param traceIndex The index of the value trace * @return A label for the value trace */ - String getValueLabel(int traceIndex); + String getDimensionLabel(int traceIndex); + + String getDimensionLabel(DimensionSubType dimension); /** * @param traceIndex The index of the value trace @@ -123,5 +130,5 @@ public interface ITraceExtractor extends ITraceViewNotifier, ITraceListener { */ int getValuesTraceLength(int traceIndex); - int + int getValuesTraceLength(DimensionSubType dimension); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java index ba0003525..93962cddd 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java @@ -19,13 +19,13 @@ public interface ITraceListener { - void statesAdded(List states); + void statesAdded(List> states); - void stepsStarted(List steps); + void stepsStarted(List> steps); - void stepsEnded(List steps); + void stepsEnded(List> steps); - void valuesAdded(List values); + void valuesAdded(List> values); - void dimensionsAdded(List> dimensions); + void dimensionsAdded(List> dimensions); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index 3537cd8ee..b4387bd09 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -9,14 +9,18 @@ import org.eclipse.emf.ecore.resource.Resource; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; +import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; import fr.inria.diverse.trace.commons.model.trace.GenericState; import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; import fr.inria.diverse.trace.commons.model.trace.TraceFactory; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; public class GenericTraceConstructor implements ITraceConstructor { @@ -25,6 +29,8 @@ public class GenericTraceConstructor implements ITraceConstructor { private Resource traceResource; private final Deque context = new LinkedList(); + private Trace, Value>>>, TracedObject>>, State, Value>>> trace; + public GenericTraceConstructor(Resource traceResource) { this.traceResource = traceResource; } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java index 63010d6e6..b26702fde 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java @@ -7,44 +7,57 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.Predicate; import java.util.stream.Collectors; import org.eclipse.emf.ecore.EObject; +import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.GenericState; import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; -public class GenericTraceExplorer implements ITraceExplorer { +public class GenericTraceExplorer implements ITraceExplorer, State, TracedObject, Dimension, Value> { - private Trace, GenericTracedObject, GenericState> traceRoot; + private Trace, ?, ?> traceRoot; - final private List callStack = new ArrayList<>(); + final private List> callStack = new ArrayList<>(); - private Step stepIntoResult; - private Step stepOverResult; - private Step stepReturnResult; + private Step stepIntoResult; + private Step stepOverResult; + private Step stepReturnResult; - private Step stepBackIntoResult; - private Step stepBackOverResult; - private Step stepBackOutResult; + private Step stepBackIntoResult; + private Step stepBackOverResult; + private Step stepBackOutResult; private Map> listeners = new HashMap<>(); + + private List> getSubSteps(Step step) { + if (step instanceof BigStep) { + return ((BigStep) step).getSubSteps(); + } else { + return Collections.emptyList(); + } + } - @SuppressWarnings("unchecked") - private Step computeBackInto(List stepPath) { - final List rootSteps = traceRoot.getRootStep().getSubSteps(); + private Step computeBackInto(List> stepPath) { + final List> rootSteps = getSubSteps(traceRoot.getRootStep()); final int depth = stepPath.size(); - Step result = null; + Step result = null; if (depth > 1) { - final Step currentStep = stepPath.get(depth - 1); - final Step parentStep = stepPath.get(depth - 2); - final SequentialStep parentStep_cast = (SequentialStep) parentStep; - final List parentSubSteps = parentStep_cast.getSubSteps(); + final Step currentStep = stepPath.get(depth - 1); + final Step parentStep = stepPath.get(depth - 2); + final SequentialStep parentStep_cast = (SequentialStep) parentStep; + final List> parentSubSteps = parentStep_cast.getSubSteps(); final int idx = parentSubSteps.indexOf(currentStep); if (idx == 0) { // If the current step is the first in its parents substeps, @@ -53,40 +66,40 @@ private Step computeBackInto(List stepPath) { } else if (idx > 0) { // Otherwise, return the deepest substep in the previous sibling // step - final Step previousSiblingStep = parentSubSteps.get(idx - 1); - Step tmpStep = previousSiblingStep; - final List tmpSubSteps = new ArrayList<>(); + final Step previousSiblingStep = parentSubSteps.get(idx - 1); + Step tmpStep = previousSiblingStep; + final List> tmpSubSteps = new ArrayList<>(); tmpSubSteps.clear(); - if (tmpStep instanceof SequentialStep) { - SequentialStep tmpStep_cast = (SequentialStep) tmpStep; + if (tmpStep instanceof SequentialStep) { + SequentialStep tmpStep_cast = (SequentialStep) tmpStep; tmpSubSteps.addAll(tmpStep_cast.getSubSteps()); } while (!tmpSubSteps.isEmpty()) { tmpStep = tmpSubSteps.get(tmpSubSteps.size() - 1); tmpSubSteps.clear(); - if (tmpStep instanceof SequentialStep) { - SequentialStep tmpStep_cast = (SequentialStep) tmpStep; + if (tmpStep instanceof SequentialStep) { + SequentialStep tmpStep_cast = (SequentialStep) tmpStep; tmpSubSteps.addAll(tmpStep_cast.getSubSteps()); } } result = tmpStep; } } else if (depth == 1) { - final Step currentStep = stepPath.get(0); + final Step currentStep = stepPath.get(0); final int idx = rootSteps.indexOf(currentStep); if (idx > 0) { - Step tmpStep = rootSteps.get(idx - 1); - final List tmpSubSteps = new ArrayList<>(); + Step tmpStep = rootSteps.get(idx - 1); + final List> tmpSubSteps = new ArrayList<>(); tmpSubSteps.clear(); - if (tmpStep instanceof SequentialStep) { - SequentialStep tmpStep_cast = (SequentialStep) tmpStep; + if (tmpStep instanceof SequentialStep) { + SequentialStep tmpStep_cast = (SequentialStep) tmpStep; tmpSubSteps.addAll(tmpStep_cast.getSubSteps()); } while (!tmpSubSteps.isEmpty()) { tmpStep = tmpSubSteps.get(tmpSubSteps.size() - 1); tmpSubSteps.clear(); - if (tmpStep instanceof SequentialStep) { - SequentialStep tmpStep_cast = (SequentialStep) tmpStep; + if (tmpStep instanceof SequentialStep) { + SequentialStep tmpStep_cast = (SequentialStep) tmpStep; tmpSubSteps.addAll(tmpStep_cast.getSubSteps()); } } @@ -96,16 +109,15 @@ private Step computeBackInto(List stepPath) { return result; } - @SuppressWarnings("unchecked") - private Step computeBackOver(List stepPath) { - final List rootSteps = traceRoot.getRootStep().getSubSteps(); + private Step computeBackOver(List> stepPath) { + final List> rootSteps = getSubSteps(traceRoot.getRootStep()); final int depth = stepPath.size(); - Step result = null; + Step result = null; if (depth > 1) { - final Step currentStep = stepPath.get(depth - 1); - final Step parentStep = stepPath.get(depth - 2); - final SequentialStep parentStep_cast = (SequentialStep) parentStep; - final List parentSubSteps = parentStep_cast.getSubSteps(); + final Step currentStep = stepPath.get(depth - 1); + final Step parentStep = stepPath.get(depth - 2); + final BigStep parentStep_cast = (BigStep) parentStep; + final List> parentSubSteps = parentStep_cast.getSubSteps(); final int idx = parentSubSteps.indexOf(currentStep); if (idx == 0) { // If the current step is the first in its parents substeps, @@ -116,7 +128,7 @@ private Step computeBackOver(List stepPath) { result = parentSubSteps.get(idx - 1); } } else if (depth == 1) { - final Step currentStep = stepPath.get(0); + final Step currentStep = stepPath.get(0); final int idx = rootSteps.indexOf(currentStep); if (idx > 0) { result = rootSteps.get(idx - 1); @@ -125,43 +137,42 @@ private Step computeBackOver(List stepPath) { return result; } - private Step computeBackOut(List stepPath) { + private Step computeBackOut(List> stepPath) { if (stepPath.size() > 1) { return stepPath.get(stepPath.size() - 2); } return null; } - private Step computeStepInto(List stepPath, List rootSteps) { + private Step computeStepInto(List> stepPath, List> rootSteps) { return findNextStep(stepPath, null, 0); } - private Step computeStepOver(List stepPath, List rootSteps) { + private Step computeStepOver(List> stepPath, List> rootSteps) { if (!stepPath.isEmpty()) { return findNextStep(stepPath, stepPath.get(stepPath.size() - 1), 1); } return null; } - private Step computeStepReturn(List stepPath, List rootSteps) { + private Step computeStepReturn(List> stepPath, List> rootSteps) { if (stepPath.size() > 1) { return findNextStep(stepPath, stepPath.get(stepPath.size() - 2), 2); } return null; } - @SuppressWarnings("unchecked") - private Step findNextStep(final List stepPath, final Step previousStep, final int start) { - final List rootSteps = traceRoot.getRootStep().getSubSteps(); - Step result = null; + private Step findNextStep(final List> stepPath, final Step previousStep, final int start) { + final List> rootSteps = getSubSteps(traceRoot.getRootStep()); + Step result = null; int i = start; int depth = stepPath.size(); - Step previous = previousStep; + Step previous = previousStep; while (result == null && i < depth) { - final Step currentStep = stepPath.get(depth - i - 1); - final List currentSubSteps = new ArrayList<>(); - if (currentStep instanceof SequentialStep) { - currentSubSteps.addAll(((SequentialStep) currentStep).getSubSteps()); + final Step currentStep = stepPath.get(depth - i - 1); + final List> currentSubSteps = new ArrayList<>(); + if (currentStep instanceof BigStep) { + currentSubSteps.addAll(((BigStep) currentStep).getSubSteps()); } if (currentSubSteps.isEmpty()) { // No substep to step into, we thus have to explore the substeps @@ -192,10 +203,10 @@ private Step findNextStep(final List stepPath, final Step previousStep, fi return result; } - private void computeExplorerState(List stepPath) { - final List rootSteps = traceRoot.getRootStep().getSubSteps(); + private void computeExplorerState(List> stepPath) { + final List> rootSteps = getSubSteps(traceRoot.getRootStep()); - final List stepPathUnmodifiable = Collections.unmodifiableList(stepPath); + final List> stepPathUnmodifiable = Collections.unmodifiableList(stepPath); stepIntoResult = computeStepInto(stepPathUnmodifiable, rootSteps); stepOverResult = computeStepOver(stepPathUnmodifiable, rootSteps); @@ -206,19 +217,49 @@ private void computeExplorerState(List stepPath) { stepBackOutResult = computeBackOut(stepPathUnmodifiable); callStack.clear(); - callStack.addAll(stepPathUnmodifiable.stream().map(s -> (Step) s).collect(Collectors.toList())); + callStack.addAll(stepPathUnmodifiable.stream().map(s -> (Step) s).collect(Collectors.toList())); + } + + private void goTo(State state) { + if (modelResource != null) { + try { + final TransactionalEditingDomain ed = TransactionUtil.getEditingDomain(modelResource); + if (ed != null) { + final RecordingCommand command = new RecordingCommand(ed, "") { + protected void doExecute() { + goTo(states); + } + }; + CommandExecution.execute(ed, command); + } + } catch (Exception e) { + throw e; + } + } } - - private void jumpBeforeStep(Step step) { - updateCallStack(step); + + private void jumpBeforeStep(Step step) { + if (step != null) { + final State state = step.getStartingState(); + final List> states = traceRoot.getStates(); + final int i = states.indexOf(state); + if (i == states.size() - 1) { + lastJumpIndex = -1; + } else { + lastJumpIndex = i; + } + currentState = state; + goTo(i); + updateCallStack(step); + } } - public void loadTrace(Trace, GenericTracedObject, GenericState> root) { + public void loadTrace(Trace, GenericTracedObject, GenericState> root) { traceRoot = root; } @Override - public Step getCurrentForwardStep() { + public Step getCurrentForwardStep() { if (!callStack.isEmpty()) { return callStack.get(callStack.size() - 1); } @@ -226,12 +267,12 @@ public Step getCurrentForwardStep() { } @Override - public Step getCurrentBackwardStep() { + public Step getCurrentBackwardStep() { return stepBackOverResult; } @Override - public Step getCurrentBigStep() { + public Step getCurrentBigStep() { return stepBackOutResult; } @@ -247,17 +288,30 @@ public void jump(EObject o) { @Override public void jump(int i) { } - - @SuppressWarnings("unchecked") + + private List> getStepsForStates(int startingState, int endingState) { + final List> states = traceRoot.getStates(); + Predicate> predicate = s -> { + final State stepStartingState = s.getStartingState(); + final State stepEndingState = s.getEndingState(); + final int stepStartingIndex = states.indexOf(stepStartingState); + final int stepEndingIndex = stepEndingState == null ? -1 : states.indexOf(stepEndingState); + return (stepEndingIndex == -1 || stepEndingIndex >= startingState) && stepStartingIndex <= endingState; + }; + return getSubSteps(traceRoot.getRootStep()).stream().filter(predicate).collect(Collectors.toList()); + } + @Override public void loadLastState() { - final List steps = traceRoot.getRootStep().getSubSteps(); - Step lastStep = null; + final int idx = traceRoot.getStates().size() - 1; + final List> steps = new ArrayList<>(getStepsForStates(idx, idx)); + Step lastStep = null; while (!steps.isEmpty()) { lastStep = steps.get(steps.size() - 1); steps.clear(); - if (lastStep instanceof SequentialStep) { - steps.addAll(((SequentialStep) lastStep).getSubSteps()); + if (lastStep instanceof BigStep) { + final List> subSteps = ((BigStep) lastStep).getSubSteps(); + steps.addAll(subSteps); } } jumpBeforeStep(lastStep); @@ -356,18 +410,18 @@ public boolean isInReplayMode() { } @Override - public List getCallStack() { + public List> getCallStack() { return callStack; } @Override - public void updateCallStack(Step step) { - Step step_cast = (Step) step; - final List newPath = new ArrayList<>(); + public void updateCallStack(Step step) { + Step step_cast = (Step) step; + final List> newPath = new ArrayList<>(); newPath.add(step_cast); EObject container = step.eContainer(); while (container != null && container instanceof Step) { - newPath.add(0, (Step) container); + newPath.add(0, (Step) container); container = container.eContainer(); } computeExplorerState(newPath); @@ -401,33 +455,38 @@ public void removeListener(ITraceViewListener listener) { } @Override - public void statesAdded(List states) { + public void statesAdded(List> states) { // TODO Auto-generated method stub } @Override - public void valuesAdded(List values) { + public void stepsStarted(List> steps) { // TODO Auto-generated method stub } @Override - public void dimensionsAdded(List> dimensions) { + public void stepsEnded(List> steps) { // TODO Auto-generated method stub } @Override - public void stepsStarted(List steps) { + public void valuesAdded(List> values) { // TODO Auto-generated method stub } @Override - public void stepsEnded(List steps) { + public void dimensionsAdded(List> dimensions) { // TODO Auto-generated method stub } + @Override + public State getCurrentState() { + // TODO Auto-generated method stub + return null; + } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index 26d2eba84..2a4b1e94e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -1,187 +1,214 @@ package fr.inria.diverse.trace.gemoc.traceaddon; -import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Set; import java.util.stream.Collectors; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.util.EcoreEList; +import org.eclipse.xtext.naming.QualifiedName; import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; -public class GenericTraceExtractor implements ITraceExtractor { +public class GenericTraceExtractor implements ITraceExtractor, State, TracedObject, Dimension, Value> { - private Trace, GenericTracedObject, GenericState> traceRoot; - private Map> listeners = new HashMap<>(); + private Trace traceRoot; + private HashMap,Boolean> ignoredDimensions = new HashMap<>(); @Override - public boolean compareStates(EObject e1, EObject e2, boolean respectIgnored) { - return false; + public void notifyListeners() { + // TODO Auto-generated method stub + } @Override - public ValueWrapper getValueWrapper(int traceIndex, int stateIndex) { - return null; + public void registerCommand(ITraceViewListener listener, TraceViewCommand command) { + // TODO Auto-generated method stub + } @Override - public StateWrapper getStateWrapper(int stateIndex) { - return null; + public void removeListener(ITraceViewListener listener) { + // TODO Auto-generated method stub + } @Override - public List getStateWrappers(int startStateIndex, int endStateIndex) { - return Collections.emptyList(); + public void ignoreDimension(Dimension dimension, boolean ignore) { + ignoredDimensions.put(dimension, ignore); } @Override - public List getValueWrappers(int valueTraceIndex, int startStateIndex, int endStateIndex) { - return Collections.emptyList(); + public boolean isDimensionIgnored(Dimension dimension) { + final Boolean ignored = ignoredDimensions.get(dimension); + return ignored != null && ignored.booleanValue(); } - @SuppressWarnings("unchecked") @Override - public StepWrapper getStepWrapper(Step step) { - final List subSteps = new ArrayList<>(); - if (step instanceof SequentialStep) { - subSteps.addAll(((SequentialStep) step).getSubSteps()); - } - return new StepWrapper(step, -1, -1, subSteps); + public boolean compareStates(State state1, State state2, boolean respectIgnored) { + // TODO Auto-generated method stub + return false; } @Override - public List getStepWrappers(int start, int end) { - return traceRoot.getRootStep().getSubSteps().stream().map(s -> getStepWrapper(s)).collect(Collectors.toList()); + public List>> computeStateEquivalenceClasses(List> states) { + // TODO Auto-generated method stub + return null; } @Override - public int getNumberOfTraces() { - return 0; + public List>> computeStateEquivalenceClasses() { + // TODO Auto-generated method stub + return null; } @Override - public int getStatesTraceLength() { - return 0; + public LaunchConfiguration getLaunchConfiguration() { + return traceRoot.getLaunchconfiguration(); } @Override - public int getValuesTraceLength(int traceIndex) { - return 0; + public int getNumberOfDimensions() { + return traceRoot.getTracedObjects().stream() + .map(o -> o.getDimensions().size()) + .reduce(0, (i1, i2) -> i1 + i2); } @Override - public String getValueLabel(int traceIndex) { + public String getStateDescription(int stateIndex) { + // TODO Auto-generated method stub return null; } @Override - public String getStateDescription(int stateIndex) { + public String getStateDescription(State state) { + // TODO Auto-generated method stub return null; } @Override - public String getValueDescription(int traceIndex, int stateIndex) { - return null; + public int getStatesTraceLength() { + return traceRoot.getStates().size(); } @Override - public LaunchConfiguration getLaunchConfiguration() { - return traceRoot.getLaunchconfiguration(); + public State getState(int stateIndex) { + return traceRoot.getStates().get(stateIndex); } - - public void loadTrace(Trace, GenericTracedObject, GenericState> root) { - traceRoot = root; + + @Override + public int getStateIndex(State state) { + return traceRoot.getStates().indexOf(state); } @Override - public void ignoreValueTrace(int trace, boolean ignore) { + public int getValueFirstStateIndex(Value value) { + return traceRoot.getStates().indexOf(value.getStates().get(0)); } @Override - public boolean isValueTraceIgnored(int trace) { - return false; + public int getValueLastStateIndex(Value value) { + List> states = value.getStates(); + return traceRoot.getStates().indexOf(states.get(states.size())); } @Override - public List> computeStateEquivalenceClasses(List states) { + public String getValueDescription(int traceIndex, int stateIndex) { + // TODO Auto-generated method stub return null; } @Override - public List> computeStateEquivalenceClasses() { + public String getValueDescription(Value value) { + // TODO Auto-generated method stub return null; } @Override - public StateWrapper getStateWrapper(EObject state) { + public String getDimensionLabel(int traceIndex) { + // TODO + return null; } @Override - public void statesAdded(List states) { - // TODO Auto-generated method stub + public String getDimensionLabel(Dimension dimension) { + String attributeName = ""; + final List> valueTrace = dimension.getValues(); + if (valueTrace.isEmpty()) { + return ""; + } + if (valueTrace instanceof EcoreEList) { + final EcoreEList eList = (EcoreEList) valueTrace; + final EObject owner = eList.getEObject(); + final List attributes = owner.eClass().getEAllReferences().stream() + .filter(r -> r.getName().endsWith("Sequence")) + .map(r -> r.getName().substring(0, r.getName().length() - 8)).collect(Collectors.toList()); + final Object originalObject = getOriginalObject(owner); + if (!attributes.isEmpty()) { + String n = eList.data().getClass().getComponentType().getName(); + attributeName = attributes.stream().filter(s -> n.contains("_" + s + "_")).findFirst().orElse(""); + } + if (originalObject != null) { + if (originalObject instanceof EObject) { + final EObject eObject = (EObject) originalObject; + if (eObject.eIsProxy()) { + final String proxyToString = eObject.toString(); + final int idx = proxyToString.indexOf("eProxyURI: ") + 11; + final String s = proxyToString.substring(idx, proxyToString.length() - 1); + return attributeName + " (" + s + ")"; + } + final QualifiedName qname = nameProvider.getFullyQualifiedName(eObject); + if (qname != null) { + return attributeName + " (" + qname.toString() + " :" + eObject.eClass().getName() + ")"; + } + } + return attributeName + " (" + originalObject.toString() + ")"; + } + } + return attributeName; } @Override - public void valuesAdded(List values) { - // TODO Auto-generated method stub + public int getValuesTraceLength(int traceIndex) { + return 0; } @Override - public void dimensionsAdded(List> dimensions) { - // TODO Auto-generated method stub + public int getValuesTraceLength(Dimension dimension) { + return dimension.getValues().size(); } @Override - public void notifyListeners() { - for (Map.Entry> entry : listeners.entrySet()) { - entry.getValue().forEach(c -> c.execute()); - } + public void statesAdded(List> states) { + // TODO Auto-generated method stub } @Override - public void registerCommand(ITraceViewListener listener, TraceViewCommand command) { - if (listener != null) { - Set commands = listeners.get(listener); - if (commands == null) { - commands = new HashSet<>(); - listeners.put(listener, commands); - } - commands.add(command); - } + public void stepsStarted(List> steps) { + // TODO Auto-generated method stub } @Override - public void removeListener(ITraceViewListener listener) { - if (listener != null) { - listeners.remove(listener); - } + public void stepsEnded(List> steps) { + // TODO Auto-generated method stub } @Override - public void stepsStarted(List steps) { + public void valuesAdded(List> values) { // TODO Auto-generated method stub - } @Override - public void stepsEnded(List steps) { + public void dimensionsAdded(List> dimensions) { // TODO Auto-generated method stub - } - } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird index 3f4c000c1..65ab43223 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird @@ -52,6 +52,32 @@ + + + + + + + + + + + + + + + + + bold + + + + + + italic + + + @@ -72,6 +98,14 @@ + + + + + + + + @@ -85,6 +119,14 @@ + + + + + + + + @@ -276,12 +318,19 @@ + + + + + + + + + + + - - - - @@ -289,26 +338,37 @@ - - - + + + + + + + - - - + + + + + + + + + + - - + + - - - + + + - - - + + + @@ -550,21 +610,69 @@ - - - + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -602,6 +710,22 @@ + + + + + bold + + + + + + + + italic + + + @@ -625,8 +749,24 @@ + + + + + bold + + + + + + + + italic + + + - + @@ -1017,39 +1157,47 @@ - + + + + + + + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - - - - - - - - - + - - - - + + + + + + + + + + + + @@ -1062,20 +1210,16 @@ - - - - - - - + + + + + - - - - - - + + + + @@ -1153,15 +1297,53 @@ - - - - - - + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + labelSize - + labelSize From b02f311ec1f631ef39e81f08c3c0553a14ca8d17 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 31 Jan 2017 14:34:23 +0100 Subject: [PATCH 084/267] Remove old EMF project generator (based on fake wizard window) --- .../fakewizard/FakeEcoreImporterWizard.java | 128 --------------- .../FakeModelImporterDetailPage.java | 53 ------- .../FakeModelImporterPackagePage.java | 97 ------------ .../FakeWizardEMFProjectGenerator.xtend | 147 ------------------ 4 files changed, 425 deletions(-) delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeEcoreImporterWizard.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterDetailPage.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterPackagePage.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeEcoreImporterWizard.java b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeEcoreImporterWizard.java deleted file mode 100644 index 24214546c..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeEcoreImporterWizard.java +++ /dev/null @@ -1,128 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.fakewizard; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IFile; -import org.eclipse.emf.importer.ecore.EcoreImporterPlugin; -import org.eclipse.emf.importer.ecore.ui.EcoreImporterWizard; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.wizard.IWizardContainer; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.swt.widgets.Composite; - -public class FakeEcoreImporterWizard extends EcoreImporterWizard { - - FakeEcoreImporterWizard(Composite rootParent) { - detailPage = new FakeModelImporterDetailPage(getModelImporter(), - "EcoreModel"); - detailPage.setTitle(EcoreImporterPlugin.INSTANCE - .getString("_UI_EcoreImport_title")); - detailPage - .setDescription(EcoreImporterPlugin.INSTANCE.getString(detailPage - .showGenModel() ? "_UI_EcoreImportNewProject_description" - : "_UI_EcoreImportFile_description")); - addPage(detailPage); - detailPage.fakeSetParent(rootParent); - - packagePage = new FakeModelImporterPackagePage(getModelImporter(), - "EcorePackages"); - packagePage.setShowReferencedGenModels(true); - addPage(packagePage); - packagePage.createControl(rootParent); - } - - private FakeModelImporterDetailPage detailPage; - - private FakeModelImporterPackagePage packagePage; - - public FakeModelImporterDetailPage getFakeDetailPage() { - return detailPage; - } - - public FakeModelImporterPackagePage getFakePackagePage() { - return packagePage; - } - - @Override - protected void selectFile(IFile file) { - } - - @Override - protected void openEditor(IFile file) throws PartInitException { - } - - @Override - public IWizardContainer getContainer() { - // TODO Auto-generated method stub - return new IWizardContainer() { - - @Override - public void run(boolean fork, boolean cancelable, - IRunnableWithProgress runnable) - throws InvocationTargetException, InterruptedException { - IWorkbench wb = PlatformUI.getWorkbench(); - IWorkbenchWindow win = wb.getActiveWorkbenchWindow(); - win.run(false, true, runnable); - - } - - @Override - public void updateWindowTitle() { - // TODO Auto-generated method stub - - } - - @Override - public void updateTitleBar() { - // TODO Auto-generated method stub - - } - - @Override - public void updateMessage() { - // TODO Auto-generated method stub - - } - - @Override - public void updateButtons() { - // TODO Auto-generated method stub - - } - - @Override - public void showPage(IWizardPage page) { - // TODO Auto-generated method stub - - } - - @Override - public Shell getShell() { - // TODO Auto-generated method stub - return null; - } - - @Override - public IWizardPage getCurrentPage() { - // TODO Auto-generated method stub - return null; - } - }; - } - -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterDetailPage.java b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterDetailPage.java deleted file mode 100644 index 3880a4e83..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterDetailPage.java +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.fakewizard; - -import org.eclipse.emf.common.util.Diagnostic; -import org.eclipse.emf.importer.ModelImporter; -import org.eclipse.emf.importer.ui.contribution.base.ModelImporterDetailPage; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Text; - -public class FakeModelImporterDetailPage extends ModelImporterDetailPage { - - private Composite fakeParent; - - public FakeModelImporterDetailPage(ModelImporter modelImporter, String pageName) { - super(modelImporter, pageName); - } - - public void fakeSetParent(Composite c) { - this.fakeParent = c; - } - - public void fakeSetURI(String uri) { - this.uriText = new Text(fakeParent, 0); - uriText.setText(uri); - uriTextModified(""); - } - - public void fakeLoad() { - refreshModel(); - } - - @Override - protected void internalSetGenModelFileName(String name) { - if (usingInternalSetName && showGenModel() && name != null) { - getModelImporter().setGenModelFileName(name); - } - } - - @Override - protected void handleDiagnostic(Diagnostic diagnostic) { - // super.handleDiagnostic(diagnostic); - //handleDiagnostic(diagnostic, null, null, null); - } -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterPackagePage.java b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterPackagePage.java deleted file mode 100644 index 605ce9cc8..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeModelImporterPackagePage.java +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.fakewizard; - -import java.io.IOException; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.eclipse.emf.codegen.ecore.genmodel.GenModel; -import org.eclipse.emf.codegen.ecore.genmodel.GenPackage; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.importer.ModelImporter; -import org.eclipse.emf.importer.ui.contribution.base.ModelImporterPackagePage; - -import fr.inria.diverse.trace.commons.EMFUtil; - -public class FakeModelImporterPackagePage extends ModelImporterPackagePage { - - public FakeModelImporterPackagePage(ModelImporter modelImporter, - String pageName) { - super(modelImporter, pageName); - } - - public void checkAll(URI except) { - // This is done at the creation of the page, theoretically - filterEPackagesTable(true); - validate(); - - - // We have to load the epackages in except (!= epackages referenced by except), to find the corresponding nsURIs - // The goal is not to check theses epackages as referenced! - // Because they might already have genmodels, which are hence referenceable - ResourceSet tmp = new ResourceSetImpl(); - Set nsURIsExcept = new HashSet(); - try { - Resource r = EMFUtil.loadModelURI(except, tmp); - for (EObject o : r.getContents()) { - if (o instanceof EPackage) { - nsURIsExcept.add(((EPackage) o).getNsURI()); - } - } - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - // We check all the referenced stuff, except the existing genmodels for the epackage we are interested in - for (org.eclipse.jface.viewers.TreePath tp : referencedGenModelsCheckboxTreeViewer.getExpandedTreePaths()) { - Object fSegment = tp.getFirstSegment(); - boolean ok = true; - if (fSegment instanceof GenModel) { - GenModel fSegment_cast = (GenModel)fSegment; - for (GenPackage genp : fSegment_cast.getGenPackages()) { - String nsURI = genp.getEcorePackage().getNsURI(); - if (nsURIsExcept.contains(nsURI)) { - ok = false; - break; - } - } - - } - if (ok) - referencedGenModelsCheckboxTreeViewer.setSubtreeChecked(tp, true); - } - - - // We notify - referencedGenModelsCheckboxTreeViewerCheckStateChanged(null); - - // We check all the remaining epackages - ePackagesCheckboxTableViewer.setAllChecked(true); - - // We notify - ePackageCheckStateChanged(); - - } - - public List getReferencedGenPackages() { - return this.getModelConverter().getReferencedGenPackages(); - } - -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend deleted file mode 100644 index 43515b00a..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/fakewizard/FakeWizardEMFProjectGenerator.xtend +++ /dev/null @@ -1,147 +0,0 @@ -package fr.inria.diverse.trace.plugin.generator.fakewizard - -import fr.inria.diverse.trace.plugin.generator.AbstractEMFProjectGenerator -import java.io.File -import org.eclipse.core.resources.ResourcesPlugin -import org.eclipse.core.runtime.IProgressMonitor -import org.eclipse.emf.codegen.ecore.genmodel.GenModel -import org.eclipse.emf.codegen.ecore.genmodel.generator.GenBaseGeneratorAdapter -import org.eclipse.emf.codegen.ecore.genmodel.presentation.GeneratorUIUtil.GeneratorOperation -import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil -import org.eclipse.emf.common.command.BasicCommandStack -import org.eclipse.emf.common.util.URI -import org.eclipse.emf.ecore.EPackage -import org.eclipse.emf.ecore.plugin.EcorePlugin -import org.eclipse.emf.ecore.resource.Resource -import org.eclipse.emf.ecore.resource.ResourceSet -import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain -import org.eclipse.emf.edit.provider.ComposedAdapterFactory -import org.eclipse.swt.widgets.Composite -import org.eclipse.swt.widgets.Display -import org.eclipse.swt.widgets.Shell - -class FakeWizardEMFProjectGenerator extends AbstractEMFProjectGenerator { - - private var Composite rootParent - private var FakeEcoreImporterWizard f - - new(String projectName, EPackage ecoreModel) { - super(projectName, ecoreModel) - } - - override generateBaseEMFProject(IProgressMonitor m) { - - // Serializing the tracemm temporarily - val ResourceSet rs = ecoreModel.eResource.resourceSet - val File tmpFolder = File.createTempFile("diverse", "tracemmgeneration") - tmpFolder.delete - tmpFolder.mkdir - tmpFolder.deleteOnExit - val String ecoreFileName = ecoreModel.name + ".ecore" - val File tmmFile = new File(tmpFolder, ecoreFileName) - val Resource newEcoreResource = rs.createResource(URI.createFileURI(tmmFile.absolutePath)) - newEcoreResource.contents.add(ecoreModel) - newEcoreResource.save(null) - val ecoreURI = newEcoreResource.URI - - // Creating the project and retrieving its path - project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) - val projectPath = project.getFullPath(); - - // TODO This is horrible: the display is locked during the fake UI handling :D - Display.getDefault().syncExec( - [ - - // We skip the previous wizard (emf project) and we directly configure the ecore import wizard appropriately - rootParent = new Shell - f = new FakeEcoreImporterWizard(rootParent) - f.genModelProjectPath = projectPath - - // Setting up ecore URI and loading it - f.fakeDetailPage.fakeSetURI(ecoreURI.toString) - f.fakeDetailPage.fakeLoad - - // We choose to use all referenced gen models and ann (remaining) epackages - f.fakePackagePage.checkAll(ecoreURI) - - // Here we do the actual projet generation - f.performFinish - - // Storing the genmodel - genModel = f.modelImporter.genModel - referencedGenPackages.addAll(f.fakePackagePage.referencedGenPackages) - rootPackages.addAll(f.fakePackagePage.checkedEPackages) - - // Finally we disband our fakes wizard and root - f.dispose - rootParent.dispose - ]) - - } - - /** - * Performs the code generation from the genmodel. - * - * We try to precisely follow the actions made by the GenModelEditor when loading the model, - * since otherwise for some mysterious reason the generated code has errors regarding generic - * type parameters. - * - * Note that this code can certainly by simplified, if time is taken to find useless lines. - */ - override generateModelCode(IProgressMonitor m) { - - // --------- Start code from org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditor.initializeEditingDomain() - // - // Create an adapter factory that yields item providers. - val adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); - - // Create the command stack that will notify this editor as commands are executed. - val BasicCommandStack commandStack = new BasicCommandStack(); - - // Create the editing domain with a special command stack. - val editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack) { - override isReadOnly(Resource resource) { - return super.isReadOnly(resource) || getResourceSet().getResources().indexOf(resource) != 0; - } - }; - - editingDomain.getResourceSet().getURIConverter().getURIMap().putAll(EcorePlugin.computePlatformURIMap(true)); - // - // --------- End code from org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditor.initializeEditingDomain() - // - // - // --------- Start code from org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditor.createModel() - // - val URI resourceURI = genModel.eResource.URI - var Exception exception = null; - var Resource resource = null; - try { - // Load the resource through the editing domain. - // - resource = editingDomain.getResourceSet().getResource(resourceURI, true); - } catch (Exception e) { - exception = e; - resource = editingDomain.getResourceSet().getResource(resourceURI, false); - } - // --------- End code from org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditor.createModel() - // - // - // --------- Start code from org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditor.initialize(GenModel) - val GenModel genModel = resource.getContents().get(0) as GenModel; - - genModel.reconcile(); - genModel.setCanGenerate(true); - val generator = GenModelUtil.createGenerator(genModel); - - // --------- End code org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditor.initialize(GenModel) - // - // - genModel.setValidateModel(true); - val operation = new GeneratorOperation(null); - operation.addGeneratorAndArguments(generator, genModel, GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE, - "model project"); - operation.run(m) - - } - -} From 011cae1325ec173f505661ee42fb995066791d06 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 31 Jan 2017 14:35:49 +0100 Subject: [PATCH 085/267] Fix problem generics bindings in trace metamodel generation Somehow the fix consists in simply unloading and reloading the trace metamodel, after it has been generated... The real cause can probably be found somewhere in the trace metamodel generation? Or in EMF? Hard to tell. --- .../plugin/generator/clean/StandaloneEMFProjectGenerator.xtend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend index cd4125694..48190178d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend @@ -78,6 +78,9 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { URI.createPlatformResourceURI('''«projectName»/«MODEL_GEN_FOLDER»/«ecoreModel.name».ecore''', true)) ecoreModelResource.contents.add(ecoreModel) ecoreModelResource.save + + ecoreModelResource.unload + ecoreModelResource.load(null) // Check that all required ecore models are available checkReferencedPackages(ecoreModelResource); From bc9b890a8cac26245cec18c393e7eb683d28c752 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 31 Jan 2017 14:41:17 +0100 Subject: [PATCH 086/267] Minor cleanups + add missing copyrights in trace plugins --- .../commands/XDSMLProject2TraceAddonHandler.xtend | 1 - .../metamodel/generator/TraceMMExplorer.xtend | 10 ++++++++++ .../generator/TraceMMGenerationTraceability.xtend | 10 ++++++++++ .../metamodel/generator/TraceMMGenerator.xtend | 10 ++++++++++ .../generator/TraceMMGeneratorStates.xtend | 10 ++++++++++ .../generator/TraceMMGeneratorSteps.xtend | 10 ++++++++++ .../trace/metamodel/generator/TraceMMStrings.xtend | 10 ++++++++++ .../generator/AbstractEMFProjectGenerator.xtend | 10 ++++++++++ .../trace/plugin/generator/ExtensionFilter.xtend | 10 ++++++++++ .../generator/GenericTracePluginGenerator.xtend | 14 ++++++++++---- .../generator/clean/PluginProjectHelper.xtend | 10 ++++++++++ .../clean/StandaloneEMFProjectGenerator.xtend | 10 ++++++++++ .../codegen/TraceConstructorGeneratorJava.xtend | 10 ++++++++++ .../codegen/TraceExplorerGeneratorJava.xtend | 10 ++++++++++ .../codegen/TraceExtractorGeneratorJava.xtend | 10 ++++++++++ .../codegen/TraceManagerGeneratorJava.xtend | 10 ++++++++++ .../codegen/TraceNotifierGeneratorJava.xtend | 10 ++++++++++ 17 files changed, 160 insertions(+), 5 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend index 815c06981..92120193c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.Status import org.eclipse.core.runtime.jobs.Job import org.eclipse.jface.dialogs.InputDialog import org.eclipse.jface.window.Window -import org.eclipse.swt.widgets.Shell import org.gemoc.commons.eclipse.emf.EMFResource import org.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend index e987a1347..87383a550 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.metamodel.generator import java.util.HashMap diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend index b2295ff0b..611814709 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.metamodel.generator import org.eclipse.emf.ecore.EClass diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend index a6e3d69b9..73fb50427 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.metamodel.generator import fr.inria.diverse.trace.commons.EMFUtil diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index e72687d5f..c6e4c1155 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.metamodel.generator import ecorext.ClassExtension diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend index cf67ffe83..27ef9462b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.metamodel.generator import ecorext.Ecorext diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend index dbbe22dcd..b79b55830 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.metamodel.generator import org.eclipse.emf.ecore.EClass diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend index 89816bbfc..af490df3f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator import java.util.HashSet diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend index dae929717..37a99170c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator import ecorext.ClassExtension diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend index 068d4a87d..c549acf71 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator import ecorext.Ecorext @@ -16,10 +26,8 @@ import org.eclipse.core.resources.IProject import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.EGenericType import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EStructuralFeature -import org.eclipse.emf.ecore.EcoreFactory import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.jdt.core.IJavaProject import org.eclipse.jdt.core.IPackageFragment @@ -28,7 +36,6 @@ import org.eclipse.jdt.core.JavaCore import org.eclipse.ui.PlatformUI import org.eclipse.xtend.lib.annotations.Accessors import tracingannotations.TracingAnnotations -import org.eclipse.emf.ecore.ETypeParameter /** * Glues the generators : trace metamodel, emf project and trace manager @@ -127,7 +134,6 @@ class GenericTracePluginGenerator { val EPackage tracemm = tmmgenerator.tracemmresult // Generate EMF project -// val AbstractEMFProjectGenerator emfGen = new FakeWizardEMFProjectGenerator(pluginName, tracemm) val AbstractEMFProjectGenerator emfGen = new StandaloneEMFProjectGenerator(pluginName, tracemm) emfGen.generateBaseEMFProject(m) val referencedGenPackagesRoots = emfGen.referencedGenPackages diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend index 089a7a479..ea7d68751 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.clean; import java.io.ByteArrayInputStream diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend index 48190178d..db19c90d5 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.clean import fr.inria.diverse.trace.plugin.generator.AbstractEMFProjectGenerator diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 17b30d2d7..9f0e9511f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.codegen diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend index fb00dce82..5a2f86a86 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.codegen import ecorext.ClassExtension diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend index bc692243b..2d59155bd 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.codegen diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend index c1ab0975c..5e63ca179 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceManagerGeneratorJava.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.codegen diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend index 6cca7a65d..f4fdae82b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.codegen import fr.inria.diverse.trace.commons.CodeGenUtil From 4ab9dc43e6301b02abe1eae9919d1f85bee332d4 Mon Sep 17 00:00:00 2001 From: d-leroy Date: Tue, 31 Jan 2017 15:17:36 +0100 Subject: [PATCH 087/267] Reworked the trace addon to leverage the generic trace metamodel --- .../model/GenericTrace.ecore | 16 +- .../model/GenericTrace.genmodel | 139 ++ .../model/trace class diagram.png | Bin 260414 -> 300853 bytes .../model/trace class diagram.svg | 2142 +++++++++++++++++ .../commons/model/helper/StepHelper.java | 12 +- .../api/IMultiDimensionalTraceAddon.java | 12 +- .../trace/gemoc/api/IStateManager.java | 9 + .../trace/gemoc/api/ITraceConstructor.java | 4 +- .../trace/gemoc/api/ITraceExplorer.java | 63 +- .../trace/gemoc/api/ITraceExtractor.java | 3 + .../model/GenericTraceImpl.ecore | 3 + .../gemoc/traceaddon/AbstractTraceAddon.xtend | 61 +- .../traceaddon/GenericTraceConstructor.java | 112 +- .../traceaddon/GenericTraceEngineAddon.java | 61 +- .../traceaddon/GenericTraceExplorer.java | 181 +- .../traceaddon/GenericTraceExtractor.java | 36 +- .../traceaddon/GenericTraceStepFactory.java | 2 +- .../model/base.ecore | 54 +- .../src/base/SpecificTrace.java | 5 +- .../base/States/SpecificAttributeValue.java | 2 +- .../base/States/SpecificReferenceValue.java | 2 +- .../src/base/States/SpecificState.java | 55 +- .../src/base/States/SpecificValue.java | 2 +- .../src/base/States/StatesPackage.java | 97 +- .../States/impl/SpecificDimensionImpl.java | 4 + .../base/States/impl/SpecificStateImpl.java | 169 +- .../States/impl/SpecificTracedObjectImpl.java | 1 + .../base/States/impl/SpecificValueImpl.java | 4 +- .../base/States/impl/StatesPackageImpl.java | 52 +- .../States/util/StatesAdapterFactory.java | 9 +- .../src/base/States/util/StatesSwitch.java | 9 +- .../src/base/Steps/RootImplicitStep.java | 4 +- .../src/base/Steps/SpecificStep.java | 64 +- .../src/base/Steps/StepsPackage.java | 57 +- .../base/Steps/impl/RootImplicitStepImpl.java | 4 +- .../src/base/Steps/impl/StepsPackageImpl.java | 34 +- .../base/Steps/util/StepsAdapterFactory.java | 5 +- .../src/base/Steps/util/StepsSwitch.java | 5 +- .../src/base/impl/BasePackageImpl.java | 11 +- .../src/base/impl/SpecificTraceImpl.java | 9 +- .../src/base/util/BaseAdapterFactory.java | 5 +- .../src/base/util/BaseSwitch.java | 5 +- .../generator/TraceMMGenerator.xtend | 34 + .../generator/TraceMMGeneratorStates.xtend | 61 +- .../generator/TraceMMGeneratorSteps.xtend | 29 +- .../metamodel/generator/TraceMMStrings.xtend | 10 +- .../clean/StandaloneEMFProjectGenerator.xtend | 3 + 47 files changed, 2857 insertions(+), 804 deletions(-) create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.svg create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStateManager.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc/model/GenericTraceImpl.ecore diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index 9d89ba905..2deb6eac2 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -9,27 +9,27 @@ - - - + + + - +
- +
- - + + @@ -228,7 +228,7 @@ - + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel new file mode 100644 index 000000000..401d4a67f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel @@ -0,0 +1,139 @@ + + + GenericTrace.ecore + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.png b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.png index a58471b280fa1d0a9282f0907f14734966f76c8b..a09bcf7822fca0e8f5999b0b4c96f30efaa5c6a3 100644 GIT binary patch literal 300853 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%0AJM-=5nRFQhrE{_I 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%0AE~OuqKOC)DRM?IIEGJ%9|&D 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +ISerializable +byte[] + + + + + + +MSEOccurrence + +parameters : EJavaObject + +result : EJavaObject + + + + + + +MSE + +getCaller() : EObject + +getAction() : EOperation + + eAnnotations : EAnnotation + + + + + + +MSEModel + + + + + + +GenericMSE + +getCaller() : EObject + +getAction() : EOperation + + eAnnotations : EAnnotation + + actionReference : EOperation + + + + + + +Step + + +StateSub +Type + + + + + +BigStep + + +StepSubt +ype + +StateSub +Type + + + + + +SmallStep + + +State +Sub... + + + + + +SequentialStep + + +StepSubt +ype + +StateSub +Type + + + + + +ParallelStep + + +StepSubt +ype + +StateSub +Type + + + + + +GenericSequentialStep + + + + + + +GenericParallelStep + + + + + + +GenericSmallStep + + + + + + +Trace + + +StepSub +Type + +TracedObj +ectSubtype + +StateSub +Type + + + + + +TracedObject + + +Dimensio +nSubType + + + + + +Dimension + + +ValueSub +Type + + + + + +Value + + +StateSub +Type + + + + + +State + + +StepSub +Type + +ValueSu +bType + + + + + +GenericReferenceV +alue + + referenceValue : +EObject + + + + + + +GenericDimension + + + + + + +EStructuralFeature + + + + + + + +GenericTracedObject + + +T + + + + + +GenericTrace + + +StepSub +Type + + + + + +GenericState + +getValues() : GenericValue + +getStartedSteps() : GenericStep + +getEndedSteps() : GenericStep + + + + + + +EObject + +eClass() : EClass + +eIsProxy() : EBoolean + +eResource() : EResource + +eContainer() : EObject + +eContainingFeature() : EStructuralFeature + +eContainmentFeature() : EReference + +eContents() : EEList + +eAllContents() : ETreeIterator + +eCrossReferences() : EEList + +eGet(feature EStructuralFeature) : EJavaObject + +eGet(feature EStructuralFeature, resolve EBoolean) : EJavaObject + +eSet(feature EStructuralFeature, newValue EJavaObject) + +eIsSet(feature EStructuralFeature) : EBoolean + +eUnset(feature EStructuralFeature) + +eInvoke(operation EOperation, arguments EEList) : EJavaObject + + + + + + + +GenericAttributeValue + + + + + + +BooleanAttributeValue + +attributeValue : +EBoolean = false + + + + + + +IntegerAttributevalue + +attributeValue : EInt + + + + + + +StringAttributeValue + +attributeValue : +EString + + + + + + +LaunchConfiguration + +type : EString + + + + + + +LaunchConfigurationParameter + +value : EString + + + + + + +LanguageNamePar +ameter + + + + + + +AddonExtensionPar +ameter + + + + + + +ModelURIParamete +r + + + + + + +AnimatorURIParam +eter + + + + + + +EntryPointParamet +er + + + + + + +InitializationArgum +entsParameter + + + + + + +ModelRootParamet +er + + + + + + +InitializationMetho +dParameter + + + + + + +GenericStep + +getStartingState( +) : GenericState + +getEndingState() +: GenericState + + + + + + +GenericValue + +getStates() : +GenericState + + + + +[1..1] mse + + + + + +[0..*] ownedMSEs + + + + + +[0..1] mseoccurrence + + + + + + + + +[0..*] subSteps + + + + + + + + +[1..1] rootStep + + + + + + + + + + +<<bind StateSubType>> StateSubType + + + + + +<<bind StateSubType>> StateSubType + + + + + +<<bind StepSubtype,StateSubType>> StepSubtype,StateSubType + + + +<<bind StepSubtype,StateSubType>> StepSubtype,StateSubType + + + +<<bind StepSubtype,StateSubType>> GenericStep,GenericState + + + +<<bind StepSubtype,StateSubType>> GenericStep,GenericState + + + +<<bind StateSubType>> GenericState + + + + + + +[0..*] tracedObjects + + + + + + +[0..*] dimensions + + + + + + +[0..*] values + + + + + + + + +[0..*] states + + + + + +<<bind ValueSubType>> GenericValue + + + +[0..1] dynamicProperty + + + +<<bind DimensionSubType>> GenericDimension + + + + + +<<bind StepSubType,TracedObjectSubtype,StateSubType>> StepSubType,GenericTracedObject,GenericState + + + +<<bind StepSubType,ValueSubType>> GenericStep,GenericValue + + + + +[0..1] callerReference + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[1..1] launchconfiguration + + + + + +[0..*] parameters + + + + + + + +<<bind StateSubType>> GenericState + + + + + +<<bind StateSubType>> GenericState + + + + +<<bind StepSubtype,StateSubType>> GenericStep,GenericState + + + + + +<<bind StepSubtype,StateSubType>> GenericStep,GenericState + + + + + + + + + + + + + +<<bind StateSubType>> GenericState + + + +[0..*] statesRef +[0..*] valuesRef + + + + + + + +[0..*] /startedSteps + + + + + +[0..*] /endedSteps + + + + + + + +[1..1] /startingState + + + + + + +[0..1] /endingState + + + + + +[0..*] /values + + + + +[1..1] startingStateRef +[0..*] startedStepsRef + + + + + + +[0..1] endingStateRef +[0..*] endedStepsRef + + + + + + + + + +[0..*] /states + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java index 5b55c76b3..786ce3e4f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java @@ -14,12 +14,12 @@ public class StepHelper { - public static String getStepName(Step step) { + public static String getStepName(Step step) { //returns the emf id or the java id if the emf id is null return "LogicalStep ["+(EcoreUtil.getID(step) != null ? EcoreUtil.getID(step):System.identityHashCode(step)) +"]"; } - public static List getMSEs(Step instruction) { + public static List getMSEs(Step instruction) { ArrayList l = new ArrayList(); for (MSEOccurrence o : collectAllMSEOccurrences(instruction)) { @@ -29,15 +29,15 @@ public static List getMSEs(Step instruction) { } - public static List collectAllMSEOccurrences(Step instruction) { + public static List collectAllMSEOccurrences(Step instruction) { List res = new ArrayList(); if (instruction instanceof SmallStep){ - res.add(((SmallStep)instruction).getMseoccurrence()); + res.add(((SmallStep)instruction).getMseoccurrence()); return res; } if (instruction instanceof BigStep){ for(Object o : ((BigStep)instruction).getSubSteps()){ - Step s = (Step)o; + Step s = (Step)o; res.addAll(collectAllMSEOccurrences(s)); } return res; @@ -45,7 +45,7 @@ public static List collectAllMSEOccurrences(Step instruction) { return res; } - public static List collectAllMSEs(Step instruction) { + public static List collectAllMSEs(Step instruction) { List res = new ArrayList(); for (MSEOccurrence occ : collectAllMSEOccurrences(instruction)){ res.add(occ.getMse()); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java index 453ea4a9e..ba8e486a1 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java @@ -12,13 +12,19 @@ import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -public interface IMultiDimensionalTraceAddon extends IEngineAddon { +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; - ITraceExplorer getTraceExplorer(); +public interface IMultiDimensionalTraceAddon, StateSubType extends State, TracedObjectSubType extends TracedObject, DimensionSubType extends Dimension, ValueSubType extends Value> extends IEngineAddon { + + ITraceExplorer getTraceExplorer(); ITraceConstructor getTraceConstructor(); - ITraceExtractor getTraceExtractor(); + ITraceExtractor getTraceExtractor(); ITraceNotifier getTraceNotifier(); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStateManager.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStateManager.java new file mode 100644 index 000000000..1cc3ee36f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStateManager.java @@ -0,0 +1,9 @@ +package fr.inria.diverse.trace.gemoc.api; + +import fr.inria.diverse.trace.commons.model.trace.State; + +public interface IStateManager> { + + boolean restoreState(StateSubType state); + +} diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java index 069a8af11..45f7f343f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java @@ -30,13 +30,13 @@ public interface ITraceConstructor { * Records the start of a new step. * @param step The step that has been started */ - void addStep(Step step); + void addStep(Step step); /** * Records the end of the top step in the call stack. * @param step The step that is supposed to end */ - void endStep(Step step); + void endStep(Step step); /** * Creates and returns a new trace with the given launch configuration. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java index 4337041f8..d380a1364 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java @@ -12,15 +12,27 @@ import java.util.List; -import org.eclipse.emf.ecore.EObject; - import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Trace; import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.commons.model.trace.Value; public interface ITraceExplorer, StateSubType extends State, TracedObjectSubType extends TracedObject, DimensionSubType extends Dimension, ValueSubType extends Value> extends ITraceViewNotifier, ITraceListener { + + /** + * Loads the trace into the trace explorer + * @param trace + */ + void loadTrace(Trace trace); + + /** + * Loads the trace into the trace explorer + * @param trace + * @param stateManager + */ + void loadTrace(Trace trace, IStateManager stateManager); /** * @return The current step @@ -38,25 +50,22 @@ public interface ITraceExplorer, StateSubType extend StepSubType getCurrentBigStep(); /** - * @return The index of the current state in the trace + * @return The current state */ - int getCurrentStateIndex(); - StateSubType getCurrentState(); /** - * If o is a state, updates the explorer so that o becomes the current state. - * If o is a value, updates the explorer so that the first state to contain o - * becomes the current state. - * @param o The EObject to jump to : must be either a specific state or a specific value + * Updates the explorer so that state becomes the current state. + * @param state The State to jump to */ - void jump(EObject o); + void jump(StateSubType state); /** - * Updates the explorer so that the state located at the provided index becomes the current state. - * @param i The index of the state + * Updates the explorer so that the first state to contain value + * becomes the current state. + * @param value The Value to jump to */ - void jump(int i); + void jump(ValueSubType value); /** * Updates the explorer so that the last recorded state and step in the trace become the current state and step. @@ -124,31 +133,31 @@ public interface ITraceExplorer, StateSubType extend /** * Updates the state of the explorer so that its current state is the first one to contain - * the value following the current one in the value trace located at the provided index. - * @param traceIndex + * the value following the current one in the provided dimension. + * @param dimension */ - void stepValue(int traceIndex); + void stepValue(DimensionSubType dimension); /** * Updates the state of the explorer so that its current state is the first one to contain - * the value preceding the current one in the value trace located at the provided index. - * @param traceIndex The index of the value trace + * the value preceding the current one in the provided dimension. + * @param dimension */ - void backValue(int traceIndex); + void backValue(DimensionSubType dimension); /** - * Returns whether the value trace located at the provided index has at least one value following the current one. - * @param traceIndex The index of the value trace - * @return Whether the value trace has a value following the current one + * Returns whether the provided dimension has at least one value following the current one. + * @param dimension + * @return Whether the dimension has a value following the current one */ - boolean canStepValue(int traceIndex); + boolean canStepValue(DimensionSubType dimension); /** - * Returns whether the value trace located at the provided index has at least one value preceding the current one. - * @param traceIndex The index of the value trace - * @return Whether the value trace has a value preceding the current one + * Returns whether the provided dimension has at least one value preceding the current one. + * @param dimension + * @return Whether the dimension has a value preceding the current one */ - boolean canBackValue(int traceIndex); + boolean canBackValue(DimensionSubType dimension); /** * @return Whether the explorer is in replay mode or not diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java index 9baee8f87..f7a5acbe3 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java @@ -16,11 +16,14 @@ import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Trace; import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.commons.model.trace.Value; public interface ITraceExtractor, StateSubType extends State, TracedObjectSubType extends TracedObject, DimensionSubType extends Dimension, ValueSubType extends Value> extends ITraceViewNotifier, ITraceListener { + void loadTrace(Trace trace); + /** * Tells the extractor to ignore or not the value trace located at the provided index. * @param trace The index of the value trace diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/model/GenericTraceImpl.ecore b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/model/GenericTraceImpl.ecore new file mode 100644 index 000000000..707d57b1c --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/model/GenericTraceImpl.ecore @@ -0,0 +1,3 @@ + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index f4f48fa66..334112db7 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -2,7 +2,11 @@ package fr.inria.diverse.trace.gemoc.traceaddon import com.google.common.collect.BiMap import com.google.common.collect.HashBiMap +import fr.inria.diverse.trace.commons.model.trace.Dimension +import fr.inria.diverse.trace.commons.model.trace.State import fr.inria.diverse.trace.commons.model.trace.Step +import fr.inria.diverse.trace.commons.model.trace.TracedObject +import fr.inria.diverse.trace.commons.model.trace.Value import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon import fr.inria.diverse.trace.gemoc.api.ITraceConstructor import fr.inria.diverse.trace.gemoc.api.ITraceExplorer @@ -30,12 +34,14 @@ import org.gemoc.xdsmlframework.api.engine_addon.DefaultEngineAddon import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint +import fr.inria.diverse.trace.commons.model.trace.Trace +import fr.inria.diverse.trace.gemoc.api.IStateManager -abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDimensionalTraceAddon { +abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDimensionalTraceAddon, State, TracedObject, Dimension, Value> { private IExecutionContext _executionContext - private ITraceExplorer traceExplorer - private ITraceExtractor traceExtractor + private ITraceExplorer, State, TracedObject, Dimension, Value> traceExplorer + private ITraceExtractor, State, TracedObject, Dimension, Value> traceExtractor private ITraceConstructor traceConstructor private ITraceNotifier traceNotifier private BatchModelChangeListener traceListener @@ -46,17 +52,13 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map exeToTraced) - - abstract def boolean isAddonForTrace(EObject traceRoot) - - abstract def ITraceExtractor constructTraceExtractor(Resource traceResource) - - abstract def ITraceExplorer constructTraceExplorer(Resource traceResource) - - abstract def ITraceExplorer constructTraceExplorer(Resource modelResource, Resource traceResource, Map tracedToExe) + + abstract def IStateManager> constructStateManager(Resource modelResource, Map tracedToExe) abstract def ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) + abstract def boolean isAddonForTrace(EObject traceRoot) + override getTraceExplorer() { return traceExplorer } @@ -83,9 +85,16 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi shouldSave = false } - public def void load(Resource traceModel) { - traceExplorer = constructTraceExplorer(traceModel) - traceExtractor = constructTraceExtractor(traceModel) + public def void load(Resource traceResource) { + val root = traceResource.contents.head + if (root instanceof Trace) { + val trace = root as Trace,TracedObject,State> + traceExplorer = new GenericTraceExplorer(trace) + traceExtractor = new GenericTraceExtractor(trace) + } else { + traceExplorer = null + traceExtractor = null + } } private static def String getEPackageFQN(EPackage p, String separator) { @@ -97,15 +106,15 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi } } - override aboutToExecuteStep(IExecutionEngine executionEngine, Step step) { + override aboutToExecuteStep(IExecutionEngine executionEngine, Step step) { manageStep(step, true) } - override stepExecuted(IExecutionEngine engine, Step step) { + override stepExecuted(IExecutionEngine engine, Step step) { manageStep(step, false) } - protected def manageStep(Step step, boolean add) { + protected def manageStep(Step step, boolean add) { if (step != null) { modifyTrace([ traceConstructor.addState(listenerAddon.getChanges(this)) @@ -166,13 +175,17 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi modifyTrace([traceConstructor.initTrace(launchConfiguration)]) // And we enable trace exploration by loading it in a new trace explorer - traceExplorer = constructTraceExplorer(modelResource, traceResource, exeToTraced.inverse) - //------------------------------------------------------- - traceExtractor = constructTraceExtractor(traceResource) - traceListener = new BatchModelChangeListener(EMFResource.getRelatedResources(traceResource)); - traceNotifier = constructTraceNotifier(traceListener) - traceNotifier.addListener(traceExtractor) - traceNotifier.addListener(traceExplorer) + val root = traceResource.contents.head + if (root instanceof Trace) { + val trace = root as Trace,TracedObject,State> + val stateManager = constructStateManager(modelResource, exeToTraced.inverse) + traceExplorer = new GenericTraceExplorer(trace, stateManager) + traceExtractor = new GenericTraceExtractor(trace) + traceListener = new BatchModelChangeListener(EMFResource.getRelatedResources(traceResource)); + traceNotifier = constructTraceNotifier(traceListener) + traceNotifier.addListener(traceExtractor) + traceNotifier.addListener(traceExplorer) + } } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index b4387bd09..bdab8099a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -1,98 +1,96 @@ package fr.inria.diverse.trace.gemoc.traceaddon; -import java.util.Deque; -import java.util.LinkedList; import java.util.List; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.resource.Resource; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TraceFactory; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; public class GenericTraceConstructor implements ITraceConstructor { - private Trace, GenericState> traceRoot; - private Resource traceResource; - private final Deque context = new LinkedList(); +// private Trace, TracedObject, State> traceRoot; +// private Resource traceResource; +// private final Deque> context = new LinkedList>(); - private Trace, Value>>>, TracedObject>>, State, Value>>> trace; - - public GenericTraceConstructor(Resource traceResource) { - this.traceResource = traceResource; + private GenericTraceConstructor() { + } @Override public void addState(List modelChanges) { + throw new UnsupportedOperationException(); // Empty implementation, states are not yet supported in the generic trace. } - @SuppressWarnings("unchecked") +// private List> getSubSteps(Step step) { +// if (step instanceof BigStep) { +// return ((BigStep) step).getSubSteps(); +// } else { +// return Collections.emptyList(); +// } +// } + @Override - public void addStep(Step step) { - if (context.isEmpty()) { - traceRoot.getRootStep().getSubSteps().add(step); - context.push(step); - } else { - final Step topStep = context.getFirst(); - if (topStep != null && topStep instanceof SequentialStep) { - ((SequentialStep) topStep).getSubSteps().add(step); - } - } + public void addStep(Step step) { + throw new UnsupportedOperationException(); +// if (context.isEmpty()) { +// final List> tmp = new ArrayList<>(getSubSteps(traceRoot.getRootStep())); +// tmp.add(step); +// context.push(step); +// } else { +// final Step topStep = context.getFirst(); +// if (topStep != null && topStep instanceof BigStep) { +// ((BigStep) topStep).getSubSteps().add(step); +// } +// } } @Override - public void endStep(Step step) { - context.pop(); + public void endStep(Step step) { + throw new UnsupportedOperationException(); +// context.pop(); } @Override public EObject initTrace(LaunchConfiguration launchConfiguration) { - - // Create root - traceRoot = TraceFactory.eINSTANCE.createGenericTrace(); - traceRoot.setLaunchconfiguration(launchConfiguration); - - // Create root sequential step - GenericSequentialStep rootStep = TraceFactory.eINSTANCE.createGenericSequentialStep(); - traceRoot.setRootStep(rootStep); - - // Put in the resource - traceResource.getContents().add(traceRoot); - - return traceRoot; + throw new UnsupportedOperationException(); +// // Create root +// traceRoot = TraceFactory.eINSTANCE.createGenericTrace(); +// traceRoot.setLaunchconfiguration(launchConfiguration); +// +// // Create root sequential step +// GenericSequentialStep rootStep = TraceFactory.eINSTANCE.createGenericSequentialStep(); +// traceRoot.setRootStep(rootStep); +// +// // Put in the resource +// traceResource.getContents().add(traceRoot); +// +// return traceRoot; } @Override public void save() { - try { - traceResource.save(null); - } catch (java.io.IOException e) { - e.printStackTrace(); - } + throw new UnsupportedOperationException(); +// try { +// traceResource.save(null); +// } catch (java.io.IOException e) { +// e.printStackTrace(); +// } } @Override public void save(URI uri) { - try { - traceResource.setURI(uri); - traceResource.save(null); - } catch (java.io.IOException e) { - e.printStackTrace(); - } + throw new UnsupportedOperationException(); +// try { +// traceResource.setURI(uri); +// traceResource.save(null); +// } catch (java.io.IOException e) { +// e.printStackTrace(); +// } } @Override diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java index 77f545a95..e5ef1f43c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java @@ -6,73 +6,48 @@ import org.eclipse.emf.ecore.resource.Resource; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.gemoc.api.IStateManager; import fr.inria.diverse.trace.gemoc.api.IStepFactory; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; -import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.api.ITraceNotifier; public class GenericTraceEngineAddon extends AbstractTraceAddon { - private GenericTraceStepFactory factory = null; +// private GenericTraceStepFactory factory = null; @Override public IStepFactory getFactory() { - if (factory == null) { - factory = new GenericTraceStepFactory(); - } - return factory; + throw new UnsupportedOperationException(); +// if (factory == null) { +// factory = new GenericTraceStepFactory(); +// } +// return factory; } @Override public ITraceConstructor constructTraceConstructor(Resource exeModel, Resource traceResource, Map exeToTraced) { - return new GenericTraceConstructor(traceResource); + throw new UnsupportedOperationException(); +// return new GenericTraceConstructor(traceResource); } @Override public boolean isAddonForTrace(EObject traceRoot) { - return true; + throw new UnsupportedOperationException(); +// return true; } - @SuppressWarnings("unchecked") @Override - public ITraceExplorer constructTraceExplorer(Resource traceResource) { - GenericTraceExplorer explorer = new GenericTraceExplorer(); - EObject root = traceResource.getContents().get(0); - if (root instanceof Trace) { - explorer.loadTrace((Trace, GenericTracedObject, GenericState>)root); - return explorer; - } - return null; - } - - @Override - public ITraceExplorer constructTraceExplorer(Resource modelResource, - Resource traceResource, Map tracedToExe) { - return constructTraceExplorer(traceResource); - } - - @SuppressWarnings("unchecked") - @Override - public ITraceExtractor constructTraceExtractor(Resource traceResource) { - GenericTraceExtractor extractor = new GenericTraceExtractor(); - EObject root = traceResource.getContents().get(0); - if (root instanceof Trace) { - extractor.loadTrace((Trace, GenericTracedObject, GenericState>)root); - return extractor; - } - return null; + public ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) { + throw new UnsupportedOperationException(); +// return null; } @Override - public ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) { - return null; + public IStateManager> constructStateManager(Resource modelResource, Map tracedToExe) { + throw new UnsupportedOperationException(); +// return null; } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java index b26702fde..7e64221b6 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java @@ -14,23 +14,24 @@ import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.commons.model.trace.Value; +import fr.inria.diverse.trace.gemoc.api.IStateManager; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; public class GenericTraceExplorer implements ITraceExplorer, State, TracedObject, Dimension, Value> { - private Trace, ?, ?> traceRoot; + private Trace trace; final private List> callStack = new ArrayList<>(); + private State currentState; + private Step stepIntoResult; private Step stepOverResult; private Step stepReturnResult; @@ -39,8 +40,22 @@ public class GenericTraceExplorer implements ITraceExplorer, State, private Step stepBackOverResult; private Step stepBackOutResult; + private HashMap, Boolean> canBackValueCache = new HashMap<>(); + private HashMap, Boolean> canStepValueCache = new HashMap<>(); + private Map> listeners = new HashMap<>(); + private IStateManager> stateManager; + + public GenericTraceExplorer(Trace trace) { + this.trace = trace; + } + + public GenericTraceExplorer(Trace trace, IStateManager> stateManager) { + this.stateManager = stateManager; + this.trace = trace; + } + private List> getSubSteps(Step step) { if (step instanceof BigStep) { return ((BigStep) step).getSubSteps(); @@ -50,7 +65,7 @@ private List> getSubSteps(Step step) { } private Step computeBackInto(List> stepPath) { - final List> rootSteps = getSubSteps(traceRoot.getRootStep()); + final List> rootSteps = getSubSteps(trace.getRootStep()); final int depth = stepPath.size(); Step result = null; if (depth > 1) { @@ -110,7 +125,7 @@ private Step computeBackInto(List> stepPath) { } private Step computeBackOver(List> stepPath) { - final List> rootSteps = getSubSteps(traceRoot.getRootStep()); + final List> rootSteps = getSubSteps(trace.getRootStep()); final int depth = stepPath.size(); Step result = null; if (depth > 1) { @@ -163,7 +178,7 @@ private Step computeStepReturn(List> stepPath, List findNextStep(final List> stepPath, final Step previousStep, final int start) { - final List> rootSteps = getSubSteps(traceRoot.getRootStep()); + final List> rootSteps = getSubSteps(trace.getRootStep()); Step result = null; int i = start; int depth = stepPath.size(); @@ -204,7 +219,7 @@ private Step findNextStep(final List> stepPath, final Step< } private void computeExplorerState(List> stepPath) { - final List> rootSteps = getSubSteps(traceRoot.getRootStep()); + final List> rootSteps = getSubSteps(trace.getRootStep()); final List> stepPathUnmodifiable = Collections.unmodifiableList(stepPath); @@ -219,43 +234,46 @@ private void computeExplorerState(List> stepPath) { callStack.clear(); callStack.addAll(stepPathUnmodifiable.stream().map(s -> (Step) s).collect(Collectors.toList())); } - + private void goTo(State state) { - if (modelResource != null) { - try { - final TransactionalEditingDomain ed = TransactionUtil.getEditingDomain(modelResource); - if (ed != null) { - final RecordingCommand command = new RecordingCommand(ed, "") { - protected void doExecute() { - goTo(states); - } - }; - CommandExecution.execute(ed, command); - } - } catch (Exception e) { - throw e; - } + assert state != null; + if (stateManager != null) { + stateManager.restoreState(state); } +// if (modelResource != null) { +// try { +// final TransactionalEditingDomain ed = TransactionUtil.getEditingDomain(modelResource); +// if (ed != null) { +// final RecordingCommand command = new RecordingCommand(ed, "") { +// protected void doExecute() { +// +// } +// }; +// CommandExecution.execute(ed, command); +// } +// } catch (Exception e) { +// throw e; +// } +// } } private void jumpBeforeStep(Step step) { - if (step != null) { - final State state = step.getStartingState(); - final List> states = traceRoot.getStates(); - final int i = states.indexOf(state); - if (i == states.size() - 1) { - lastJumpIndex = -1; - } else { - lastJumpIndex = i; - } - currentState = state; - goTo(i); - updateCallStack(step); - } + assert step != null; + final State state = step.getStartingState(); + currentState = state; + goTo(currentState); + updateCallStack(step); } - - public void loadTrace(Trace, GenericTracedObject, GenericState> root) { - traceRoot = root; + + @Override + public void loadTrace(Trace, TracedObject, State> trace) { + this.trace = trace; + } + + @Override + public void loadTrace(Trace, TracedObject, State> trace, IStateManager> stateManager) { + this.stateManager = stateManager; + this.trace = trace; } @Override @@ -277,20 +295,22 @@ public Step getCurrentBigStep() { } @Override - public int getCurrentStateIndex() { - return -1; - } - - @Override - public void jump(EObject o) { + public void jump(State state) { + assert state != null; + goTo(state); } - + @Override - public void jump(int i) { + public void jump(Value value) { + assert value != null; + List> states = value.getStates(); + if (!states.isEmpty()) { + goTo(states.get(0)); + } } private List> getStepsForStates(int startingState, int endingState) { - final List> states = traceRoot.getStates(); + final List> states = trace.getStates(); Predicate> predicate = s -> { final State stepStartingState = s.getStartingState(); final State stepEndingState = s.getEndingState(); @@ -298,12 +318,12 @@ private List> getStepsForStates(int startingState, int endingS final int stepEndingIndex = stepEndingState == null ? -1 : states.indexOf(stepEndingState); return (stepEndingIndex == -1 || stepEndingIndex >= startingState) && stepStartingIndex <= endingState; }; - return getSubSteps(traceRoot.getRootStep()).stream().filter(predicate).collect(Collectors.toList()); + return getSubSteps(trace.getRootStep()).stream().filter(predicate).collect(Collectors.toList()); } @Override public void loadLastState() { - final int idx = traceRoot.getStates().size() - 1; + final int idx = trace.getStates().size() - 1; final List> steps = new ArrayList<>(getStepsForStates(idx, idx)); Step lastStep = null; while (!steps.isEmpty()) { @@ -385,23 +405,71 @@ public boolean stepBackOut() { } return false; } + + private Value getCurrentValue(Dimension dimension) { + return currentState.getValues().stream() + .filter(v -> v.eContainer() == dimension) + .findFirst().orElse(null); + } @Override - public void stepValue(int traceIndex) { + public boolean canStepValue(Dimension dimension) { + final Boolean cachedValue = canStepValueCache.get(dimension); + if (cachedValue != null) { + return cachedValue; + } else { + final Value currentValue = getCurrentValue(dimension); + final boolean result; + if (currentValue != null) { + final List> values = dimension.getValues(); + final int idx = values.indexOf(currentValue); + result = idx < values.size(); + } else { + result = false; + } + canStepValueCache.put(dimension, result); + return result; + } } @Override - public void backValue(int traceIndex) { + public boolean canBackValue(Dimension dimension) { + final Boolean cachedValue = canBackValueCache.get(dimension); + if (cachedValue != null) { + return cachedValue; + } else { + final Value currentValue = getCurrentValue(dimension); + final boolean result; + if (currentValue != null) { + final List> values = dimension.getValues(); + final int idx = values.indexOf(currentValue); + result = idx > 0; + } else { + result = false; + } + canBackValueCache.put(dimension, result); + return result; + } } @Override - public boolean canStepValue(int traceIndex) { - return false; + public void stepValue(Dimension dimension) { + if (canStepValue(dimension)) { + Value currentValue = getCurrentValue(dimension); + final List> values = dimension.getValues(); + final int idx = values.indexOf(currentValue); + jump(values.get(idx + 1)); + } } @Override - public boolean canBackValue(int traceIndex) { - return false; + public void backValue(Dimension dimension) { + if (canBackValue(dimension)) { + Value currentValue = getCurrentValue(dimension); + final List> values = dimension.getValues(); + final int idx = values.indexOf(currentValue); + jump(values.get(idx - 1)); + } } @Override @@ -486,7 +554,6 @@ public void dimensionsAdded(List> dimensions) { @Override public State getCurrentState() { - // TODO Auto-generated method stub - return null; + return currentState; } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index 2a4b1e94e..d22cb743d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -6,6 +6,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreEList; +import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; +import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; import fr.inria.diverse.trace.commons.model.trace.Dimension; @@ -20,9 +22,19 @@ public class GenericTraceExtractor implements ITraceExtractor, State, TracedObject, Dimension, Value> { - private Trace traceRoot; + private Trace trace; private HashMap,Boolean> ignoredDimensions = new HashMap<>(); - + final private IQualifiedNameProvider nameProvider = new DefaultDeclarativeQualifiedNameProvider(); + + public GenericTraceExtractor(Trace, TracedObject, State> trace) { + this.trace = trace; + } + + @Override + public void loadTrace(Trace, TracedObject, State> trace) { + this.trace = trace; + } + @Override public void notifyListeners() { // TODO Auto-generated method stub @@ -72,12 +84,12 @@ public boolean compareStates(State state1, State state2, boolean res @Override public LaunchConfiguration getLaunchConfiguration() { - return traceRoot.getLaunchconfiguration(); + return trace.getLaunchconfiguration(); } @Override public int getNumberOfDimensions() { - return traceRoot.getTracedObjects().stream() + return trace.getTracedObjects().stream() .map(o -> o.getDimensions().size()) .reduce(0, (i1, i2) -> i1 + i2); } @@ -96,28 +108,28 @@ public String getStateDescription(State state) { @Override public int getStatesTraceLength() { - return traceRoot.getStates().size(); + return trace.getStates().size(); } @Override public State getState(int stateIndex) { - return traceRoot.getStates().get(stateIndex); + return trace.getStates().get(stateIndex); } @Override public int getStateIndex(State state) { - return traceRoot.getStates().indexOf(state); + return trace.getStates().indexOf(state); } @Override public int getValueFirstStateIndex(Value value) { - return traceRoot.getStates().indexOf(value.getStates().get(0)); + return trace.getStates().indexOf(value.getStates().get(0)); } @Override public int getValueLastStateIndex(Value value) { List> states = value.getStates(); - return traceRoot.getStates().indexOf(states.get(states.size())); + return trace.getStates().indexOf(states.get(states.size())); } @Override @@ -135,10 +147,14 @@ public String getValueDescription(Value value) { @Override public String getDimensionLabel(int traceIndex) { // TODO - return null; } + private Object getOriginalObject(EObject eObject) { + return eObject.eClass().getEAllReferences().stream().filter(r -> r.getName().startsWith("originalObject")) + .findFirst().map(r -> eObject.eGet(r)).orElse(null); + } + @Override public String getDimensionLabel(Dimension dimension) { String attributeName = ""; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java index 0dd0b03cc..947c890b1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java @@ -10,7 +10,7 @@ public class GenericTraceStepFactory implements IStepFactory { @Override - public Step createStep(MSE mse, List parameters, List result) { + public Step createStep(MSE mse, List parameters, List result) { return TraceFactory.eINSTANCE.createSequentialStep(); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore index 11215e34e..cefe4c357 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore @@ -4,7 +4,12 @@ - + + + + + + @@ -19,22 +24,36 @@ - - - + + + + + + + + + + + - - - - - + + + + +
+ + + + +
+ + + + + + @@ -58,6 +77,11 @@ interface="true" eSuperTypes="#//States/SpecificValue"> - + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java index 9d89788be..954ff0712 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java @@ -5,8 +5,8 @@ import base.States.SpecificDimension; import base.States.SpecificState; import base.States.SpecificTracedObject; - import base.States.SpecificValue; + import base.Steps.SpecificStep; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; @@ -22,6 +22,5 @@ * @model * @generated */ -public interface SpecificTrace extends Trace, SpecificTracedObject>, SpecificState> { - +public interface SpecificTrace extends Trace, SpecificTracedObject>, SpecificState> { } // SpecificTrace diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java index 521134a5a..7d324c65f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java @@ -2,6 +2,7 @@ */ package base.States; + /** * * A representation of the model object 'Specific Attribute Value'. @@ -13,5 +14,4 @@ * @generated */ public interface SpecificAttributeValue extends SpecificValue { - } // SpecificAttributeValue diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java index 41c2d4d51..799ce5e7e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java @@ -2,6 +2,7 @@ */ package base.States; + /** * * A representation of the model object 'Specific Reference Value'. @@ -13,5 +14,4 @@ * @generated */ public interface SpecificReferenceValue extends SpecificValue { - } // SpecificReferenceValue diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java index 790172567..017854147 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java @@ -6,69 +6,16 @@ import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Value; -import org.eclipse.emf.common.util.EList; - /** * * A representation of the model object 'Specific State'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link base.States.SpecificState#getStartedSteps Started Steps}
    • - *
  • {@link base.States.SpecificState#getEndedSteps Ended Steps}
    • - *
* * @see base.States.StatesPackage#getSpecificState() * @model * @generated */ -public interface SpecificState extends State { - /** - * Returns the value of the 'Started Steps' reference list. - * The list contents are of type {@link base.Steps.SpecificStep}. - * It is bidirectional and its opposite is '{@link base.Steps.SpecificStep#getStartingState Starting State}'. - * - *

- * If the meaning of the 'Started Steps' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Started Steps' reference list. - * @see base.States.StatesPackage#getSpecificState_StartedSteps() - * @see base.Steps.SpecificStep#getStartingState - * @model opposite="startingState" - * @generated - */ - EList getStartedSteps(); - - /** - * Returns the value of the 'Ended Steps' reference list. - * The list contents are of type {@link base.Steps.SpecificStep}. - * It is bidirectional and its opposite is '{@link base.Steps.SpecificStep#getEndingState Ending State}'. - * - *

- * If the meaning of the 'Ended Steps' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Ended Steps' reference list. - * @see base.States.StatesPackage#getSpecificState_EndedSteps() - * @see base.Steps.SpecificStep#getEndingState - * @model opposite="endingState" - * @generated - */ - EList getEndedSteps(); - - /** - * - * - * @model kind="operation" - * @generated - */ - EList getValuesView(); +public interface SpecificState extends State { } // SpecificState diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java index 685390298..b15cf3c7d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java @@ -14,6 +14,6 @@ * @model abstract="true" * @generated */ -public interface SpecificValue extends Value { +public interface SpecificValue extends Value { } // SpecificValue diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java index ea1c52fd3..4f5f3ad10 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java @@ -5,9 +5,7 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; /** * @@ -75,7 +73,7 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STATE__STARTED_STEPS = TracePackage.STATE_FEATURE_COUNT + 0; + int SPECIFIC_STATE__STARTED_STEPS = TracePackage.STATE__STARTED_STEPS; /** * The feature id for the 'Ended Steps' reference list. @@ -84,25 +82,25 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STATE__ENDED_STEPS = TracePackage.STATE_FEATURE_COUNT + 1; + int SPECIFIC_STATE__ENDED_STEPS = TracePackage.STATE__ENDED_STEPS; /** - * The number of structural features of the 'Specific State' class. + * The feature id for the 'Values' reference list. * * * @generated * @ordered */ - int SPECIFIC_STATE_FEATURE_COUNT = TracePackage.STATE_FEATURE_COUNT + 2; + int SPECIFIC_STATE__VALUES = TracePackage.STATE__VALUES; /** - * The operation id for the 'Get Values View' operation. + * The number of structural features of the 'Specific State' class. * * * @generated * @ordered */ - int SPECIFIC_STATE___GET_VALUES_VIEW = TracePackage.STATE_OPERATION_COUNT + 0; + int SPECIFIC_STATE_FEATURE_COUNT = TracePackage.STATE_FEATURE_COUNT + 0; /** * The number of operations of the 'Specific State' class. @@ -111,7 +109,7 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 1; + int SPECIFIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 0; /** * The meta object id for the '{@link base.States.impl.SpecificValueImpl Specific Value}' class. @@ -124,22 +122,22 @@ public interface StatesPackage extends EPackage { int SPECIFIC_VALUE = 5; /** - * The number of structural features of the 'Specific Value' class. + * The feature id for the 'States' reference list. * * * @generated * @ordered */ - int SPECIFIC_VALUE_FEATURE_COUNT = TracePackage.VALUE_FEATURE_COUNT + 0; + int SPECIFIC_VALUE__STATES = TracePackage.VALUE__STATES; /** - * The operation id for the 'Get States View' operation. + * The number of structural features of the 'Specific Value' class. * * * @generated * @ordered */ - int SPECIFIC_VALUE___GET_STATES_VIEW = TracePackage.VALUE___GET_STATES_VIEW; + int SPECIFIC_VALUE_FEATURE_COUNT = TracePackage.VALUE_FEATURE_COUNT + 0; /** * The number of operations of the 'Specific Value' class. @@ -161,22 +159,22 @@ public interface StatesPackage extends EPackage { int SPECIFIC_ATTRIBUTE_VALUE = 1; /** - * The number of structural features of the 'Specific Attribute Value' class. + * The feature id for the 'States' reference list. * * * @generated * @ordered */ - int SPECIFIC_ATTRIBUTE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 0; + int SPECIFIC_ATTRIBUTE_VALUE__STATES = SPECIFIC_VALUE__STATES; /** - * The operation id for the 'Get States View' operation. + * The number of structural features of the 'Specific Attribute Value' class. * * * @generated * @ordered */ - int SPECIFIC_ATTRIBUTE_VALUE___GET_STATES_VIEW = SPECIFIC_VALUE___GET_STATES_VIEW; + int SPECIFIC_ATTRIBUTE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 0; /** * The number of operations of the 'Specific Attribute Value' class. @@ -261,7 +259,6 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_TRACED_OBJECT_OPERATION_COUNT = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 0; - /** * The meta object id for the '{@link base.States.SpecificReferenceValue Specific Reference Value}' class. * @@ -273,22 +270,22 @@ public interface StatesPackage extends EPackage { int SPECIFIC_REFERENCE_VALUE = 4; /** - * The number of structural features of the 'Specific Reference Value' class. + * The feature id for the 'States' reference list. * * * @generated * @ordered */ - int SPECIFIC_REFERENCE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 0; + int SPECIFIC_REFERENCE_VALUE__STATES = SPECIFIC_VALUE__STATES; /** - * The operation id for the 'Get States View' operation. + * The number of structural features of the 'Specific Reference Value' class. * * * @generated * @ordered */ - int SPECIFIC_REFERENCE_VALUE___GET_STATES_VIEW = SPECIFIC_VALUE___GET_STATES_VIEW; + int SPECIFIC_REFERENCE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 0; /** * The number of operations of the 'Specific Reference Value' class. @@ -310,38 +307,6 @@ public interface StatesPackage extends EPackage { */ EClass getSpecificState(); - /** - * Returns the meta object for the reference list '{@link base.States.SpecificState#getStartedSteps Started Steps}'. - * - * - * @return the meta object for the reference list 'Started Steps'. - * @see base.States.SpecificState#getStartedSteps() - * @see #getSpecificState() - * @generated - */ - EReference getSpecificState_StartedSteps(); - - /** - * Returns the meta object for the reference list '{@link base.States.SpecificState#getEndedSteps Ended Steps}'. - * - * - * @return the meta object for the reference list 'Ended Steps'. - * @see base.States.SpecificState#getEndedSteps() - * @see #getSpecificState() - * @generated - */ - EReference getSpecificState_EndedSteps(); - - /** - * Returns the meta object for the '{@link base.States.SpecificState#getValuesView() Get Values View}' operation. - * - * - * @return the meta object for the 'Get Values View' operation. - * @see base.States.SpecificState#getValuesView() - * @generated - */ - EOperation getSpecificState__GetValuesView(); - /** * Returns the meta object for class '{@link base.States.SpecificAttributeValue Specific Attribute Value}'. * @@ -425,30 +390,6 @@ interface Literals { */ EClass SPECIFIC_STATE = eINSTANCE.getSpecificState(); - /** - * The meta object literal for the 'Started Steps' reference list feature. - * - * - * @generated - */ - EReference SPECIFIC_STATE__STARTED_STEPS = eINSTANCE.getSpecificState_StartedSteps(); - - /** - * The meta object literal for the 'Ended Steps' reference list feature. - * - * - * @generated - */ - EReference SPECIFIC_STATE__ENDED_STEPS = eINSTANCE.getSpecificState_EndedSteps(); - - /** - * The meta object literal for the 'Get Values View' operation. - * - * - * @generated - */ - EOperation SPECIFIC_STATE___GET_VALUES_VIEW = eINSTANCE.getSpecificState__GetValuesView(); - /** * The meta object literal for the '{@link base.States.SpecificAttributeValue Specific Attribute Value}' class. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java index 82de2350d..fddef93f7 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java @@ -5,9 +5,13 @@ import base.States.SpecificDimension; import base.States.SpecificValue; import base.States.StatesPackage; + import fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl; + import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; + import org.eclipse.emf.ecore.util.EObjectContainmentEList; /** diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java index 2869ee509..c60b8c6ec 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java @@ -3,60 +3,23 @@ package base.States.impl; import base.States.SpecificState; +import base.States.SpecificValue; import base.States.StatesPackage; import base.Steps.SpecificStep; -import base.Steps.StepsPackage; import fr.inria.diverse.trace.commons.model.trace.impl.StateImpl; -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; /** * * An implementation of the model object 'Specific State'. * - *

- * The following features are implemented: - *

- *
    - *
  • {@link base.States.impl.SpecificStateImpl#getStartedSteps Started Steps}
    • - *
  • {@link base.States.impl.SpecificStateImpl#getEndedSteps Ended Steps}
    • - *
* * @generated */ -public class SpecificStateImpl extends StateImpl implements SpecificState { - /** - * The cached value of the '{@link #getStartedSteps() Started Steps}' reference list. - * - * - * @see #getStartedSteps() - * @generated - * @ordered - */ - protected EList startedSteps; - - /** - * The cached value of the '{@link #getEndedSteps() Ended Steps}' reference list. - * - * - * @see #getEndedSteps() - * @generated - * @ordered - */ - protected EList endedSteps; - +public class SpecificStateImpl extends StateImpl implements SpecificState { /** * * @@ -76,132 +39,4 @@ protected EClass eStaticClass() { return StatesPackage.Literals.SPECIFIC_STATE; } - /** - * - * - * @generated - */ - public EList getStartedSteps() { - if (startedSteps == null) { - startedSteps = new EObjectWithInverseResolvingEList(SpecificStep.class, this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS, StepsPackage.SPECIFIC_STEP__STARTING_STATE); - } - return startedSteps; - } - - /** - * - * - * @generated - */ - public EList getEndedSteps() { - if (endedSteps == null) { - endedSteps = new EObjectWithInverseResolvingEList(SpecificStep.class, this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS, StepsPackage.SPECIFIC_STEP__ENDING_STATE); - } - return endedSteps; - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: - return ((InternalEList)(InternalEList)getStartedSteps()).basicAdd(otherEnd, msgs); - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: - return ((InternalEList)(InternalEList)getEndedSteps()).basicAdd(otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: - return ((InternalEList)getStartedSteps()).basicRemove(otherEnd, msgs); - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: - return ((InternalEList)getEndedSteps()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: - return getStartedSteps(); - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: - return getEndedSteps(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: - getStartedSteps().clear(); - getStartedSteps().addAll((Collection)newValue); - return; - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: - getEndedSteps().clear(); - getEndedSteps().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: - getStartedSteps().clear(); - return; - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: - getEndedSteps().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS: - return startedSteps != null && !startedSteps.isEmpty(); - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS: - return endedSteps != null && !endedSteps.isEmpty(); - } - return super.eIsSet(featureID); - } - } //SpecificStateImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java index 57ae32949..c73921613 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java @@ -11,6 +11,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; + import org.eclipse.emf.ecore.util.EObjectContainmentEList; /** diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java index be62bd00e..1ef5f4666 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java @@ -2,10 +2,12 @@ */ package base.States.impl; +import base.States.SpecificState; import base.States.SpecificValue; import base.States.StatesPackage; import fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl; + import org.eclipse.emf.ecore.EClass; /** @@ -15,7 +17,7 @@ * * @generated */ -public abstract class SpecificValueImpl extends ValueImpl implements SpecificValue { +public abstract class SpecificValueImpl extends ValueImpl implements SpecificValue { /** * * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java index 3aee2dd05..49d0065c3 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java @@ -23,11 +23,9 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; -import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - import org.eclipse.emf.ecore.ETypeParameter; + import org.eclipse.emf.ecore.impl.EPackageImpl; /** @@ -160,33 +158,6 @@ public EClass getSpecificState() { return specificStateEClass; } - /** - * - * - * @generated - */ - public EReference getSpecificState_StartedSteps() { - return (EReference)specificStateEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getSpecificState_EndedSteps() { - return (EReference)specificStateEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EOperation getSpecificState__GetValuesView() { - return specificStateEClass.getEOperations().get(0); - } - /** * * @@ -261,9 +232,6 @@ public void createPackageContents() { // Create classes and their features specificStateEClass = createEClass(SPECIFIC_STATE); - createEReference(specificStateEClass, SPECIFIC_STATE__STARTED_STEPS); - createEReference(specificStateEClass, SPECIFIC_STATE__ENDED_STEPS); - createEOperation(specificStateEClass, SPECIFIC_STATE___GET_VALUES_VIEW); specificAttributeValueEClass = createEClass(SPECIFIC_ATTRIBUTE_VALUE); @@ -313,10 +281,15 @@ public void initializePackageContents() { specificDimensionEClass_ValueSubType.getEBounds().add(g1); // Add supertypes to classes - specificStateEClass.getESuperTypes().add(theTracePackage.getState()); + g1 = createEGenericType(theTracePackage.getState()); + EGenericType g2 = createEGenericType(theStepsPackage.getSpecificStep()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(this.getSpecificValue()); + g1.getETypeArguments().add(g2); + specificStateEClass.getEGenericSuperTypes().add(g1); specificAttributeValueEClass.getESuperTypes().add(this.getSpecificValue()); g1 = createEGenericType(theTracePackage.getDimension()); - EGenericType g2 = createEGenericType(specificDimensionEClass_ValueSubType); + g2 = createEGenericType(specificDimensionEClass_ValueSubType); g1.getETypeArguments().add(g2); specificDimensionEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(theTracePackage.getTracedObject()); @@ -326,14 +299,13 @@ public void initializePackageContents() { g2.getETypeArguments().add(g3); specificTracedObjectEClass.getEGenericSuperTypes().add(g1); specificReferenceValueEClass.getESuperTypes().add(this.getSpecificValue()); - specificValueEClass.getESuperTypes().add(theTracePackage.getValue()); + g1 = createEGenericType(theTracePackage.getValue()); + g2 = createEGenericType(this.getSpecificState()); + g1.getETypeArguments().add(g2); + specificValueEClass.getEGenericSuperTypes().add(g1); // Initialize classes, features, and operations; add parameters initEClass(specificStateEClass, SpecificState.class, "SpecificState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSpecificState_StartedSteps(), theStepsPackage.getSpecificStep(), theStepsPackage.getSpecificStep_StartingState(), "startedSteps", null, 0, -1, SpecificState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSpecificState_EndedSteps(), theStepsPackage.getSpecificStep(), theStepsPackage.getSpecificStep_EndingState(), "endedSteps", null, 0, -1, SpecificState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEOperation(getSpecificState__GetValuesView(), theTracePackage.getValue(), "getValuesView", 0, -1, IS_UNIQUE, IS_ORDERED); initEClass(specificAttributeValueEClass, SpecificAttributeValue.class, "SpecificAttributeValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java index a6dcbd671..602348c6d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java @@ -6,6 +6,7 @@ import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.commons.model.trace.Value; @@ -97,19 +98,19 @@ public Adapter caseSpecificValue(SpecificValue object) { return createSpecificValueAdapter(); } @Override - public Adapter caseState(State object) { + public , ValueSubType extends Value> Adapter caseState(State object) { return createStateAdapter(); } @Override - public Adapter caseValue(Value object) { + public > Adapter caseValue(Value object) { return createValueAdapter(); } @Override - public Adapter caseDimension(Dimension object) { + public > Adapter caseDimension(Dimension object) { return createDimensionAdapter(); } @Override - public Adapter caseTracedObject(TracedObject object) { + public > Adapter caseTracedObject(TracedObject object) { return createTracedObjectAdapter(); } @Override diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java index af6b190b3..114a80f50 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java @@ -6,6 +6,7 @@ import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.commons.model.trace.Value; @@ -220,7 +221,7 @@ public T1 caseSpecificValue(SpecificValue object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseState(State object) { + public , ValueSubType extends Value> T1 caseState(State object) { return null; } @@ -235,7 +236,7 @@ public T1 caseState(State object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseValue(Value object) { + public > T1 caseValue(Value object) { return null; } @@ -250,7 +251,7 @@ public T1 caseValue(Value object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseDimension(Dimension object) { + public > T1 caseDimension(Dimension object) { return null; } @@ -265,7 +266,7 @@ public T1 caseDimension(Dimension obj * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseTracedObject(TracedObject object) { + public > T1 caseTracedObject(TracedObject object) { return null; } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java index a6651d252..7d344908c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java @@ -2,6 +2,8 @@ */ package base.Steps; +import base.States.SpecificState; + import fr.inria.diverse.trace.commons.model.trace.SmallStep; /** @@ -14,5 +16,5 @@ * @model * @generated */ -public interface RootImplicitStep extends SmallStep { +public interface RootImplicitStep extends SmallStep { } // RootImplicitStep diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java index 5ed441006..8deba6a97 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java @@ -11,73 +11,11 @@ * A representation of the model object 'Specific Step'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link base.Steps.SpecificStep#getStartingState Starting State}
    • - *
  • {@link base.Steps.SpecificStep#getEndingState Ending State}
    • - *
* * @see base.Steps.StepsPackage#getSpecificStep() * @model interface="true" abstract="true" * @generated */ -public interface SpecificStep extends Step { - /** - * Returns the value of the 'Starting State' reference. - * It is bidirectional and its opposite is '{@link base.States.SpecificState#getStartedSteps Started Steps}'. - * - *

- * If the meaning of the 'Starting State' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Starting State' reference. - * @see #setStartingState(SpecificState) - * @see base.Steps.StepsPackage#getSpecificStep_StartingState() - * @see base.States.SpecificState#getStartedSteps - * @model opposite="startedSteps" required="true" - * @generated - */ - SpecificState getStartingState(); - - /** - * Sets the value of the '{@link base.Steps.SpecificStep#getStartingState Starting State}' reference. - * - * - * @param value the new value of the 'Starting State' reference. - * @see #getStartingState() - * @generated - */ - void setStartingState(SpecificState value); - - /** - * Returns the value of the 'Ending State' reference. - * It is bidirectional and its opposite is '{@link base.States.SpecificState#getEndedSteps Ended Steps}'. - * - *

- * If the meaning of the 'Ending State' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Ending State' reference. - * @see #setEndingState(SpecificState) - * @see base.Steps.StepsPackage#getSpecificStep_EndingState() - * @see base.States.SpecificState#getEndedSteps - * @model opposite="endedSteps" - * @generated - */ - SpecificState getEndingState(); - - /** - * Sets the value of the '{@link base.Steps.SpecificStep#getEndingState Ending State}' reference. - * - * - * @param value the new value of the 'Ending State' reference. - * @see #getEndingState() - * @generated - */ - void setEndingState(SpecificState value); +public interface SpecificStep extends Step { } // SpecificStep diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java index c01e2d23b..cfeec778a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java @@ -6,7 +6,6 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; /** * @@ -83,7 +82,7 @@ public interface StepsPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STEP__STARTING_STATE = TracePackage.STEP_FEATURE_COUNT + 0; + int SPECIFIC_STEP__STARTING_STATE = TracePackage.STEP__STARTING_STATE; /** * The feature id for the 'Ending State' reference. @@ -92,7 +91,7 @@ public interface StepsPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STEP__ENDING_STATE = TracePackage.STEP_FEATURE_COUNT + 1; + int SPECIFIC_STEP__ENDING_STATE = TracePackage.STEP__ENDING_STATE; /** * The number of structural features of the 'Specific Step' class. @@ -101,7 +100,7 @@ public interface StepsPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STEP_FEATURE_COUNT = TracePackage.STEP_FEATURE_COUNT + 2; + int SPECIFIC_STEP_FEATURE_COUNT = TracePackage.STEP_FEATURE_COUNT + 0; /** * The number of operations of the 'Specific Step' class. @@ -132,55 +131,51 @@ public interface StepsPackage extends EPackage { int ROOT_IMPLICIT_STEP__MSEOCCURRENCE = TracePackage.SMALL_STEP__MSEOCCURRENCE; /** - * The number of structural features of the 'Root Implicit Step' class. + * The feature id for the 'Starting State' reference. * * * @generated * @ordered */ - int ROOT_IMPLICIT_STEP_FEATURE_COUNT = TracePackage.SMALL_STEP_FEATURE_COUNT + 0; + int ROOT_IMPLICIT_STEP__STARTING_STATE = TracePackage.SMALL_STEP__STARTING_STATE; /** - * The number of operations of the 'Root Implicit Step' class. + * The feature id for the 'Ending State' reference. * * * @generated * @ordered */ - int ROOT_IMPLICIT_STEP_OPERATION_COUNT = TracePackage.SMALL_STEP_OPERATION_COUNT + 0; - + int ROOT_IMPLICIT_STEP__ENDING_STATE = TracePackage.SMALL_STEP__ENDING_STATE; /** - * Returns the meta object for class '{@link base.Steps.SpecificStep Specific Step}'. + * The number of structural features of the 'Root Implicit Step' class. * * - * @return the meta object for class 'Specific Step'. - * @see base.Steps.SpecificStep * @generated + * @ordered */ - EClass getSpecificStep(); + int ROOT_IMPLICIT_STEP_FEATURE_COUNT = TracePackage.SMALL_STEP_FEATURE_COUNT + 0; /** - * Returns the meta object for the reference '{@link base.Steps.SpecificStep#getStartingState Starting State}'. + * The number of operations of the 'Root Implicit Step' class. * * - * @return the meta object for the reference 'Starting State'. - * @see base.Steps.SpecificStep#getStartingState() - * @see #getSpecificStep() * @generated + * @ordered */ - EReference getSpecificStep_StartingState(); + int ROOT_IMPLICIT_STEP_OPERATION_COUNT = TracePackage.SMALL_STEP_OPERATION_COUNT + 0; + /** - * Returns the meta object for the reference '{@link base.Steps.SpecificStep#getEndingState Ending State}'. + * Returns the meta object for class '{@link base.Steps.SpecificStep Specific Step}'. * * - * @return the meta object for the reference 'Ending State'. - * @see base.Steps.SpecificStep#getEndingState() - * @see #getSpecificStep() + * @return the meta object for class 'Specific Step'. + * @see base.Steps.SpecificStep * @generated */ - EReference getSpecificStep_EndingState(); + EClass getSpecificStep(); /** * Returns the meta object for class '{@link base.Steps.RootImplicitStep Root Implicit Step}'. @@ -225,22 +220,6 @@ interface Literals { */ EClass SPECIFIC_STEP = eINSTANCE.getSpecificStep(); - /** - * The meta object literal for the 'Starting State' reference feature. - * - * - * @generated - */ - EReference SPECIFIC_STEP__STARTING_STATE = eINSTANCE.getSpecificStep_StartingState(); - - /** - * The meta object literal for the 'Ending State' reference feature. - * - * - * @generated - */ - EReference SPECIFIC_STEP__ENDING_STATE = eINSTANCE.getSpecificStep_EndingState(); - /** * The meta object literal for the '{@link base.Steps.impl.RootImplicitStepImpl Root Implicit Step}' class. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java index 237cc9700..ef8a2a32d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java @@ -2,6 +2,8 @@ */ package base.Steps.impl; +import base.States.SpecificState; + import base.Steps.RootImplicitStep; import base.Steps.StepsPackage; @@ -16,7 +18,7 @@ * * @generated */ -public class RootImplicitStepImpl extends SmallStepImpl implements RootImplicitStep { +public class RootImplicitStepImpl extends SmallStepImpl implements RootImplicitStep { /** * * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java index 456161863..94867da42 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java @@ -18,8 +18,8 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EGenericType; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -125,24 +125,6 @@ public EClass getSpecificStep() { return specificStepEClass; } - /** - * - * - * @generated - */ - public EReference getSpecificStep_StartingState() { - return (EReference)specificStepEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getSpecificStep_EndingState() { - return (EReference)specificStepEClass.getEStructuralFeatures().get(1); - } - /** * * @@ -181,8 +163,6 @@ public void createPackageContents() { // Create classes and their features specificStepEClass = createEClass(SPECIFIC_STEP); - createEReference(specificStepEClass, SPECIFIC_STEP__STARTING_STATE); - createEReference(specificStepEClass, SPECIFIC_STEP__ENDING_STATE); rootImplicitStepEClass = createEClass(ROOT_IMPLICIT_STEP); } @@ -219,13 +199,17 @@ public void initializePackageContents() { // Set bounds for type parameters // Add supertypes to classes - specificStepEClass.getESuperTypes().add(theTracePackage.getStep()); - rootImplicitStepEClass.getESuperTypes().add(theTracePackage.getSmallStep()); + EGenericType g1 = createEGenericType(theTracePackage.getStep()); + EGenericType g2 = createEGenericType(theStatesPackage.getSpecificState()); + g1.getETypeArguments().add(g2); + specificStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theTracePackage.getSmallStep()); + g2 = createEGenericType(theStatesPackage.getSpecificState()); + g1.getETypeArguments().add(g2); + rootImplicitStepEClass.getEGenericSuperTypes().add(g1); // Initialize classes, features, and operations; add parameters initEClass(specificStepEClass, SpecificStep.class, "SpecificStep", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSpecificStep_StartingState(), theStatesPackage.getSpecificState(), theStatesPackage.getSpecificState_StartedSteps(), "startingState", null, 1, 1, SpecificStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSpecificStep_EndingState(), theStatesPackage.getSpecificState(), theStatesPackage.getSpecificState_EndedSteps(), "endingState", null, 0, 1, SpecificStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(rootImplicitStepEClass, RootImplicitStep.class, "RootImplicitStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java index e91a54432..8dc3dfb9a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java @@ -5,6 +5,7 @@ import base.Steps.*; import fr.inria.diverse.trace.commons.model.trace.SmallStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import org.eclipse.emf.common.notify.Adapter; @@ -79,11 +80,11 @@ public Adapter caseRootImplicitStep(RootImplicitStep object) { return createRootImplicitStepAdapter(); } @Override - public Adapter caseStep(Step object) { + public > Adapter caseStep(Step object) { return createStepAdapter(); } @Override - public Adapter caseSmallStep(SmallStep object) { + public > Adapter caseSmallStep(SmallStep object) { return createSmallStepAdapter(); } @Override diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java index dc67289da..7cd6d79c5 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java @@ -5,6 +5,7 @@ import base.Steps.*; import fr.inria.diverse.trace.commons.model.trace.SmallStep; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import org.eclipse.emf.ecore.EObject; @@ -129,7 +130,7 @@ public T caseRootImplicitStep(RootImplicitStep object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseStep(Step object) { + public > T caseStep(Step object) { return null; } @@ -144,7 +145,7 @@ public T caseStep(Step object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseSmallStep(SmallStep object) { + public > T caseSmallStep(SmallStep object) { return null; } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java index 50db40514..604cc5f1b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java @@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; import org.eclipse.emf.ecore.EPackage; + import org.eclipse.emf.ecore.impl.EPackageImpl; /** @@ -187,13 +188,19 @@ public void initializePackageContents() { EGenericType g1 = createEGenericType(theTracePackage.getTrace()); EGenericType g2 = createEGenericType(theTracePackage.getSequentialStep()); g1.getETypeArguments().add(g2); - EGenericType g3 = createEGenericType(theStepsPackage.getSpecificStep()); + EGenericType g3 = createEGenericType(); g2.getETypeArguments().add(g3); + EGenericType g4 = createEGenericType(theStepsPackage.getSpecificStep()); + g3.setEUpperBound(g4); + g3 = createEGenericType(); + g2.getETypeArguments().add(g3); + g4 = createEGenericType(theStatesPackage.getSpecificState()); + g3.setEUpperBound(g4); g2 = createEGenericType(theStatesPackage.getSpecificTracedObject()); g1.getETypeArguments().add(g2); g3 = createEGenericType(); g2.getETypeArguments().add(g3); - EGenericType g4 = createEGenericType(theStatesPackage.getSpecificDimension()); + g4 = createEGenericType(theStatesPackage.getSpecificDimension()); g3.setEUpperBound(g4); EGenericType g5 = createEGenericType(); g4.getETypeArguments().add(g5); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java index 4c2e32425..38f1b8821 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java @@ -8,17 +8,20 @@ import base.States.SpecificDimension; import base.States.SpecificState; import base.States.SpecificTracedObject; - import base.States.SpecificValue; + import base.Steps.SpecificStep; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; + import fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl; + import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; + import org.eclipse.emf.ecore.util.EObjectContainmentEList; /** @@ -28,7 +31,7 @@ * * @generated */ -public class SpecificTraceImpl extends TraceImpl, SpecificTracedObject>, SpecificState> implements SpecificTrace { +public class SpecificTraceImpl extends TraceImpl, SpecificTracedObject>, SpecificState> implements SpecificTrace { /** * * @@ -55,7 +58,7 @@ protected EClass eStaticClass() { * @generated */ @Override - public NotificationChain basicSetRootStep(SequentialStep newRootStep, NotificationChain msgs) { + public NotificationChain basicSetRootStep(SequentialStep newRootStep, NotificationChain msgs) { return super.basicSetRootStep(newRootStep, msgs); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java index 181a72d54..8a9347ed5 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java @@ -4,7 +4,10 @@ import base.*; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -74,7 +77,7 @@ public Adapter caseSpecificTrace(SpecificTrace object) { return createSpecificTraceAdapter(); } @Override - public Adapter caseTrace(Trace object) { + public , TracedObjectSubtype extends TracedObject, StateSubType extends State> Adapter caseTrace(Trace object) { return createTraceAdapter(); } @Override diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseSwitch.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseSwitch.java index 591a151e2..29f933b2d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseSwitch.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseSwitch.java @@ -4,7 +4,10 @@ import base.*; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -105,7 +108,7 @@ public T caseSpecificTrace(SpecificTrace object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseTrace(Trace object) { + public , TracedObjectSubtype extends TracedObject, StateSubType extends State> T caseTrace(Trace object) { return null; } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend index a6e3d69b9..18f2a7b9a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend @@ -15,6 +15,7 @@ import org.eclipse.emf.ecore.util.Diagnostician import org.eclipse.emf.common.util.Diagnostic import java.util.Set import org.eclipse.emf.codegen.ecore.genmodel.GenPackage +import fr.inria.diverse.trace.commons.EcoreCraftingUtil class TraceMMGenerator { @@ -82,6 +83,39 @@ class TraceMMGenerator { stepsGen = new TraceMMGeneratorSteps(mmext, tracemmresult, traceability, traceMMExplorer, gemoc) stepsGen.process + + + // Link State -> Step class + val refState2StartedSteps = EcoreCraftingUtil.addReferenceToClass(traceMMExplorer.specificStateClass, + TraceMMStrings.ref_StateToStep_started, traceMMExplorer.specificStepClass) + refState2StartedSteps.ordered = true + refState2StartedSteps.unique = true + refState2StartedSteps.upperBound = -1 + refState2StartedSteps.lowerBound = 0 + + val refState2EndedSteps = EcoreCraftingUtil.addReferenceToClass(traceMMExplorer.specificStateClass, + TraceMMStrings.ref_StateToStep_ended, traceMMExplorer.specificStepClass) + refState2EndedSteps.ordered = true + refState2EndedSteps.unique = true + refState2EndedSteps.upperBound = -1 + refState2EndedSteps.lowerBound = 0 + + // Link Step -> State class + val refStep2StartingState = EcoreCraftingUtil.addReferenceToClass(traceMMExplorer.specificStepClass, + TraceMMStrings.ref_StepToState_starting, traceMMExplorer.specificStateClass) + refStep2StartingState.unique = true + refStep2StartingState.upperBound = 1 + refStep2StartingState.lowerBound = 1 + refStep2StartingState.EOpposite = refState2StartedSteps + refState2StartedSteps.EOpposite = refStep2StartingState + + val refStep2EndingState = EcoreCraftingUtil.addReferenceToClass(traceMMExplorer.specificStepClass, + TraceMMStrings.ref_StepToState_ending, traceMMExplorer.specificStateClass) + refStep2EndingState.unique = true + refStep2EndingState.upperBound = 1 + refStep2EndingState.lowerBound = 0 + refStep2EndingState.EOpposite = refState2EndedSteps + refState2EndedSteps.EOpposite = refStep2EndingState // Validation val results = Diagnostician.INSTANCE.validate(this.mmext); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index a668ba465..b82447060 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -192,12 +192,12 @@ class TraceMMGeneratorStates { } if (!valuesGetters.empty) { - val getValuesViewEOperation = traceMMExplorer.specificStateClass.EOperations.findFirst[name == "getValuesView"] + val getValuesEOperation = traceMMExplorer.specificStateClass.EOperations.findFirst[name == "getValues"] val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation - getValuesViewEOperation.EAnnotations.add(bodyAnnotation) + getValuesEOperation.EAnnotations.add(bodyAnnotation) bodyAnnotation.source = GenModelPackage.eNS_URI bodyAnnotation.details.put("body", ''' - final EList result = new org.eclipse.emf.common.util.BasicEList(); + final EList result = new org.eclipse.emf.common.util.BasicEList(); «FOR getter : valuesGetters» result.addAll(«getter»); «ENDFOR» @@ -343,35 +343,19 @@ class TraceMMGeneratorStates { traceability.putMutablePropertyToValueProperty(runtimeProperty,copiedProperty) ExecutionMetamodelTraceability.createTraceabilityAnnotation(valueClass, - ExecutionMetamodelTraceability.getTraceabilityAnnotationValue(runtimeProperty)); - - // Adding the getStatesView operation - val EOperation getStatesViewEOperation = EcoreFactory.eINSTANCE.createEOperation - getStatesViewEOperation.EType = traceMMExplorer.stateClass - getStatesViewEOperation.lowerBound = 1 - getStatesViewEOperation.upperBound = -1 - getStatesViewEOperation.name = "getStatesView" + ExecutionMetamodelTraceability.getTraceabilityAnnotationValue(runtimeProperty)) + + // Adding the getStates operation + val EOperation getStatesEOperation = traceMMExplorer.specificValueClass.EOperations.findFirst[name == "getStates"] val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation - getStatesViewEOperation.EAnnotations.add(bodyAnnotation) + getStatesEOperation.EAnnotations.add(bodyAnnotation) bodyAnnotation.source = GenModelPackage.eNS_URI bodyAnnotation.details.put("body", ''' - final EList result = new org.eclipse.emf.common.util.BasicEList(); + final EList result = new org.eclipse.emf.common.util.BasicEList(); result.addAll(getStates()); return result; ''') - valueClass.EOperations.add(getStatesViewEOperation) - -// // And must hence implement the derived getStepsNoOpposite -// val EOperation getStatesNoOppositeEOperation = EcoreFactory.eINSTANCE.createEOperation -// getStatesNoOppositeEOperation.EType = traceMMExplorer.stateClass -// getStatesNoOppositeEOperation.lowerBound = 1 -// getStatesNoOppositeEOperation.upperBound = -1 -// getStatesNoOppositeEOperation.name = "getStatesNoOpposite" -// val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation -// getStatesNoOppositeEOperation.EAnnotations.add(bodyAnnotation) -// bodyAnnotation.source = GenModelPackage.eNS_URI -// bodyAnnotation.details.put("body", "return this.getStates();") -// valueClass.EOperations.add(getStatesNoOppositeEOperation) + valueClass.EOperations.add(getStatesEOperation) //------------ Dimension class val dimensionClass = EcoreFactory.eINSTANCE.createEClass @@ -387,7 +371,7 @@ class TraceMMGeneratorStates { traceMMExplorer.statesPackage.EClassifiers.add(dimensionClass) val dimensionRef = addReferenceToClass(tracedClass, - dimensionClass.name.toFirstLower, dimensionClass); + dimensionClass.name.toFirstLower, dimensionClass) dimensionRef.containment = true dimensionRef.lowerBound = 0 dimensionRef.upperBound = 1 @@ -396,27 +380,10 @@ class TraceMMGeneratorStates { traceability.putDimensionRef(runtimeProperty, dimensionRef) traceability.putValueClass(runtimeProperty, valueClass) -// // Link Traced class -> Value class -// val refTrace2State = addReferenceToClass(tracedClass, -// TraceMMStrings.ref_createTraceClassToValueClass(runtimeProperty), valueClass); -// refTrace2State.containment = true -// refTrace2State.ordered = true -// refTrace2State.unique = true -// refTrace2State.lowerBound = 0 -// refTrace2State.upperBound = -1 -// -// traceability.putTraceOf(runtimeProperty, refTrace2State) -// -// // Link Value class -> Traced class (bidirectional) -// val refValue2Traced = addReferenceToClass(valueClass, TraceMMStrings.ref_ValueToTrace, tracedClass); -// refValue2Traced.upperBound = 1 -// refValue2Traced.lowerBound = 1 -// refValue2Traced.EOpposite = refTrace2State -// refTrace2State.EOpposite = refValue2Traced // Link State -> Value class val refState2Value = addReferenceToClass(traceMMExplorer.specificStateClass, - TraceMMStrings.ref_createGlobalToState(valueClass), valueClass); + TraceMMStrings.ref_createGlobalToState(valueClass), valueClass) refState2Value.ordered = false refState2Value.unique = true refState2Value.upperBound = -1 @@ -425,9 +392,9 @@ class TraceMMGeneratorStates { traceability.putStateClassToValueClass(runtimeProperty, refState2Value) - // Link State class -> GlobalState (bidirectional) + // Link Value class -> State (bidirectional) val refState2Global = addReferenceToClass(valueClass, TraceMMStrings.ref_ValueToStates, - traceMMExplorer.specificStateClass); + traceMMExplorer.specificStateClass) refState2Global.upperBound = -1 refState2Global.lowerBound = 1 refState2Global.EOpposite = refState2Value diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend index cf67ffe83..473266ffa 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend @@ -216,7 +216,13 @@ class TraceMMGeneratorSteps { if (stepRule.calledRules.isEmpty) { // Adding inheritance to SmallStep class - stepClass.ESuperTypes.add(mseSmallStepClass) + val smallStepGenericSuperType = EcoreFactory.eINSTANCE.createEGenericType + smallStepGenericSuperType.EClassifier = mseSmallStepClass + val smallStepTypeBinding = EcoreFactory.eINSTANCE.createEGenericType + smallStepGenericSuperType.ETypeArguments.add(smallStepTypeBinding) + // And binds its type parameter to the generated traced object class + smallStepTypeBinding.EClassifier = traceMMExplorer.specificStateClass + stepClass.EGenericSuperTypes.add(smallStepGenericSuperType) } // Case Big Step else { @@ -226,8 +232,9 @@ class TraceMMGeneratorSteps { // Adding inheritance to SequentialStep abstract class val genericSuperType = EcoreFactory.eINSTANCE.createEGenericType genericSuperType.EClassifier = mseSequentialStepClass - val typeBinding = EcoreFactory.eINSTANCE.createEGenericType - genericSuperType.ETypeArguments.add(typeBinding) + val stepTypeBinding = EcoreFactory.eINSTANCE.createEGenericType + val stateTypeBinding = EcoreFactory.eINSTANCE.createEGenericType + genericSuperType.ETypeArguments.addAll(stepTypeBinding, stateTypeBinding) stepClass.EGenericSuperTypes.add(genericSuperType) // SubStepSuperClass @@ -240,7 +247,10 @@ class TraceMMGeneratorSteps { subStepSuperClass.ESuperTypes.add(traceMMExplorer.specificStepClass) // Link StepClass -> SubStepSuperClass, simply through type binding - typeBinding.EClassifier = subStepSuperClass + stepTypeBinding.EClassifier = subStepSuperClass + + // Link StepClass -> StateClass + stateTypeBinding.EClassifier = traceMMExplorer.specificStateClass // Fill step class val EClass implicitStepClass = EcoreFactory.eINSTANCE.createEClass @@ -249,7 +259,16 @@ class TraceMMGeneratorSteps { StepStrings.implicitStepClassName(stepRule.containingClass, stepRule.operation)) // Inheritance Fill > SubStepSuper - implicitStepClass.ESuperTypes.addAll(subStepSuperClass, mseSmallStepClass) + implicitStepClass.ESuperTypes.add(subStepSuperClass) + + // Adding inheritance to SmallStep class + val smallStepGenericSuperType = EcoreFactory.eINSTANCE.createEGenericType + smallStepGenericSuperType.EClassifier = mseSmallStepClass + val smallStepTypeBinding = EcoreFactory.eINSTANCE.createEGenericType + smallStepGenericSuperType.ETypeArguments.add(smallStepTypeBinding) + // And binds its type parameter to the generated traced object class + smallStepTypeBinding.EClassifier = traceMMExplorer.specificStateClass + implicitStepClass.EGenericSuperTypes.add(smallStepGenericSuperType) traceability.putImplicitStepClass(implicitStepClass, stepRule.containingClass) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend index 16661f185..da1d41079 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend @@ -34,17 +34,17 @@ class TraceMMStrings { public static val String ref_ValueToTrace = "parent" - public static val String ref_ValueToStates = "states" + public static val String ref_ValueToStates = "statesRef" public static val String ref_TraceToStates = "statesTrace" - public static val String ref_StateToStep_started = "startedSteps" + public static val String ref_StateToStep_started = "startedStepsRef" - public static val String ref_StateToStep_ended = "endedSteps" + public static val String ref_StateToStep_ended = "endedStepsRef" - public static val String ref_StepToState_starting = "startingState" + public static val String ref_StepToState_starting = "startingStateRef" - public static val String ref_StepToState_ending = "endingState" + public static val String ref_StepToState_ending = "endingStateRef" static def String class_createTraceClassName(EClass runtimeClass) { return "Traced" + runtimeClass.name } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend index cd4125694..a2a303508 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend @@ -79,6 +79,9 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { ecoreModelResource.contents.add(ecoreModel) ecoreModelResource.save + ecoreModelResource.unload + ecoreModelResource.load(null) + // Check that all required ecore models are available checkReferencedPackages(ecoreModelResource); From 9b7d80262d24a5046b222fed985c66a0ea9aaaca Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 30 Jan 2017 14:52:19 +0100 Subject: [PATCH 088/267] fixed style --- .../AbstractSequentialExecutionEngine.java | 61 +++++++++++-------- .../engine/core/EngineStoppedException.java | 4 +- .../core/GemocRunningEnginesRegistry.java | 10 +-- .../core/IEngineRegistrationListener.java | 14 +++++ 4 files changed, 57 insertions(+), 32 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index 06e059c78..5acff69fc 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -8,18 +8,20 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -/* ****************************************************************************** - * C opyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - * ******************************************************************************/ package org.gemoc.executionframework.engine.core; + +import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; +import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; +import fr.inria.diverse.trace.commons.model.trace.GenericMSE; +import fr.inria.diverse.trace.commons.model.trace.MSE; +import fr.inria.diverse.trace.commons.model.trace.MSEModel; +import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TraceFactory; +import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; + import java.io.IOException; import java.util.ArrayList; import java.util.Set; @@ -34,29 +36,26 @@ import org.gemoc.xdsmlframework.api.core.IExecutionContext; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; -import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; -import fr.inria.diverse.trace.commons.model.trace.GenericMSE; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.MSEModel; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TraceFactory; -import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; +/** + * Abstract class providing a basic implementation for sequential engines + * + * @author Didier Vojtisek + * + */ public abstract class AbstractSequentialExecutionEngine extends AbstractExecutionEngine implements IExecutionEngine { private MSEModel _actionModel; private IMultiDimensionalTraceAddon traceAddon; - abstract protected void executeEntryPoint(); + protected abstract void executeEntryPoint(); + - abstract protected void initializeModel(); + protected abstract void initializeModel(); - abstract protected void prepareEntryPoint(IExecutionContext executionContext); + protected abstract void prepareEntryPoint(IExecutionContext executionContext); - abstract protected void prepareInitializeModel(IExecutionContext executionContext); + protected abstract void prepareInitializeModel(IExecutionContext executionContext); @Override public final void performInitialize(IExecutionContext executionContext) { @@ -118,9 +117,9 @@ protected void doExecute() { protected final void beforeExecutionStep(Object caller, String className, String operationName, RecordingCommand rc) { if (caller != null && caller instanceof EObject && editingDomain != null) { // Call expected to be done from an EMF model, hence EObjects - EObject caller_cast = (EObject) caller; + EObject callerEObject = (EObject) caller; // We create a step - Step step = createStep(caller_cast, className, operationName); + Step step = createStep(callerEObject, className, operationName); manageEvents(); @@ -178,6 +177,16 @@ private EOperation findOperation(EObject object, String className, String method return operation; } + + + /** + * Find the MSE element for the triplet caller/className/MethodName in the model of precalculated possible MSE. + * If it doesn't exist yet, create one and add it to the model. + * @param caller the caller object + * @param className the class containing the method + * @param methodName the name of the method + * @return the retrieved or created MSE + */ public final MSE findOrCreateMSE(EObject caller, String className, String methodName) { EOperation operation = findOperation(caller, className, methodName); // TODO Should be created/loaded before execution by analyzing the diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java index 771856eef..7bdbcd0d7 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java @@ -14,7 +14,7 @@ /** * Exception thrown when the user stop the engine in plainK3 mode or if the engine is stopped normally * This allows to catch it and adapt the Engine response in this normal situation - * @author dvojtise + * @author Didier Vojtisek * */ public class EngineStoppedException extends RuntimeException { @@ -23,6 +23,8 @@ public class EngineStoppedException extends RuntimeException { */ private static final long serialVersionUID = -8485492707115640348L; + + public EngineStoppedException(String message) { super(message); } diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java index 7c9a0e1bb..67cffa219 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java @@ -26,12 +26,12 @@ public class GemocRunningEnginesRegistry { /** - * Add the given engine with this name, return the unique name really used for this engine - * @param baseName - * @param engine - * @return + * Add the given engine with this name + * @param baseName (not used !? should be removed from API) + * @param engine to add + * @return the unique name really used for this engine */ - synchronized public String registerEngine(String baseName, IExecutionEngine engine){ + public synchronized String registerEngine(String baseName, IExecutionEngine engine){ int uniqueInstance = 0; String engineName = Thread.currentThread().getName() + " ("+uniqueInstance+")"; synchronized(runningEngines) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java index 756033843..52ded04b5 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java @@ -12,10 +12,24 @@ import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +/** + * Listener interface used to be notified when engines are registered and unregistered from the Engine registry + * + * @author Didier Vojtisek + * + */ public interface IEngineRegistrationListener { + /** + * method called by the registry when an engine is registered + * @param engine the registered engine + */ void engineRegistered(IExecutionEngine engine); + /** + * method called by the registry when an engine is unregistered + * @param engine the unregistered engine + */ void engineUnregistered(IExecutionEngine engine); } From b4de0aee0b8c33a27da5283f03f762cd793e3e8c Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Tue, 31 Jan 2017 10:44:27 +0100 Subject: [PATCH 089/267] Make sure to run @Initialize as a Step even if not indicated in the xtend source --- .../javaengine/PlainK3ExecutionEngine.java | 54 +++++++++++++++---- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java index a21801f19..0d67c26b8 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java @@ -61,6 +61,12 @@ import fr.inria.diverse.trace.commons.model.trace.ModelURIParameter; import fr.inria.diverse.trace.commons.model.trace.TraceFactory; +/** + * Implementation of the GEMOC Execution engine dedicated to run Kermeta 3 operational semantic + * + * @author Didier Vojtisek + * + */ public class PlainK3ExecutionEngine extends AbstractCommandBasedSequentialExecutionEngine implements IStepManager { private Method initializeMethod; @@ -94,8 +100,8 @@ protected void prepareEntryPoint(IExecutionContext executionContext) { /* * Find the entry point in the workspace */ - final String PREFIX = "public static void "; - int startName = PREFIX.length(); + final String prefix = "public static void "; + int startName = prefix.length(); int endName = entryPoint.lastIndexOf("("); String methodFullName = entryPoint.substring(startName, endName); @@ -191,18 +197,18 @@ protected void prepareInitializeModel(IExecutionContext executionContext) { "Could not find method " + modelInitializationMethodName + " with correct parameters."); } } - final boolean final_isListArgs = isListArgs; - final boolean final_isEListArgs = isEListArgs; + final boolean finalIsListArgs = isListArgs; + final boolean finalIsEListArgs = isEListArgs; this.initializeMethodParameters = new ArrayList<>(); initializeMethodParameters.add(entryPointMethodParameters.get(0)); - if (final_isListArgs) { + if (finalIsListArgs) { final ArrayList modelInitializationListParameters = new ArrayList<>(); for (String s : executionContext.getRunConfiguration().getModelInitializationArguments() .split("\\r?\\n")) { modelInitializationListParameters.add(s); } initializeMethodParameters.add(modelInitializationListParameters); - } else if (final_isEListArgs) { + } else if (finalIsEListArgs) { final EList modelInitializationListParameters = new BasicEList<>(); for (String s : executionContext.getRunConfiguration().getModelInitializationArguments() .split("\\r?\\n")) { @@ -216,9 +222,10 @@ protected void prepareInitializeModel(IExecutionContext executionContext) { } } - @Override - protected void initializeModel() { - StepManagerRegistry.getInstance().registerManager(PlainK3ExecutionEngine.this); + /** + * Invoke the initialize method + */ + private void callInitializeModel() { try { initializeMethod.invoke(null, initializeMethodParameters.toArray()); } catch (EngineStoppedException stopExeception) { @@ -233,6 +240,26 @@ protected void initializeModel() { } } catch (Exception e) { throw new RuntimeException(e); + } + } + + @Override + protected void initializeModel() { + StepManagerRegistry.getInstance().registerManager(PlainK3ExecutionEngine.this); + try { + final boolean isStepMethod = initializeMethod.isAnnotationPresent(fr.inria.diverse.k3.al.annotationprocessor.Step.class); + if(!isStepMethod){ + fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepCommand command = new fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepCommand() { + @Override + public void execute() { + callInitializeModel(); + } + }; + fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IStepManager stepManager = PlainK3ExecutionEngine.this; + stepManager.executeStep(entryPointMethodParameters.get(0),command,entryPointClass.getName(),initializeMethod.getName()); + } else { + callInitializeModel(); + } } finally { StepManagerRegistry.getInstance().unregisterManager(PlainK3ExecutionEngine.this); } @@ -290,8 +317,8 @@ public void run() { */ public boolean canHandle(Object caller) { if (caller instanceof EObject) { - EObject caller_cast = (EObject) caller; - org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain = getEditingDomain(caller_cast); + EObject eObj = (EObject) caller; + org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain = getEditingDomain(eObj); return editingDomain == this.editingDomain; } @@ -396,6 +423,11 @@ private static InternalTransactionalEditingDomain getEditingDomain(ResourceSet r return null; } + /** + * Load the model for the given URI + * @param modelURI to load + * @return the loaded resource + */ public static Resource loadModel(URI modelURI) { Resource resource = null; ResourceSet resourceSet; From 0d87a9ab1f1aa771d34cf489217c4107dba57d27 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Tue, 31 Jan 2017 10:44:55 +0100 Subject: [PATCH 090/267] relaxing checkstyle rules --- .../codestyle/GemocCheckstyle6Configuration-Light.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml b/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml index 73ef979ac..acb48e1e5 100644 --- a/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml +++ b/dev/fr.obeo.dsl.dev/codestyle/GemocCheckstyle6Configuration-Light.xml @@ -5,7 +5,7 @@ This configuration file was written by the eclipse-cs plugin configuration editor --> @@ -17,6 +17,7 @@ + @@ -40,12 +41,15 @@ + + + @@ -73,6 +77,7 @@ + @@ -97,9 +102,10 @@ - + + From 0f3c93e11d0b97c80bb49bf32815706ec3e2d09e Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Tue, 31 Jan 2017 11:37:46 +0100 Subject: [PATCH 091/267] added a tooltip to indicate the argument separatator in launch config --- .../tabs/LaunchConfigurationMainTab.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index 9798749af..459fa03bb 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -52,7 +52,6 @@ import org.gemoc.execution.sequential.javaengine.ui.launcher.LauncherMessages; import org.gemoc.executionframework.engine.commons.MelangeHelper; import org.gemoc.executionframework.engine.ui.commons.RunConfiguration; -import org.gemoc.executionframework.engine.ui.launcher.AbstractSequentialGemocLauncher; import org.gemoc.executionframework.ui.utils.ENamedElementQualifiedNameLabelProvider; import org.gemoc.xdsmlframework.ui.utils.dialogs.SelectAIRDIFileDialog; import org.gemoc.xdsmlframework.ui.utils.dialogs.SelectAnyEObjectDialog; @@ -62,6 +61,11 @@ import fr.obeo.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate; import fr.obeo.dsl.debug.ide.sirius.ui.launch.AbstractDSLLaunchConfigurationDelegateUI; +/** + * Sequential engine launch configuration main tab + * + * @author Didier Vojtisek + */ public class LaunchConfigurationMainTab extends LaunchConfigurationTab { protected Composite _parent; @@ -84,7 +88,10 @@ public class LaunchConfigurationMainTab extends LaunchConfigurationTab { protected Text modelofexecutionglml_LocationText; - public int GRID_DEFAULT_WIDTH = 200; + /** + * default width for the grids + */ + public int gridDefaultWidth = 200; protected IProject _modelProject; @@ -203,11 +210,11 @@ public void modifyText(ModifyEvent arg0) { // ----------------------------------- /*** - * Create the Field where user enters model to execute + * Create the Fields where user enters model to execute * - * @param parent - * @param font - * @return + * @param parent container composite + * @param font used font + * @return the created composite containing the fields */ public Composite createModelLayout(Composite parent, Font font) { createTextLabelLayout(parent, "Model to execute"); @@ -241,6 +248,7 @@ public void widgetSelected(SelectionEvent evt) { createTextLabelLayout(parent, ""); createTextLabelLayout(parent, "Model initialization arguments"); _modelInitializationArgumentsText = new Text(parent, SWT.MULTI | SWT.BORDER | SWT.WRAP | SWT.V_SCROLL); + _modelInitializationArgumentsText.setToolTipText("one argument per line"); GridData gridData = new GridData(GridData.FILL_BOTH); gridData.heightHint = 40; _modelInitializationArgumentsText.setLayoutData(gridData); @@ -321,9 +329,9 @@ private GridData createStandardLayout() { /*** * Create the Field where user enters the language used to execute * - * @param parent - * @param font - * @return + * @param parent container composite + * @param font used font + * @return the created composite containing the fields */ public Composite createLanguageLayout(Composite parent, Font font) { // Language @@ -464,8 +472,8 @@ protected String computeMelangeQuery(){ protected String getModelInitializationMethodName(){ String entryPointClassName = null; - final String PREFIX = "public static void "; - int startName = PREFIX.length(); + final String prefix = "public static void "; + int startName = prefix.length(); int endName = _entryPointMethodText.getText().lastIndexOf("("); if(endName == -1) return ""; String entryMethod = _entryPointMethodText.getText().substring(startName, endName); From 73620fe5bb67159d47647cf74e6a5619bfd10aa5 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Wed, 1 Feb 2017 10:06:58 +0100 Subject: [PATCH 092/267] do not crash when a language does not define an @InitializeModel method --- .../javaengine/PlainK3ExecutionEngine.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java index 0d67c26b8..f94879129 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java @@ -245,23 +245,25 @@ private void callInitializeModel() { @Override protected void initializeModel() { - StepManagerRegistry.getInstance().registerManager(PlainK3ExecutionEngine.this); - try { - final boolean isStepMethod = initializeMethod.isAnnotationPresent(fr.inria.diverse.k3.al.annotationprocessor.Step.class); - if(!isStepMethod){ - fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepCommand command = new fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepCommand() { - @Override - public void execute() { - callInitializeModel(); - } - }; - fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IStepManager stepManager = PlainK3ExecutionEngine.this; - stepManager.executeStep(entryPointMethodParameters.get(0),command,entryPointClass.getName(),initializeMethod.getName()); - } else { - callInitializeModel(); + if(initializeMethod != null){ + StepManagerRegistry.getInstance().registerManager(PlainK3ExecutionEngine.this); + try { + final boolean isStepMethod = initializeMethod.isAnnotationPresent(fr.inria.diverse.k3.al.annotationprocessor.Step.class); + if(!isStepMethod){ + fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepCommand command = new fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepCommand() { + @Override + public void execute() { + callInitializeModel(); + } + }; + fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IStepManager stepManager = PlainK3ExecutionEngine.this; + stepManager.executeStep(entryPointMethodParameters.get(0),command,entryPointClass.getName(),initializeMethod.getName()); + } else { + callInitializeModel(); + } + } finally { + StepManagerRegistry.getInstance().unregisterManager(PlainK3ExecutionEngine.this); } - } finally { - StepManagerRegistry.getInstance().unregisterManager(PlainK3ExecutionEngine.this); } } From 060cce666cfb7374a940346cf3c7c4397c2ef17a Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Wed, 1 Feb 2017 10:07:13 +0100 Subject: [PATCH 093/267] Improved documentation --- .../engine/core/AbstractExecutionEngine.java | 19 +++++++ .../AbstractSequentialExecutionEngine.java | 33 +++++++---- .../api/core/IExecutionEngine.java | 55 ++++++++++++++++--- 3 files changed, 86 insertions(+), 21 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java index 3a643ddcf..6fdb1ced4 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java @@ -34,6 +34,20 @@ import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.inria.diverse.trace.commons.model.trace.Step; + + +/** + * Common implementation of {@link IExecutionEngine}. + * It provides the following services: + *
    + *
  • a basic implementation of the notification for the engine addons ({@link IEngineAddon}).
    • + *
  • registration into the engine registry.
    • + *
  • basic step service (with transaction)
    • + *
+ * This class is intended to be subclassed. + * @author Didier Vojtisek + * + */ public abstract class AbstractExecutionEngine implements IExecutionEngine, IDisposable { private RunStatus _runningStatus = RunStatus.Initializing; @@ -385,6 +399,11 @@ private EMFCommandTransaction createTransaction(InternalTransactionalEditingDoma return new EMFCommandTransaction(command, editingDomain, null); } + + /* (non-Javadoc) + * @see org.gemoc.xdsmlframework.api.core.IExecutionEngine#getCurrentMSEOccurrence() + */ + @Override public final MSEOccurrence getCurrentMSEOccurrence() { if (currentSteps.size() > 0) return currentSteps.getFirst().getMseoccurrence(); diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index 5acff69fc..73a9140de 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -11,17 +11,6 @@ package org.gemoc.executionframework.engine.core; -import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; -import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; -import fr.inria.diverse.trace.commons.model.trace.GenericMSE; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.MSEModel; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TraceFactory; -import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; - import java.io.IOException; import java.util.ArrayList; import java.util.Set; @@ -36,6 +25,17 @@ import org.gemoc.xdsmlframework.api.core.IExecutionContext; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; +import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; +import fr.inria.diverse.trace.commons.model.trace.GenericMSE; +import fr.inria.diverse.trace.commons.model.trace.MSE; +import fr.inria.diverse.trace.commons.model.trace.MSEModel; +import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TraceFactory; +import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; + /** * Abstract class providing a basic implementation for sequential engines @@ -50,11 +50,20 @@ public abstract class AbstractSequentialExecutionEngine extends AbstractExecutio protected abstract void executeEntryPoint(); - + /** + * if it exists, calls the method tagged as @Initialize + */ protected abstract void initializeModel(); + /** + * search for an applicable entry point for the simulation, this is typically a method having the @Main annotation + * @param executionContext the execution context of the simulation + */ protected abstract void prepareEntryPoint(IExecutionContext executionContext); + /** + * search for an applicable method tagged as @Initialize + */ protected abstract void prepareInitializeModel(IExecutionContext executionContext); @Override diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java index 38b8c6d64..e670693e7 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java @@ -26,13 +26,21 @@ * given model, and to run the engine in different ways. It also allows the * caller to influence the constraints of the MoC at runtime. * - * @author didier.vojtisek@inria.fr + * @author Didier Vojtisek * */ public interface IExecutionEngine extends IDisposable { + /** + * In case of nested calls, indicate the current stack of model specific event occurrences. + * @return the current stack of {@link MSEOccurrence} + */ Deque getCurrentStack(); + /** + * Provides the model specific event occurrence of the current step + * @return the current MSEOccurrence + */ MSEOccurrence getCurrentMSEOccurrence(); /** @@ -45,46 +53,75 @@ public interface IExecutionEngine extends IDisposable { */ void stop(); + /** + * indicates the engine status {@link EngineStatus} + * @return the engine status + */ EngineStatus getEngineStatus(); + /** + * set the engine status {@link EngineStatus} + * @param status the new status + */ void setEngineStatus(RunStatus status); /** - * - * @param type + * Indicates if an {@link IEngineAddon} of the given type is linked to the engine + * @param type of the searched addon * @return true if the engine has the addon, false otherwise. */ boolean hasAddon(Class type); /** - * - * @param type - * @return The capability of the given type if it exists. + * get the first {@link IEngineAddon} of the required type associated to this engine. + * @param type searched type + * @return The {@link IEngineAddon} of the given type if it exists. */ T getAddon(Class type); + /** + * get the execution context + * @return the {@link IExecutionContext} + */ IExecutionContext getExecutionContext(); + /** + * get the run status + * @return the {@link RunStatus} + */ RunStatus getRunningStatus(); + /** + * get all the {@link IEngineAddon} of the required type associated to this engine. + * @param type searched type + * @return a set of {@link IEngineAddon} of the given type. + */ Set getAddonsTypedBy(Class type); + /** + * Ask the engine to initialize + * @param executionContext the {@link IExecutionContext} + */ void initialize(IExecutionContext executionContext); + /** + * Create a {@link LaunchConfiguration} for the Trace based on the engine RunConfiguration. + * @return a {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration} + */ default LaunchConfiguration extractLaunchConfiguration() { return null; } /** - * + * get the engine kind name * @return a user display name for the engine kind (will be used to compute * the full name of the engine instance) */ String engineKindName(); /** - * - * @return a displayable name to identify this engine + * get the engine name + * @return a display name to identify this engine */ String getName(); } From bf3bffc69bc965a8c9b22c0ec2fbec27c8a663f0 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Thu, 2 Feb 2017 15:20:59 +0100 Subject: [PATCH 094/267] presentation improvement of GEMOC creation wizards. * use category org.gemoc.gemoc_language_workbench.ui for all GEMOC creation wizards (newWizard). * added descriptions in the newWizard(s). --- .../plugin.xml | 9 ++++++++- .../plugin.xml | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/plugin.xml b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/plugin.xml index 5a17a91b5..3999337df 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/plugin.xml +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/plugin.xml @@ -10,6 +10,9 @@ icon="icons/IconeGemocLanguage-16.png" id="org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard" name="Create GEMOC debug representation"> + + Create a GEMOC debug/animation representation for a GEMOC language. May create a new project, modify or extend an existing Viewpoint Specification. + + name="Create Viewpoint Specification Project for GEMOC" + project="true"> + + Create a Viewpoint Specification Project for a GEMOC language + + + Create a new xDSML project to specify an executable language that will run using the GEMOC java sequential engine. + Date: Thu, 2 Feb 2017 17:17:53 +0100 Subject: [PATCH 095/267] grouping newWizards in 2 categories: language and language fragment --- .../plugin.xml | 18 +++--------------- .../plugin.xml | 11 ++++++++--- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/plugin.xml b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/plugin.xml index 3999337df..ea8919166 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/plugin.xml +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/plugin.xml @@ -4,26 +4,14 @@ + name="Debug/Animation Viewpoint Specification"> - Create a GEMOC debug/animation representation for a GEMOC language. May create a new project, modify or extend an existing Viewpoint Specification. - - - - - Create a Viewpoint Specification Project for a GEMOC language + Create a debug/animation representation for a GEMOC language. May create a new project, or modify or extend an existing Viewpoint Specification. diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml index 66af87ef2..d2a28d030 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml @@ -257,11 +257,16 @@ + id="org.gemoc.xdsmlframework.category" + name="GEMOC Language"> + + Date: Thu, 2 Feb 2017 18:12:41 +0100 Subject: [PATCH 096/267] fixes crash of "new debug representation" when called from file menu improved user message --- .../NewGemocDebugRepresentationWizard.java | 4 +- .../DebugRepresentationSelectionPage.java | 119 ++++++++---------- 2 files changed, 55 insertions(+), 68 deletions(-) diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java index 55681678a..ebdb0ff31 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java @@ -63,8 +63,8 @@ public class NewGemocDebugRepresentationWizard extends Wizard implements IWorkbenchWizard { - private String initialProjectName; - private String initialLanguageName; + private String initialLanguageName = "myLanguage"; + private String initialProjectName = initialLanguageName; private class FinishRunnable implements IRunnableWithProgress { diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java index 9c2755eec..b50023f3a 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java @@ -38,18 +38,20 @@ public class DebugRepresentationSelectionPage extends WizardPage { private final NewGemocDebugRepresentationWizard newGemocDebugRepresentationWizard; + /** array id for viewpoint definition */ public static final int CREATE_VIEWPOINT_DEFINITION = 0; + /** array id for viewpoint extension */ public static final int CREATE_VIEWPOINT_EXTENSION = 1; + /** array id for new_layer */ public static final int ADD_DEBUG_LAYER = 2; private final Button[] radio = new Button[3]; private int selected = -1; - public DebugRepresentationSelectionPage( - NewGemocDebugRepresentationWizard newGemocDebugRepresentationWizard) { + public DebugRepresentationSelectionPage(NewGemocDebugRepresentationWizard newGemocDebugRepresentationWizard) { super("Select debug representation mode"); this.newGemocDebugRepresentationWizard = newGemocDebugRepresentationWizard; } @@ -62,75 +64,65 @@ public void createControl(Composite parent) { composite.setLayout(layout); radio[CREATE_VIEWPOINT_DEFINITION] = new Button(composite, SWT.RADIO); + radio[CREATE_VIEWPOINT_DEFINITION].setText("Create a debug diagram description."); radio[CREATE_VIEWPOINT_DEFINITION] - .setText("Create a debug diagram description."); - radio[CREATE_VIEWPOINT_DEFINITION].setLayoutData(new GridData( - GridData.FILL_HORIZONTAL)); - radio[CREATE_VIEWPOINT_DEFINITION].addListener(SWT.Selection, - new Listener() { - @Override - public void handleEvent(Event event) { - selected = CREATE_VIEWPOINT_DEFINITION; - setPageComplete(true); - } - }); + .setToolTipText("creates a dedicated Viewpoint Specification in a new project"); + radio[CREATE_VIEWPOINT_DEFINITION].setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + radio[CREATE_VIEWPOINT_DEFINITION].addListener(SWT.Selection, new Listener() { + @Override + public void handleEvent(Event event) { + selected = CREATE_VIEWPOINT_DEFINITION; + setPageComplete(true); + } + }); radio[CREATE_VIEWPOINT_EXTENSION] = new Button(composite, SWT.RADIO); - radio[CREATE_VIEWPOINT_EXTENSION] - .setText("Extends an existing diagram description."); - radio[CREATE_VIEWPOINT_EXTENSION].setLayoutData(new GridData( - GridData.FILL_HORIZONTAL)); - radio[CREATE_VIEWPOINT_EXTENSION].addListener(SWT.Selection, - new Listener() { - @Override - public void handleEvent(Event event) { - selected = CREATE_VIEWPOINT_EXTENSION; - final List descriptions = new ArrayList(); - for (Viewpoint viewpoint : ViewpointRegistry - .getInstance().getViewpoints()) { - for (RepresentationDescription description : viewpoint - .getOwnedRepresentations()) { - if (description instanceof DiagramDescription) { - descriptions - .add((DiagramDescription) description); - } - } - // TODO extensions ? - // for (RepresentationDescription description : - // viewpoint.getOwnedRepresentationExtensions()) - // { - // if (description instanceof - // DiagramDescription) { - // descriptions.add((DiagramDescription) - // description); - // } - // } + radio[CREATE_VIEWPOINT_EXTENSION].setText("Extends an existing diagram description."); + radio[CREATE_VIEWPOINT_EXTENSION].setToolTipText( + "creates a dedicated Viewpoint Specification in a new project as an extension of an existing Viewpoint Specification."); + radio[CREATE_VIEWPOINT_EXTENSION].setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + radio[CREATE_VIEWPOINT_EXTENSION].addListener(SWT.Selection, new Listener() { + @Override + public void handleEvent(Event event) { + selected = CREATE_VIEWPOINT_EXTENSION; + final List descriptions = new ArrayList(); + for (Viewpoint viewpoint : ViewpointRegistry.getInstance().getViewpoints()) { + for (RepresentationDescription description : viewpoint.getOwnedRepresentations()) { + if (description instanceof DiagramDescription) { + descriptions.add((DiagramDescription) description); } - newGemocDebugRepresentationWizard - .getSelectDiagramDefinitionPage() - .setDescriptions(descriptions); - setPageComplete(true); } - }); + // TODO extensions ? + // for (RepresentationDescription description : + // viewpoint.getOwnedRepresentationExtensions()) + // { + // if (description instanceof + // DiagramDescription) { + // descriptions.add((DiagramDescription) + // description); + // } + // } + } + newGemocDebugRepresentationWizard.getSelectDiagramDefinitionPage().setDescriptions(descriptions); + setPageComplete(true); + } + }); radio[ADD_DEBUG_LAYER] = new Button(composite, SWT.RADIO); radio[ADD_DEBUG_LAYER].setText("Add a debug layer to an existing diagram description."); - radio[ADD_DEBUG_LAYER].setLayoutData(new GridData( - GridData.FILL_HORIZONTAL)); + radio[ADD_DEBUG_LAYER].setToolTipText("modifies an existing Viewpoint Specification to add a layer."); + + radio[ADD_DEBUG_LAYER].setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); radio[ADD_DEBUG_LAYER].addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { selected = ADD_DEBUG_LAYER; final List descriptions = new ArrayList(); - for (Viewpoint viewpoint : ViewpointRegistry.getInstance() - .getViewpoints()) { - if (!ViewpointRegistry.getInstance() - .isFromPlugin(viewpoint)) { - for (RepresentationDescription description : viewpoint - .getOwnedRepresentations()) { + for (Viewpoint viewpoint : ViewpointRegistry.getInstance().getViewpoints()) { + if (!ViewpointRegistry.getInstance().isFromPlugin(viewpoint)) { + for (RepresentationDescription description : viewpoint.getOwnedRepresentations()) { if (description instanceof DiagramDescription) { - descriptions - .add((DiagramDescription) description); + descriptions.add((DiagramDescription) description); } } // TODO extensions ? @@ -143,9 +135,7 @@ public void handleEvent(Event event) { // } } } - newGemocDebugRepresentationWizard - .getSelectDiagramDefinitionPage().setDescriptions( - descriptions); + newGemocDebugRepresentationWizard.getSelectDiagramDefinitionPage().setDescriptions(descriptions); setPageComplete(true); } }); @@ -163,12 +153,9 @@ public IWizardPage getNextPage() { final IWizardPage res; if (selected == CREATE_VIEWPOINT_DEFINITION) { - res = newGemocDebugRepresentationWizard - .getNewViewPointProjectPage(); - } else if (selected == CREATE_VIEWPOINT_EXTENSION - || selected == ADD_DEBUG_LAYER) { - res = newGemocDebugRepresentationWizard - .getSelectDiagramDefinitionPage(); + res = newGemocDebugRepresentationWizard.getNewViewPointProjectPage(); + } else if (selected == CREATE_VIEWPOINT_EXTENSION || selected == ADD_DEBUG_LAYER) { + res = newGemocDebugRepresentationWizard.getSelectDiagramDefinitionPage(); } else { res = null; } From f9a5b79eb679dc1f98be44facd1129c97ffdf225 Mon Sep 17 00:00:00 2001 From: d-leroy Date: Fri, 3 Feb 2017 14:02:46 +0100 Subject: [PATCH 097/267] Reworked metamodel and continued the tooling implementation --- .../AbstractSequentialExecutionEngine.java | 18 +- .../api/engine_addon/DefaultEngineAddon.java | 6 +- .../api/engine_addon/IEngineAddon.java | 6 +- .../BatchModelChangeListener.xtend | 10 + .../modelchangelistener/ModelChange.xtend | 10 + .../.project | 6 - .../debug/GenericSequentialModelDebugger.java | 11 +- ...scientGenericSequentialModelDebugger.xtend | 20 +- .../model/GenericTrace.aird | 315 +++---- .../model/GenericTrace.ecore | 39 +- .../model/trace/AddonExtensionParameter.java | 10 - .../model/trace/AnimatorURIParameter.java | 10 - .../trace/commons/model/trace/BigStep.java | 10 - .../model/trace/EntryPointParameter.java | 10 - .../trace/commons/model/trace/GenericMSE.java | 10 - .../model/trace/GenericParallelStep.java | 10 - .../model/trace/GenericReferenceValue.java | 1 - .../model/trace/GenericSequentialStep.java | 10 - .../commons/model/trace/GenericSmallStep.java | 10 - .../commons/model/trace/GenericState.java | 7 +- .../commons/model/trace/GenericStep.java | 2 +- .../commons/model/trace/GenericTrace.java | 1 + .../model/trace/GenericTracedObject.java | 1 - .../commons/model/trace/GenericValue.java | 7 +- .../InitializationArgumentsParameter.java | 10 - .../trace/InitializationMethodParameter.java | 10 - .../model/trace/LanguageNameParameter.java | 10 - .../model/trace/LaunchConfiguration.java | 10 - .../trace/LaunchConfigurationParameter.java | 12 +- .../trace/commons/model/trace/MSE.java | 10 - .../trace/commons/model/trace/MSEModel.java | 10 - .../commons/model/trace/MSEOccurrence.java | 10 - .../model/trace/ModelRootParameter.java | 10 - .../model/trace/ModelURIParameter.java | 10 - .../commons/model/trace/ParallelStep.java | 12 +- .../commons/model/trace/SequentialStep.java | 12 +- .../trace/commons/model/trace/SmallStep.java | 10 - .../trace/commons/model/trace/State.java | 9 +- .../trace/commons/model/trace/Step.java | 18 +- .../trace/commons/model/trace/Trace.java | 14 +- .../commons/model/trace/TraceFactory.java | 28 - .../commons/model/trace/TracePackage.java | 48 +- .../commons/model/trace/TracedObject.java | 11 +- .../trace/commons/model/trace/Value.java | 2 +- .../impl/AddonExtensionParameterImpl.java | 10 - .../trace/impl/AnimatorURIParameterImpl.java | 10 - .../commons/model/trace/impl/BigStepImpl.java | 12 - .../model/trace/impl/DimensionImpl.java | 2 +- .../trace/impl/EntryPointParameterImpl.java | 10 - .../trace/impl/GenericDimensionImpl.java | 4 + .../model/trace/impl/GenericMSEImpl.java | 12 +- .../trace/impl/GenericParallelStepImpl.java | 13 +- .../trace/impl/GenericReferenceValueImpl.java | 1 + .../trace/impl/GenericSequentialStepImpl.java | 12 +- .../trace/impl/GenericSmallStepImpl.java | 13 +- .../model/trace/impl/GenericStateImpl.java | 38 + .../model/trace/impl/GenericStepImpl.java | 11 +- .../model/trace/impl/GenericTraceImpl.java | 15 +- .../trace/impl/GenericTracedObjectImpl.java | 19 - .../model/trace/impl/GenericValueImpl.java | 6 + .../InitializationArgumentsParameterImpl.java | 10 - .../InitializationMethodParameterImpl.java | 10 - .../trace/impl/LanguageNameParameterImpl.java | 10 - .../trace/impl/LaunchConfigurationImpl.java | 10 - .../LaunchConfigurationParameterImpl.java | 12 +- .../commons/model/trace/impl/MSEImpl.java | 10 - .../model/trace/impl/MSEModelImpl.java | 10 - .../model/trace/impl/MSEOccurrenceImpl.java | 10 - .../trace/impl/ModelRootParameterImpl.java | 10 - .../trace/impl/ModelURIParameterImpl.java | 10 - .../model/trace/impl/ParallelStepImpl.java | 12 +- .../model/trace/impl/SequentialStepImpl.java | 12 +- .../model/trace/impl/SmallStepImpl.java | 11 - .../commons/model/trace/impl/StateImpl.java | 82 +- .../commons/model/trace/impl/StepImpl.java | 150 +++- .../model/trace/impl/TraceFactoryImpl.java | 32 - .../commons/model/trace/impl/TraceImpl.java | 49 +- .../model/trace/impl/TracePackageImpl.java | 40 +- .../model/trace/impl/TracedObjectImpl.java | 47 +- .../commons/model/trace/impl/ValueImpl.java | 4 + .../model/trace/util/TraceAdapterFactory.java | 10 - .../commons/model/trace/util/TraceSwitch.java | 10 - .../trace/gemoc/api/IStateManager.java | 23 +- .../trace/gemoc/api/ITraceExtractor.java | 46 +- .../GenericEngineTraceAddonGenerator.xtend | 103 +-- .../META-INF/MANIFEST.MF | 3 +- .../gemoc/traceaddon/AbstractTraceAddon.xtend | 9 +- .../traceaddon/GenericTraceEngineAddon.java | 6 - .../traceaddon/GenericTraceExplorer.java | 52 +- .../traceaddon/GenericTraceExtractor.java | 456 +++++++++- .../traceaddon/GenericTraceNotifier.java | 90 ++ .../traceaddon/GenericTraceStepFactory.java | 2 +- .../model/base.aird | 805 +++++++++++------- .../model/base.ecore | 56 +- .../src/base/BasePackage.java | 30 +- .../src/base/SpecificTrace.java | 10 + .../src/base/States/SpecificState.java | 70 ++ .../src/base/States/SpecificTracedObject.java | 9 + .../src/base/States/SpecificValue.java | 10 + .../src/base/States/StatesPackage.java | 219 ++++- .../base/States/impl/SpecificStateImpl.java | 202 +++++ .../States/impl/SpecificTracedObjectImpl.java | 19 - .../base/States/impl/SpecificValueImpl.java | 29 + .../base/States/impl/StatesPackageImpl.java | 88 ++ .../src/base/Steps/SpecificRootStep.java | 20 + .../src/base/Steps/SpecificStep.java | 100 ++- .../src/base/Steps/StepsFactory.java | 9 + .../src/base/Steps/StepsPackage.java | 316 ++++++- .../base/Steps/impl/SpecificRootStepImpl.java | 415 +++++++++ .../src/base/Steps/impl/SpecificStepImpl.java | 383 +++++++++ .../src/base/Steps/impl/StepsFactoryImpl.java | 11 + .../src/base/Steps/impl/StepsPackageImpl.java | 103 ++- .../base/Steps/util/StepsAdapterFactory.java | 56 ++ .../src/base/Steps/util/StepsSwitch.java | 57 ++ .../src/base/impl/BasePackageImpl.java | 23 + .../src/base/impl/SpecificTraceImpl.java | 15 - .../metamodel/generator/TraceMMExplorer.xtend | 8 +- .../generator/TraceMMGenerator.xtend | 33 - .../generator/TraceMMGeneratorStates.xtend | 65 +- .../metamodel/generator/TraceMMStrings.xtend | 2 + .../K3ExecutionExtensionGenerator.xtend | 10 + .../K3StepExtractor.xtend | 10 + .../GenericTracePluginGenerator.xtend | 52 +- .../codegen/StateManagerGeneratorJava.xtend | 247 ++++++ .../TraceConstructorGeneratorJava.xtend | 18 +- .../codegen/TraceExplorerGeneratorJava.xtend | 2 +- .../MultidimensionalTimelineRenderer.java | 173 ++-- .../MultidimensionalTimelineViewPart.java | 25 +- .../stategraph/logic/StateGraph.java | 4 +- 129 files changed, 4416 insertions(+), 1633 deletions(-) create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index c129b3486..9a9fce762 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -36,11 +36,12 @@ import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; +import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.GenericMSE; +import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; import fr.inria.diverse.trace.commons.model.trace.MSE; import fr.inria.diverse.trace.commons.model.trace.MSEModel; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TraceFactory; import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; @@ -48,7 +49,7 @@ public abstract class AbstractSequentialExecutionEngine extends AbstractExecutionEngine implements IExecutionEngine { private MSEModel _actionModel; - private IMultiDimensionalTraceAddon traceAddon; + private IMultiDimensionalTraceAddon traceAddon; abstract protected void executeEntryPoint(); @@ -60,6 +61,7 @@ public abstract class AbstractSequentialExecutionEngine extends AbstractExecutio @Override public final void performInitialize(IExecutionContext executionContext) { + @SuppressWarnings("rawtypes") Set traceManagers = this.getAddonsTypedBy(IMultiDimensionalTraceAddon.class); if (!traceManagers.isEmpty()) this.traceAddon = traceManagers.iterator().next(); @@ -79,7 +81,7 @@ private void manageEvents() { MSEOccurrence mse = getCurrentMSEOccurrence(); if (mse != null) { EObject container = mse.eContainer(); - if (container instanceof SequentialStep) { + if (container instanceof BigStep) { IEventManager eventManager = EventManagerRegistry.getInstance().findEventManager(); if (eventManager != null) { eventManager.manageEvents(); @@ -118,9 +120,9 @@ protected void doExecute() { protected final void beforeExecutionStep(Object caller, String className, String operationName, RecordingCommand rc) { if (caller != null && caller instanceof EObject && editingDomain != null) { // Call expected to be done from an EMF model, hence EObjects - EObject caller_cast = (EObject) caller; + EObject callerCast = (EObject) caller; // We create a step - Step step = createStep(caller_cast, className, operationName); + Step step = createStep(callerCast, className, operationName); manageEvents(); @@ -128,11 +130,11 @@ protected final void beforeExecutionStep(Object caller, String className, String } } - private Step createStep(EObject caller, String className, String methodName) { + private Step createStep(EObject caller, String className, String methodName) { MSE mse = findOrCreateMSE(caller, className, methodName); - Step result; + Step result; if (traceAddon == null) { - SequentialStep step = TraceFactory.eINSTANCE.createGenericSequentialStep(); + GenericSequentialStep step = TraceFactory.eINSTANCE.createGenericSequentialStep(); MSEOccurrence occurrence = null; occurrence = TraceFactory.eINSTANCE.createMSEOccurrence(); step.setMseoccurrence(occurrence); diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java index 29aba0913..dae01ed66 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java @@ -34,7 +34,7 @@ public void aboutToSelectStep(IExecutionEngine engine, Collection steps) { } @Override - public void stepSelected(IExecutionEngine engine, Step selectedStep) { + public void stepSelected(IExecutionEngine engine, Step selectedStep) { } @Override @@ -42,7 +42,7 @@ public void engineStopped(IExecutionEngine engine) { } @Override - public void aboutToExecuteStep(IExecutionEngine executionEngine, Step stepToApply) { + public void aboutToExecuteStep(IExecutionEngine executionEngine, Step stepToApply) { } @Override @@ -54,7 +54,7 @@ public void engineAboutToStop(IExecutionEngine engine) { } @Override - public void stepExecuted(IExecutionEngine engine, Step stepExecuted) { + public void stepExecuted(IExecutionEngine engine, Step stepExecuted) { } @Override diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java index 0a3d45bcd..9733e8ef3 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java @@ -59,11 +59,11 @@ default public void engineInitialized(IExecutionEngine executionEngine) { * Operation called after the Step has been chosen It also returns the * chosen Step */ - public void stepSelected(IExecutionEngine engine, Step selectedStep); + public void stepSelected(IExecutionEngine engine, Step selectedStep); - public void aboutToExecuteStep(IExecutionEngine engine, Step stepToExecute); + public void aboutToExecuteStep(IExecutionEngine engine, Step stepToExecute); - public void stepExecuted(IExecutionEngine engine, Step stepExecuted); + public void stepExecuted(IExecutionEngine engine, Step stepExecuted); public void engineStatusChanged(IExecutionEngine engine, RunStatus newStatus); diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend index 2776c90b7..3f4aee2ae 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; import java.util.ArrayList diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend index cd3509dc1..0d410daf7 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener import org.eclipse.emf.ecore.EObject diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.project b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.project index 85b3cf361..c69f228ab 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.project +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.project @@ -25,16 +25,10 @@ - - net.sf.eclipsecs.core.CheckstyleBuilder - - - org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature - net.sf.eclipsecs.core.CheckstyleNature diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java index 6ac2ee429..52f65ae1c 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java @@ -206,10 +206,9 @@ public void updateData(String threadName, EObject instruction) { return; } - // We don't want to deal with logical steps since we are in sequential - // mode - if (instruction instanceof Step) { - instruction = ((Step) instruction).getMseoccurrence().getMse().getCaller(); + // We don't want to deal with logical steps since we are in sequential mode + if (instruction instanceof Step) { + instruction = ((Step) instruction).getMseoccurrence().getMse().getCaller(); } else if (instruction instanceof MSEOccurrence) { instruction = ((MSEOccurrence) instruction).getMse().getCaller(); } @@ -293,7 +292,7 @@ public void engineStopped(IExecutionEngine engine) { } @Override - public void aboutToExecuteStep(IExecutionEngine executionEngine, Step step) { + public void aboutToExecuteStep(IExecutionEngine executionEngine, Step step) { MSEOccurrence mseOccurrence = step.getMseoccurrence(); if (mseOccurrence != null) { ToPushPop stackModification = new ToPushPop(mseOccurrence, true); @@ -305,7 +304,7 @@ public void aboutToExecuteStep(IExecutionEngine executionEngine, Step step) { } @Override - public void stepExecuted(IExecutionEngine engine, Step step) { + public void stepExecuted(IExecutionEngine engine, Step step) { MSEOccurrence mseOccurrence = step.getMseoccurrence(); if (mseOccurrence != null) { ToPushPop stackModification = new ToPushPop(mseOccurrence, false); diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend index 30b6fece8..383a50bc0 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend @@ -10,11 +10,16 @@ *******************************************************************************/ package org.gemoc.execution.sequential.javaengine.ui.debug; +import fr.inria.diverse.trace.commons.model.trace.Dimension import fr.inria.diverse.trace.commons.model.trace.MSE import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence +import fr.inria.diverse.trace.commons.model.trace.State import fr.inria.diverse.trace.commons.model.trace.Step +import fr.inria.diverse.trace.commons.model.trace.TracedObject +import fr.inria.diverse.trace.commons.model.trace.Value import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon import fr.inria.diverse.trace.gemoc.api.ITraceExplorer +import fr.inria.diverse.trace.gemoc.api.ITraceViewListener import fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor import java.util.ArrayList import java.util.List @@ -27,11 +32,10 @@ import org.eclipse.xtext.naming.QualifiedName import org.gemoc.execution.sequential.javaengine.ui.Activator import org.gemoc.executionframework.engine.core.EngineStoppedException import org.gemoc.xdsmlframework.api.core.IExecutionEngine -import fr.inria.diverse.trace.gemoc.api.ITraceViewListener public class OmniscientGenericSequentialModelDebugger extends GenericSequentialModelDebugger implements ITraceViewListener { - private var ITraceExplorer traceExplorer + private var ITraceExplorer, State, TracedObject, Dimension, Value> traceExplorer private var steppingOverStackFrameIndex = -1 @@ -39,18 +43,18 @@ public class OmniscientGenericSequentialModelDebugger extends GenericSequentialM private val List callerStack = new ArrayList - private val List previousCallStack = new ArrayList + private val List> previousCallStack = new ArrayList new(IDSLDebugEventProcessor target, IExecutionEngine engine) { super(target, engine) } - def private MSE getMSEFromStep(Step step) { + def private MSE getMSEFromStep(Step step) { val mseOccurrence = step.mseoccurrence if (mseOccurrence == null) { val container = step.eContainer - if (container instanceof Step) { - val parentStep = container as Step + if (container instanceof Step) { + val parentStep = container as Step val parentMseOccurrence = parentStep.mseoccurrence if (parentMseOccurrence == null) { throw new IllegalStateException("A step without MSEOccurrence cannot be contained in a step without MSEOccurrence") @@ -65,7 +69,7 @@ public class OmniscientGenericSequentialModelDebugger extends GenericSequentialM } } - def private void pushStackFrame(String threadName, Step step) { + def private void pushStackFrame(String threadName, Step step) { var MSE mse = getMSEFromStep(step) var EObject caller = mse.caller val QualifiedName qname = nameprovider.getFullyQualifiedName(caller) @@ -82,7 +86,7 @@ public class OmniscientGenericSequentialModelDebugger extends GenericSequentialM callerStack.remove(0) } - override void aboutToExecuteStep(IExecutionEngine executionEngine, Step step) { + override void aboutToExecuteStep(IExecutionEngine executionEngine, Step step) { val mseOccurrence = step.mseoccurrence if (mseOccurrence != null) { if (!control(threadName, mseOccurrence)) { diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird index 1b5b50e02..6531a090f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird @@ -70,16 +70,26 @@ - + - - bold + - + + + + + bold + + + + bold + + + @@ -361,7 +371,7 @@ - + @@ -385,6 +395,10 @@ + + + + @@ -583,7 +597,7 @@ - + @@ -918,17 +932,17 @@ - + - + - + - + @@ -1062,17 +1076,17 @@ - + - + - + - + @@ -1110,17 +1124,17 @@ - + - + - + - + @@ -1174,17 +1188,17 @@ - + - + - + - + @@ -1556,70 +1570,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1644,7 +1594,7 @@ - + @@ -1660,7 +1610,7 @@ - + @@ -1684,6 +1634,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1828,10 +1810,10 @@ - + - + KEEP_LOCATION @@ -1845,7 +1827,7 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic @@ -1921,8 +1903,9 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - - + + italic + @@ -1948,8 +1931,9 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - - + + italic + @@ -2011,6 +1995,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -2109,12 +2096,12 @@ - + - + italic - + @@ -2122,12 +2109,12 @@ - + - + italic - + @@ -2167,13 +2154,13 @@ - + routingStyle - + italic - + @@ -2208,16 +2195,12 @@ - + - - - labelSize - - - labelSize - + + + @@ -2243,6 +2226,14 @@ + + + + + + + + @@ -2290,16 +2281,12 @@ - + - - - labelSize - - - labelSize - + + + @@ -2316,10 +2303,10 @@ - + - + KEEP_LOCATION @@ -3219,12 +3206,12 @@ - + - + italic - + @@ -3343,59 +3330,6 @@ - - - - - - labelSize - - - labelSize - - - - - - - - - - labelSize - - - labelSize - - - - - - - - - - labelSize - bold - - - labelSize - - - - - - - - - - labelSize - - - labelSize - - - - @@ -3444,6 +3378,31 @@ + + + + + + + + + + + + + + + + + + bold + + + bold + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index 2deb6eac2..2c6eb1092 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -9,27 +9,27 @@ - - - + + + - +
- +
- - + + @@ -41,11 +41,10 @@ + eOpposite="#//State/startedSteps"> - + @@ -80,7 +79,7 @@ - + @@ -97,7 +96,7 @@ - + @@ -156,7 +155,7 @@ + volatile="true" transient="true" derived="true" containment="true"> + + + + volatile="true" transient="true" derived="true" containment="true"> + +
+ @@ -212,11 +217,11 @@ + eOpposite="#//Step/startingState"> + eOpposite="#//Step/endingState"> - + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java index 4af6ddc40..560e7e910 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java index 2aa100873..1a2079167 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java index 462cb1a06..0b0d58364 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java index 2af31f6c7..b8cc38f5e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java index a2e639c18..4a9524377 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java index 832eaa7d2..216278174 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java index 35a9cc850..67b92458e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java @@ -4,7 +4,6 @@ import org.eclipse.emf.ecore.EObject; - /** * * A representation of the model object 'Generic Reference Value'. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java index 000a5dba7..b6274f6d4 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java index 54634be2c..cf2675dda 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java index 057a2eada..67db2ee90 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java @@ -4,7 +4,6 @@ import org.eclipse.emf.common.util.EList; - /** * * A representation of the model object 'Generic State'. @@ -24,7 +23,6 @@ * @generated */ public interface GenericState extends State { - /** * Returns the value of the 'Values Ref' reference list. * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericValue}. @@ -81,10 +79,6 @@ public interface GenericState extends State { /** * - *

- * If the meaning of the 'Values' reference list isn't clear, - * there really should be more of a description here... - *

* * @model kind="operation" * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getValuesRef();'" @@ -109,4 +103,5 @@ public interface GenericState extends State { * @generated */ EList getEndedSteps(); + } // GenericState diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java index a0dd1a2ff..247adb869 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java @@ -21,7 +21,6 @@ * @generated */ public interface GenericStep extends Step { - /** * Returns the value of the 'Starting State Ref' reference. * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef Started Steps Ref}'. @@ -93,4 +92,5 @@ public interface GenericStep extends Step { * @generated */ GenericState getEndingState(); + } // GenericStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java index 908bb5277..74cf4b1c5 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java @@ -2,6 +2,7 @@ */ package fr.inria.diverse.trace.commons.model.trace; + /** * * A representation of the model object 'Generic Trace'. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java index 54a1f40cb..e34a73038 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java @@ -4,7 +4,6 @@ import org.eclipse.emf.ecore.EObject; - /** * * A representation of the model object 'Generic Traced Object'. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java index 2384fa59f..2ecac7b02 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java @@ -4,7 +4,6 @@ import org.eclipse.emf.common.util.EList; - /** * * A representation of the model object 'Generic Value'. @@ -22,7 +21,6 @@ * @generated */ public interface GenericValue extends Value { - /** * Returns the value of the 'States Ref' reference list. * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericState}. @@ -43,14 +41,11 @@ public interface GenericValue extends Value { /** * - *

- * If the meaning of the 'States' reference list isn't clear, - * there really should be more of a description here... - *

* * @model kind="operation" required="true" * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getStatesRef();'" * @generated */ EList getStates(); + } // GenericValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java index 2043d1a98..ad087250e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java index 4715e6b04..e6cad0b9e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java index ae2a63e36..34c8086d0 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java index 634ef0a6b..948bef421 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java index 38fba67b0..850dd83cc 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; @@ -31,7 +21,6 @@ * @generated */ public interface LaunchConfigurationParameter extends EObject { - /** * Returns the value of the 'Value' attribute. * The default value is "". @@ -58,4 +47,5 @@ public interface LaunchConfigurationParameter extends EObject { * @generated */ void setValue(String value); + } // LaunchConfigurationParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java index 1fceb18a6..3cb6663af 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java index 751d68448..e8dce1532 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java index 3dd704ecf..4a1773fb2 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java index 1c78b4fbf..10b4d2ae1 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java index b013c925e..4e229ac6a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java index ef83df434..194ee2dcc 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; @@ -20,7 +10,7 @@ * * * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getParallelStep() - * @model + * @model abstract="true" * @generated */ public interface ParallelStep, StateSubType extends State> extends BigStep { diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java index 90f41902d..917b66595 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; @@ -20,7 +10,7 @@ * * * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getSequentialStep() - * @model + * @model abstract="true" * @generated */ public interface SequentialStep, StateSubType extends State> extends BigStep { diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java index b2631dcf4..4758d7752 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java index 8a0503c50..de9ed1afd 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java @@ -3,6 +3,7 @@ package fr.inria.diverse.trace.commons.model.trace; import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EObject; /** @@ -26,6 +27,7 @@ public interface State, ValueSubType extends Value> extends EObject { /** * Returns the value of the 'Started Steps' reference list. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}'. * *

* If the meaning of the 'Started Steps' reference list isn't clear, @@ -34,13 +36,15 @@ public interface State, ValueSubType extends Value * @return the value of the 'Started Steps' reference list. * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_StartedSteps() - * @model transient="true" volatile="true" derived="true" + * @see fr.inria.diverse.trace.commons.model.trace.Step#getStartingState + * @model opposite="startingState" * @generated */ EList getStartedSteps(); /** * Returns the value of the 'Ended Steps' reference list. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}'. * *

* If the meaning of the 'Ended Steps' reference list isn't clear, @@ -49,7 +53,8 @@ public interface State, ValueSubType extends Value * @return the value of the 'Ended Steps' reference list. * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_EndedSteps() - * @model transient="true" volatile="true" derived="true" + * @see fr.inria.diverse.trace.commons.model.trace.Step#getEndingState + * @model opposite="endingState" * @generated */ EList getEndedSteps(); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java index 2b9418c8e..130fe3b3e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; @@ -61,6 +51,7 @@ public interface Step> extends EObject { /** * Returns the value of the 'Starting State' reference. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}'. * *

* If the meaning of the 'Starting State' reference isn't clear, @@ -70,7 +61,8 @@ public interface Step> extends EObject { * @return the value of the 'Starting State' reference. * @see #setStartingState(State) * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_StartingState() - * @model required="true" transient="true" volatile="true" derived="true" + * @see fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps + * @model opposite="startedSteps" required="true" * @generated */ StateSubType getStartingState(); @@ -87,6 +79,7 @@ public interface Step> extends EObject { /** * Returns the value of the 'Ending State' reference. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}'. * *

* If the meaning of the 'Ending State' reference isn't clear, @@ -96,7 +89,8 @@ public interface Step> extends EObject { * @return the value of the 'Ending State' reference. * @see #setEndingState(State) * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_EndingState() - * @model transient="true" volatile="true" derived="true" + * @see fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps + * @model opposite="endedSteps" * @generated */ StateSubType getEndingState(); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java index 9cd09e63f..19f219285 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; @@ -72,7 +62,7 @@ public interface Trace, TracedObjectSubtype extends * * @return the value of the 'Traced Objects' containment reference list. * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_TracedObjects() - * @model containment="true" + * @model containment="true" transient="true" volatile="true" derived="true" * @generated */ EList getTracedObjects(); @@ -96,7 +86,7 @@ public interface Trace, TracedObjectSubtype extends * Returns the value of the 'Launchconfiguration' containment reference. * *

- * If the meaning of the 'Launchconfiguration' containment reference list isn't clear, + * If the meaning of the 'Launchconfiguration' containment reference isn't clear, * there really should be more of a description here... *

* diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java index 1a8ed132d..818babf96 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; @@ -59,24 +49,6 @@ public interface TraceFactory extends EFactory { */ GenericMSE createGenericMSE(); - /** - * Returns a new object of class 'Sequential Step'. - * - * - * @return a new object of class 'Sequential Step'. - * @generated - */ - , StateSubType extends State> SequentialStep createSequentialStep(); - - /** - * Returns a new object of class 'Parallel Step'. - * - * - * @return a new object of class 'Parallel Step'. - * @generated - */ - , StateSubType extends State> ParallelStep createParallelStep(); - /** * Returns a new object of class 'Generic Sequential Step'. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java index 52705b74d..af8588330 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace; @@ -1010,6 +1000,15 @@ public interface TracePackage extends EPackage { */ int TRACED_OBJECT_FEATURE_COUNT = 1; + /** + * The operation id for the 'Get Dimensions Internal' operation. + * + * + * @generated + * @ordered + */ + int TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = 0; + /** * The number of operations of the 'Traced Object' class. * @@ -1017,7 +1016,7 @@ public interface TracePackage extends EPackage { * @generated * @ordered */ - int TRACED_OBJECT_OPERATION_COUNT = 0; + int TRACED_OBJECT_OPERATION_COUNT = 1; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. @@ -1341,6 +1340,15 @@ public interface TracePackage extends EPackage { */ int GENERIC_TRACED_OBJECT_FEATURE_COUNT = TRACED_OBJECT_FEATURE_COUNT + 0; + /** + * The operation id for the 'Get Dimensions Internal' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = TRACED_OBJECT___GET_DIMENSIONS_INTERNAL; + /** * The number of operations of the 'Generic Traced Object' class. * @@ -2595,6 +2603,16 @@ public interface TracePackage extends EPackage { */ EReference getTracedObject_Dimensions(); + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensionsInternal() Get Dimensions Internal}' operation. + * + * + * @return the meta object for the 'Get Dimensions Internal' operation. + * @see fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensionsInternal() + * @generated + */ + EOperation getTracedObject__GetDimensionsInternal(); + /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. * @@ -3429,6 +3447,14 @@ interface Literals { */ EReference TRACED_OBJECT__DIMENSIONS = eINSTANCE.getTracedObject_Dimensions(); + /** + * The meta object literal for the 'Get Dimensions Internal' operation. + * + * + * @generated + */ + EOperation TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = eINSTANCE.getTracedObject__GetDimensionsInternal(); + /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java index 7e1ab99df..df135786a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java @@ -33,9 +33,18 @@ public interface TracedObject> extends EOb * * @return the value of the 'Dimensions' containment reference list. * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTracedObject_Dimensions() - * @model containment="true" + * @model containment="true" transient="true" volatile="true" derived="true" + * annotation="http://www.eclipse.org/emf/2002/GenModel get='return getDimensionsInternal();'" * @generated */ EList getDimensions(); + /** + * + * + * @model kind="operation" + * @generated + */ + EList getDimensionsInternal(); + } // TracedObject diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java index 073a1c1ca..93cfbc56e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java @@ -3,6 +3,7 @@ package fr.inria.diverse.trace.commons.model.trace; import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EObject; /** @@ -22,7 +23,6 @@ * @generated */ public interface Value> extends EObject { - /** * Returns the value of the 'States' reference list. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java index dffa3f11a..bc8fefaac 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java index c55df4cd7..aafd1ba2b 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java index 09c68dbc6..8aaff64aa 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -18,14 +8,12 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import java.util.Collection; - import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java index 127127cab..76aefb7b9 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java @@ -4,8 +4,8 @@ import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.TracePackage; - import fr.inria.diverse.trace.commons.model.trace.Value; + import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java index 6fb02dfa7..190b3af5b 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java index 7de724f55..c1d3ae7b6 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java @@ -5,13 +5,17 @@ import fr.inria.diverse.trace.commons.model.trace.GenericDimension; import fr.inria.diverse.trace.commons.model.trace.GenericValue; import fr.inria.diverse.trace.commons.model.trace.TracePackage; + import org.eclipse.emf.common.notify.Notification; + import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; + import org.eclipse.emf.ecore.util.EObjectContainmentEList; /** diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java index 9da6be30b..b6555ea3e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -16,9 +6,11 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import java.lang.reflect.InvocationTargetException; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EOperation; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java index f03db35ba..ec1ea18d0 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -19,8 +9,10 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; + import org.eclipse.emf.ecore.impl.ENotificationImpl; /** @@ -47,6 +39,7 @@ public class GenericParallelStepImpl extends ParallelStepImplEnding State Ref}' reference. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java index 631143778..4ac389fe0 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java @@ -36,6 +36,7 @@ public class GenericReferenceValueImpl extends GenericValueImpl implements Gener * @ordered */ protected EObject referenceValue; + /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java index 044c3a716..a328096e8 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -21,6 +11,7 @@ import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; + import org.eclipse.emf.ecore.impl.ENotificationImpl; /** @@ -47,6 +38,7 @@ public class GenericSequentialStepImpl extends SequentialStepImplEnding State Ref}' reference. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java index bc1f550a3..ec8f4cde3 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -19,8 +9,10 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; + import org.eclipse.emf.ecore.impl.ENotificationImpl; /** @@ -47,6 +39,7 @@ public class GenericSmallStepImpl extends SmallStepImpl implements * @ordered */ protected GenericState startingStateRef; + /** * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java index 66a40b6ca..c5edb0542 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java @@ -5,13 +5,20 @@ import fr.inria.diverse.trace.commons.model.trace.GenericState; import fr.inria.diverse.trace.commons.model.trace.GenericStep; import fr.inria.diverse.trace.commons.model.trace.GenericValue; +import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TracePackage; + import java.lang.reflect.InvocationTargetException; + import java.util.Collection; + import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; + import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; @@ -40,6 +47,7 @@ public class GenericStateImpl extends StateImpl imple * @ordered */ protected EList valuesRef; + /** * The cached value of the '{@link #getStartedStepsRef() Started Steps Ref}' reference list. * @@ -49,6 +57,7 @@ public class GenericStateImpl extends StateImpl imple * @ordered */ protected EList startedStepsRef; + /** * The cached value of the '{@link #getEndedStepsRef() Ended Steps Ref}' reference list. * @@ -58,6 +67,7 @@ public class GenericStateImpl extends StateImpl imple * @ordered */ protected EList endedStepsRef; + /** * * @@ -77,6 +87,34 @@ protected EClass eStaticClass() { return TracePackage.Literals.GENERIC_STATE; } + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getStartedSteps() { + if (startedSteps == null) { + startedSteps = new EObjectWithInverseResolvingEList(GenericStep.class, this, TracePackage.GENERIC_STATE__STARTED_STEPS, TracePackage.STEP__STARTING_STATE) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return Step.class; } }; + } + return startedSteps; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getEndedSteps() { + if (endedSteps == null) { + endedSteps = new EObjectWithInverseResolvingEList(GenericStep.class, this, TracePackage.GENERIC_STATE__ENDED_STEPS, TracePackage.STEP__ENDING_STATE) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return Step.class; } }; + } + return endedSteps; + } + /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java index a01cd4a9f..b09d5d534 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java @@ -8,8 +8,10 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; + import org.eclipse.emf.ecore.impl.ENotificationImpl; /** @@ -36,6 +38,7 @@ public abstract class GenericStepImpl extends StepImpl implements * @ordered */ protected GenericState startingStateRef; + /** * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. * @@ -72,8 +75,8 @@ protected EClass eStaticClass() { * @generated */ @Override - public void setStartingState(GenericState newStartingState) { - super.setStartingState(newStartingState); + public NotificationChain basicSetStartingState(GenericState newStartingState, NotificationChain msgs) { + return super.basicSetStartingState(newStartingState, msgs); } /** @@ -83,8 +86,8 @@ public void setStartingState(GenericState newStartingState) { * @generated */ @Override - public void setEndingState(GenericState newEndingState) { - super.setEndingState(newEndingState); + public NotificationChain basicSetEndingState(GenericState newEndingState, NotificationChain msgs) { + return super.basicSetEndingState(newEndingState, msgs); } /** diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java index 550c52dc9..15c9e89bd 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java @@ -13,6 +13,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; + import org.eclipse.emf.ecore.util.EObjectContainmentEList; /** @@ -53,20 +54,6 @@ public NotificationChain basicSetRootStep(StepSubType newRootStep, NotificationC return super.basicSetRootStep(newRootStep, msgs); } - /** - * - * - * This is specialized for the more specific element type known in this context. - * @generated - */ - @Override - public EList> getTracedObjects() { - if (tracedObjects == null) { - tracedObjects = new EObjectContainmentEList>(GenericTracedObject.class, this, TracePackage.GENERIC_TRACE__TRACED_OBJECTS); - } - return tracedObjects; - } - /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java index b94c681d7..d449e923b 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java @@ -5,13 +5,8 @@ import fr.inria.diverse.trace.commons.model.trace.GenericDimension; import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.util.EObjectContainmentEList; /** * @@ -40,18 +35,4 @@ protected EClass eStaticClass() { return TracePackage.Literals.GENERIC_TRACED_OBJECT; } - /** - * - * - * This is specialized for the more specific element type known in this context. - * @generated - */ - @Override - public EList getDimensions() { - if (dimensions == null) { - dimensions = new EObjectContainmentEList(GenericDimension.class, this, TracePackage.GENERIC_TRACED_OBJECT__DIMENSIONS); - } - return dimensions; - } - } //GenericTracedObjectImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java index dace4d113..ab1bc6470 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java @@ -7,11 +7,16 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import java.lang.reflect.InvocationTargetException; + import java.util.Collection; + import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; + import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; @@ -38,6 +43,7 @@ public abstract class GenericValueImpl extends ValueImpl implement * @ordered */ protected EList statesRef; + /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java index 6ce24eaba..c16cf5f04 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java index 47ecd470a..31b9949e0 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java index 1fe0b2211..8edf99348 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java index c81258a95..45c151c3e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java index 513cc0e7c..aa4fba810 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -16,6 +6,7 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.common.notify.Notification; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; @@ -44,6 +35,7 @@ public abstract class LaunchConfigurationParameterImpl extends MinimalEObjectImp * @ordered */ protected static final String VALUE_EDEFAULT = ""; + /** * The cached value of the '{@link #getValue() Value}' attribute. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java index df9ad5a00..7be75fa67 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java index dff67d1ca..4b5ca8752 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java index 38215e2c6..11e20adba 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java index fd4276813..c0a1c7711 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java index 31ebae740..7a9f09403 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java index 6ed5c354f..937c9f2b7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -26,7 +16,7 @@ * * @generated */ -public class ParallelStepImpl, StateSubType extends State> extends BigStepImpl implements ParallelStep { +public abstract class ParallelStepImpl, StateSubType extends State> extends BigStepImpl implements ParallelStep { /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java index b3fe698bf..73100df30 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -26,7 +16,7 @@ * * @generated */ -public class SequentialStepImpl, StateSubType extends State> extends BigStepImpl implements SequentialStep { +public abstract class SequentialStepImpl, StateSubType extends State> extends BigStepImpl implements SequentialStep { /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java index 9cb0742a1..0fe1ac27a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -15,7 +5,6 @@ import fr.inria.diverse.trace.commons.model.trace.SmallStep; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.TracePackage; - import org.eclipse.emf.ecore.EClass; /** diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java index c16335488..fa7bfd408 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java @@ -6,10 +6,18 @@ import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.commons.model.trace.Value; + import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; /** * @@ -27,6 +35,25 @@ * @generated */ public abstract class StateImpl, ValueSubType extends Value> extends MinimalEObjectImpl.Container implements State { + /** + * The cached value of the '{@link #getStartedSteps() Started Steps}' reference list. + * + * + * @see #getStartedSteps() + * @generated + * @ordered + */ + protected EList startedSteps; + /** + * The cached value of the '{@link #getEndedSteps() Ended Steps}' reference list. + * + * + * @see #getEndedSteps() + * @generated + * @ordered + */ + protected EList endedSteps; + /** * * @@ -52,11 +79,10 @@ protected EClass eStaticClass() { * @generated */ public EList getStartedSteps() { - // TODO: implement this method to return the 'Started Steps' reference list - // Ensure that you remove @generated or mark it @generated NOT - // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting - // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. - throw new UnsupportedOperationException(); + if (startedSteps == null) { + startedSteps = new EObjectWithInverseResolvingEList(Step.class, this, TracePackage.STATE__STARTED_STEPS, TracePackage.STEP__STARTING_STATE); + } + return startedSteps; } /** @@ -65,11 +91,10 @@ public EList getStartedSteps() { * @generated */ public EList getEndedSteps() { - // TODO: implement this method to return the 'Ended Steps' reference list - // Ensure that you remove @generated or mark it @generated NOT - // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting - // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. - throw new UnsupportedOperationException(); + if (endedSteps == null) { + endedSteps = new EObjectWithInverseResolvingEList(Step.class, this, TracePackage.STATE__ENDED_STEPS, TracePackage.STEP__ENDING_STATE); + } + return endedSteps; } /** @@ -85,6 +110,39 @@ public EList getValues() { throw new UnsupportedOperationException(); } + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + return ((InternalEList)(InternalEList)getStartedSteps()).basicAdd(otherEnd, msgs); + case TracePackage.STATE__ENDED_STEPS: + return ((InternalEList)(InternalEList)getEndedSteps()).basicAdd(otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + return ((InternalEList)getStartedSteps()).basicRemove(otherEnd, msgs); + case TracePackage.STATE__ENDED_STEPS: + return ((InternalEList)getEndedSteps()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + /** * * @@ -158,9 +216,9 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case TracePackage.STATE__STARTED_STEPS: - return !getStartedSteps().isEmpty(); + return startedSteps != null && !startedSteps.isEmpty(); case TracePackage.STATE__ENDED_STEPS: - return !getEndedSteps().isEmpty(); + return endedSteps != null && !endedSteps.isEmpty(); case TracePackage.STATE__VALUES: return !getValues().isEmpty(); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java index 092b43539..c926a50ee 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -16,10 +6,8 @@ import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.TracePackage; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; @@ -52,6 +40,25 @@ public abstract class StepImpl> extends Minimal */ protected MSEOccurrence mseoccurrence; + /** + * The cached value of the '{@link #getStartingState() Starting State}' reference. + * + * + * @see #getStartingState() + * @generated + * @ordered + */ + protected StateSubType startingState; + /** + * The cached value of the '{@link #getEndingState() Ending State}' reference. + * + * + * @see #getEndingState() + * @generated + * @ordered + */ + protected StateSubType endingState; + /** * * @@ -121,8 +128,15 @@ else if (eNotificationRequired()) */ @SuppressWarnings("unchecked") public StateSubType getStartingState() { - StateSubType startingState = basicGetStartingState(); - return startingState != null && startingState.eIsProxy() ? (StateSubType)eResolveProxy((InternalEObject)startingState) : startingState; + if (startingState != null && startingState.eIsProxy()) { + InternalEObject oldStartingState = (InternalEObject)startingState; + startingState = (StateSubType)eResolveProxy(oldStartingState); + if (startingState != oldStartingState) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.STEP__STARTING_STATE, oldStartingState, startingState)); + } + } + return startingState; } /** @@ -131,10 +145,22 @@ public StateSubType getStartingState() { * @generated */ public StateSubType basicGetStartingState() { - // TODO: implement this method to return the 'Starting State' reference - // -> do not perform proxy resolution - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); + return startingState; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetStartingState(StateSubType newStartingState, NotificationChain msgs) { + StateSubType oldStartingState = startingState; + startingState = newStartingState; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.STEP__STARTING_STATE, oldStartingState, newStartingState); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; } /** @@ -143,9 +169,17 @@ public StateSubType basicGetStartingState() { * @generated */ public void setStartingState(StateSubType newStartingState) { - // TODO: implement this method to set the 'Starting State' reference - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); + if (newStartingState != startingState) { + NotificationChain msgs = null; + if (startingState != null) + msgs = ((InternalEObject)startingState).eInverseRemove(this, TracePackage.STATE__STARTED_STEPS, State.class, msgs); + if (newStartingState != null) + msgs = ((InternalEObject)newStartingState).eInverseAdd(this, TracePackage.STATE__STARTED_STEPS, State.class, msgs); + msgs = basicSetStartingState(newStartingState, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STEP__STARTING_STATE, newStartingState, newStartingState)); } /** @@ -155,8 +189,15 @@ public void setStartingState(StateSubType newStartingState) { */ @SuppressWarnings("unchecked") public StateSubType getEndingState() { - StateSubType endingState = basicGetEndingState(); - return endingState != null && endingState.eIsProxy() ? (StateSubType)eResolveProxy((InternalEObject)endingState) : endingState; + if (endingState != null && endingState.eIsProxy()) { + InternalEObject oldEndingState = (InternalEObject)endingState; + endingState = (StateSubType)eResolveProxy(oldEndingState); + if (endingState != oldEndingState) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.STEP__ENDING_STATE, oldEndingState, endingState)); + } + } + return endingState; } /** @@ -165,10 +206,22 @@ public StateSubType getEndingState() { * @generated */ public StateSubType basicGetEndingState() { - // TODO: implement this method to return the 'Ending State' reference - // -> do not perform proxy resolution - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); + return endingState; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetEndingState(StateSubType newEndingState, NotificationChain msgs) { + StateSubType oldEndingState = endingState; + endingState = newEndingState; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.STEP__ENDING_STATE, oldEndingState, newEndingState); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; } /** @@ -177,9 +230,38 @@ public StateSubType basicGetEndingState() { * @generated */ public void setEndingState(StateSubType newEndingState) { - // TODO: implement this method to set the 'Ending State' reference - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); + if (newEndingState != endingState) { + NotificationChain msgs = null; + if (endingState != null) + msgs = ((InternalEObject)endingState).eInverseRemove(this, TracePackage.STATE__ENDED_STEPS, State.class, msgs); + if (newEndingState != null) + msgs = ((InternalEObject)newEndingState).eInverseAdd(this, TracePackage.STATE__ENDED_STEPS, State.class, msgs); + msgs = basicSetEndingState(newEndingState, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STEP__ENDING_STATE, newEndingState, newEndingState)); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.STEP__STARTING_STATE: + if (startingState != null) + msgs = ((InternalEObject)startingState).eInverseRemove(this, TracePackage.STATE__STARTED_STEPS, State.class, msgs); + return basicSetStartingState((StateSubType)otherEnd, msgs); + case TracePackage.STEP__ENDING_STATE: + if (endingState != null) + msgs = ((InternalEObject)endingState).eInverseRemove(this, TracePackage.STATE__ENDED_STEPS, State.class, msgs); + return basicSetEndingState((StateSubType)otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); } /** @@ -192,6 +274,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, switch (featureID) { case TracePackage.STEP__MSEOCCURRENCE: return basicSetMseoccurrence(null, msgs); + case TracePackage.STEP__STARTING_STATE: + return basicSetStartingState(null, msgs); + case TracePackage.STEP__ENDING_STATE: + return basicSetEndingState(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -270,9 +356,9 @@ public boolean eIsSet(int featureID) { case TracePackage.STEP__MSEOCCURRENCE: return mseoccurrence != null; case TracePackage.STEP__STARTING_STATE: - return basicGetStartingState() != null; + return startingState != null; case TracePackage.STEP__ENDING_STATE: - return basicGetEndingState() != null; + return endingState != null; } return super.eIsSet(featureID); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java index 123c7bafa..b4bed0568 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -70,8 +60,6 @@ public EObject create(EClass eClass) { case TracePackage.MSE_OCCURRENCE: return createMSEOccurrence(); case TracePackage.MSE_MODEL: return createMSEModel(); case TracePackage.GENERIC_MSE: return createGenericMSE(); - case TracePackage.SEQUENTIAL_STEP: return createSequentialStep(); - case TracePackage.PARALLEL_STEP: return createParallelStep(); case TracePackage.GENERIC_SEQUENTIAL_STEP: return createGenericSequentialStep(); case TracePackage.GENERIC_PARALLEL_STEP: return createGenericParallelStep(); case TracePackage.GENERIC_SMALL_STEP: return createGenericSmallStep(); @@ -157,26 +145,6 @@ public GenericMSE createGenericMSE() { return genericMSE; } - /** - * - * - * @generated - */ - public , StateSubType extends State> SequentialStep createSequentialStep() { - SequentialStepImpl sequentialStep = new SequentialStepImpl(); - return sequentialStep; - } - - /** - * - * - * @generated - */ - public , StateSubType extends State> ParallelStep createParallelStep() { - ParallelStepImpl parallelStep = new ParallelStepImpl(); - return parallelStep; - } - /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java index 24947679a..3fc274be6 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java @@ -1,36 +1,30 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; +import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; + import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; + import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; - /** * * An implementation of the model object 'Trace'. @@ -58,16 +52,6 @@ public abstract class TraceImpl, TracedObjectSubtype */ protected StepSubType rootStep; - /** - * The cached value of the '{@link #getTracedObjects() Traced Objects}' containment reference list. - * - * - * @see #getTracedObjects() - * @generated - * @ordered - */ - protected EList tracedObjects; - /** * The cached value of the '{@link #getStates() States}' containment reference list. * @@ -156,10 +140,11 @@ else if (eNotificationRequired()) * @generated */ public EList getTracedObjects() { - if (tracedObjects == null) { - tracedObjects = new EObjectContainmentEList(TracedObject.class, this, TracePackage.TRACE__TRACED_OBJECTS); - } - return tracedObjects; + // TODO: implement this method to return the 'Traced Objects' containment reference list + // Ensure that you remove @generated or mark it @generated NOT + // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting + // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. + throw new UnsupportedOperationException(); } /** @@ -319,7 +304,7 @@ public boolean eIsSet(int featureID) { case TracePackage.TRACE__ROOT_STEP: return rootStep != null; case TracePackage.TRACE__TRACED_OBJECTS: - return tracedObjects != null && !tracedObjects.isEmpty(); + return !getTracedObjects().isEmpty(); case TracePackage.TRACE__STATES: return states != null && !states.isEmpty(); case TracePackage.TRACE__LAUNCHCONFIGURATION: diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java index b36e9d5d2..7f0e6f8bc 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.impl; @@ -705,6 +695,15 @@ public EReference getTracedObject_Dimensions() { return (EReference)tracedObjectEClass.getEStructuralFeatures().get(0); } + /** + * + * + * @generated + */ + public EOperation getTracedObject__GetDimensionsInternal() { + return tracedObjectEClass.getEOperations().get(0); + } + /** * * @@ -1229,6 +1228,7 @@ public void createPackageContents() { tracedObjectEClass = createEClass(TRACED_OBJECT); createEReference(tracedObjectEClass, TRACED_OBJECT__DIMENSIONS); + createEOperation(tracedObjectEClass, TRACED_OBJECT___GET_DIMENSIONS_INTERNAL); dimensionEClass = createEClass(DIMENSION); createEReference(dimensionEClass, DIMENSION__VALUES); @@ -1554,9 +1554,9 @@ public void initializePackageContents() { initEClass(stepEClass, Step.class, "Step", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getStep_Mseoccurrence(), this.getMSEOccurrence(), null, "mseoccurrence", null, 0, 1, Step.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); g1 = createEGenericType(stepEClass_StateSubType); - initEReference(getStep_StartingState(), g1, null, "startingState", null, 1, 1, Step.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getStep_StartingState(), g1, this.getState_StartedSteps(), "startingState", null, 1, 1, Step.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); g1 = createEGenericType(stepEClass_StateSubType); - initEReference(getStep_EndingState(), g1, null, "endingState", null, 0, 1, Step.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getStep_EndingState(), g1, this.getState_EndedSteps(), "endingState", null, 0, 1, Step.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(bigStepEClass, BigStep.class, "BigStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); g1 = createEGenericType(bigStepEClass_StepSubtype); @@ -1564,9 +1564,9 @@ public void initializePackageContents() { initEClass(smallStepEClass, SmallStep.class, "SmallStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(sequentialStepEClass, SequentialStep.class, "SequentialStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(sequentialStepEClass, SequentialStep.class, "SequentialStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(parallelStepEClass, ParallelStep.class, "ParallelStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(parallelStepEClass, ParallelStep.class, "ParallelStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(genericSequentialStepEClass, GenericSequentialStep.class, "GenericSequentialStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1578,14 +1578,18 @@ public void initializePackageContents() { g1 = createEGenericType(traceEClass_StepSubType); initEReference(getTrace_RootStep(), g1, null, "rootStep", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); g1 = createEGenericType(traceEClass_TracedObjectSubtype); - initEReference(getTrace_TracedObjects(), g1, null, "tracedObjects", null, 0, -1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTrace_TracedObjects(), g1, null, "tracedObjects", null, 0, -1, Trace.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); g1 = createEGenericType(traceEClass_StateSubType); initEReference(getTrace_States(), g1, null, "states", null, 0, -1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getTrace_Launchconfiguration(), this.getLaunchConfiguration(), null, "launchconfiguration", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(tracedObjectEClass, TracedObject.class, "TracedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); g1 = createEGenericType(tracedObjectEClass_DimensionSubType); - initEReference(getTracedObject_Dimensions(), g1, null, "dimensions", null, 0, -1, TracedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTracedObject_Dimensions(), g1, null, "dimensions", null, 0, -1, TracedObject.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + + EOperation op = initEOperation(getTracedObject__GetDimensionsInternal(), null, "getDimensionsInternal", 0, -1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(tracedObjectEClass_DimensionSubType); + initEOperation(op, g1); initEClass(dimensionEClass, Dimension.class, "Dimension", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); g1 = createEGenericType(dimensionEClass_ValueSubType); @@ -1597,9 +1601,9 @@ public void initializePackageContents() { initEClass(stateEClass, State.class, "State", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); g1 = createEGenericType(stateEClass_StepSubType); - initEReference(getState_StartedSteps(), g1, null, "startedSteps", null, 0, -1, State.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getState_StartedSteps(), g1, this.getStep_StartingState(), "startedSteps", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); g1 = createEGenericType(stateEClass_StepSubType); - initEReference(getState_EndedSteps(), g1, null, "endedSteps", null, 0, -1, State.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getState_EndedSteps(), g1, this.getStep_EndingState(), "endedSteps", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); g1 = createEGenericType(stateEClass_ValueSubType); initEReference(getState_Values(), g1, null, "values", null, 0, -1, State.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java index 62168e462..00d11a0b2 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java @@ -6,16 +6,17 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import java.lang.reflect.InvocationTargetException; import java.util.Collection; + import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.InternalEList; /** @@ -32,16 +33,6 @@ * @generated */ public abstract class TracedObjectImpl> extends MinimalEObjectImpl.Container implements TracedObject { - /** - * The cached value of the '{@link #getDimensions() Dimensions}' containment reference list. - * - * - * @see #getDimensions() - * @generated - * @ordered - */ - protected EList dimensions; - /** * * @@ -67,10 +58,18 @@ protected EClass eStaticClass() { * @generated */ public EList getDimensions() { - if (dimensions == null) { - dimensions = new EObjectContainmentEList(Dimension.class, this, TracePackage.TRACED_OBJECT__DIMENSIONS); - } - return dimensions; + return getDimensionsInternal(); + } + + /** + * + * + * @generated + */ + public EList getDimensionsInternal() { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); } /** @@ -142,9 +141,23 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case TracePackage.TRACED_OBJECT__DIMENSIONS: - return dimensions != null && !dimensions.isEmpty(); + return !getDimensions().isEmpty(); } return super.eIsSet(featureID); } + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case TracePackage.TRACED_OBJECT___GET_DIMENSIONS_INTERNAL: + return getDimensionsInternal(); + } + return super.eInvoke(operationID, arguments); + } + } //TracedObjectImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java index 1b462dc18..34ef40cad 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java @@ -5,9 +5,13 @@ import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.commons.model.trace.Value; + import java.util.Collection; + import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; + import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; /** diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java index 141a80b9c..79c674ddf 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.util; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java index 8f0d66de9..438216fd8 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ /** */ package fr.inria.diverse.trace.commons.model.trace.util; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStateManager.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStateManager.java index 1cc3ee36f..4407d00e3 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStateManager.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStateManager.java @@ -1,9 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.gemoc.api; import fr.inria.diverse.trace.commons.model.trace.State; +/** + * Classes implementing this interface are responsible for the restoration of the model in any state. + * + * @author dorian + * + * @param + */ public interface IStateManager> { - boolean restoreState(StateSubType state); + /** + * Restores the model in the provided state + * @param state The state to restore the model to + */ + void restoreState(StateSubType state); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java index f7a5acbe3..e421311e7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java @@ -38,6 +38,8 @@ public interface ITraceExtractor, StateSubType exten */ boolean isDimensionIgnored(DimensionSubType dimension); + boolean isStateBreakable(StateSubType state); + /** * Compares two states and returns true if their values vector are the same, false otherwise. * @param state1 The first state @@ -70,13 +72,13 @@ public interface ITraceExtractor, StateSubType exten */ int getNumberOfDimensions(); + List getSteps(int firstStateIndex, int lastStateIndex); + /** - * Returns a description of the state located at the provided index. - * @param stateIndex The index of the state in the trace + * Returns a description of the state. + * @param state The state * @return A string listing all values of the state */ - String getStateDescription(int stateIndex); - String getStateDescription(StateSubType state); /** @@ -90,12 +92,24 @@ public interface ITraceExtractor, StateSubType exten */ StateSubType getState(int stateIndex); + /** + * @param firstStateIndex The index of the first state + * @param lastStateIndex The index of the last state + * @return The states between the specified indexes + */ + List getStates(int firstStateIndex, int lastStateIndex); + /** * @param state The state * @return The index of the state in the trace */ int getStateIndex(StateSubType state); + /** + * @return The list of dimensions + */ + List getDimensions(); + /** * @param value the value * @return The index of the first state in which the value is present @@ -109,29 +123,23 @@ public interface ITraceExtractor, StateSubType exten int getValueLastStateIndex(ValueSubType value); /** - * Returns a description of the value located on the provided value trace index and at the provided state index. - * @param traceIndex The index of the value trace - * @param stateIndex The index of the state + * Returns a description of the value. + * @param value The value * @return A string describing the value */ - String getValueDescription(int traceIndex, int stateIndex); - String getValueDescription(ValueSubType value); /** - * Returns a label for the value trace located at the provided index - * @param traceIndex The index of the value trace - * @return A label for the value trace + * Returns a label for the dimension located at the provided index + * @param dimension The dimension + * @return A label for the dimension */ - String getDimensionLabel(int traceIndex); - String getDimensionLabel(DimensionSubType dimension); /** - * @param traceIndex The index of the value trace - * @return The length of the value trace + * Returns the length of the value trace contained by the provided dimension. + * @param dimension The dimension + * @return The length of the value trace contained by the dimension */ - int getValuesTraceLength(int traceIndex); - - int getValuesTraceLength(DimensionSubType dimension); + int getDimensionLength(DimensionSubType dimension); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index fdbcfe166..4224bd86c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -46,11 +46,12 @@ class GenericEngineTraceAddonGenerator { // Transient private var String packageQN private var String className - private var String traceManagerClassName +// private var String traceManagerClassName private var String traceConstructorClassName - private var String traceExplorerClassName - private var String traceExtractorClassName - private var String traceNotifierClassName +// private var String traceExplorerClassName + private var String stateManagerClassName +// private var String traceExtractorClassName +// private var String traceNotifierClassName private var String stepFactoryClassName private var TraceMMGenerationTraceability traceability private var Set genPackages @@ -95,11 +96,12 @@ class GenericEngineTraceAddonGenerator { // Retrieving some info from the plugin generation packageQN = GenericTracePluginGenerator.packageQN className = GenericTracePluginGenerator.languageName.replaceAll(" ", "").toFirstUpper + "EngineAddon" - traceManagerClassName = GenericTracePluginGenerator.traceManagerClassName +// traceManagerClassName = GenericTracePluginGenerator.traceManagerClassName traceConstructorClassName = GenericTracePluginGenerator.traceConstructorClassName - traceExplorerClassName = GenericTracePluginGenerator.traceExplorerClassName - traceExtractorClassName = GenericTracePluginGenerator.traceExtractorClassName - traceNotifierClassName = GenericTracePluginGenerator.traceNotifierClassName +// traceExplorerClassName = GenericTracePluginGenerator.traceExplorerClassName + stateManagerClassName = GenericTracePluginGenerator.stateManagerClassName +// traceExtractorClassName = GenericTracePluginGenerator.traceExtractorClassName +// traceNotifierClassName = GenericTracePluginGenerator.traceNotifierClassName stepFactoryClassName = GenericTracePluginGenerator.languageName.replaceAll(" ", "").toFirstUpper + "StepFactory" traceability = GenericTracePluginGenerator.traceability genPackages = GenericTracePluginGenerator.referencedGenPackages @@ -189,13 +191,11 @@ import java.util.Map; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.gemoc.api.IStateManager; import fr.inria.diverse.trace.gemoc.api.IStepFactory; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; -import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; -import fr.inria.diverse.trace.gemoc.api.ITraceNotifier; import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon; public class «className» extends AbstractTraceAddon { @@ -208,43 +208,48 @@ public class «className» extends AbstractTraceAddon { } @Override - public ITraceExplorer constructTraceExplorer(Resource traceResource) { - «traceExplorerClassName» explorer = new «traceExplorerClassName»(); - EObject root = traceResource.getContents().get(0); - if (root instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») { - explorer.loadTrace((«getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») root); - return explorer; - } - return null; - } - - @Override - public ITraceExplorer constructTraceExplorer(Resource modelResource, Resource traceResource, Map tracedToExe) { - «traceExplorerClassName» explorer = new «traceExplorerClassName»(tracedToExe); - EObject root = traceResource.getContents().get(0); - if (root instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») { - explorer.loadTrace(modelResource, («getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») root); - return explorer; - } - return null; - } - - @Override - public ITraceExtractor constructTraceExtractor(Resource traceResource) { - «traceExtractorClassName» extractor = new «traceExtractorClassName»(); - EObject root = traceResource.getContents().get(0); - if (root instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») { - extractor.loadTrace((«getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») root); - return extractor; - } - return null; + public IStateManager> constructStateManager(Resource modelResource, Map tracedToExe) { + return new «stateManagerClassName»(modelResource, tracedToExe); } - - @Override - public ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) { - return new «traceNotifierClassName»(traceListener); - } +««« @Override +««« public ITraceExplorer constructTraceExplorer(Resource traceResource) { +««« «traceExplorerClassName» explorer = new «traceExplorerClassName»(); +««« EObject root = traceResource.getContents().get(0); +««« if (root instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») { +««« explorer.loadTrace((«getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») root); +««« return explorer; +««« } +««« return null; +««« } +««« +««« @Override +««« public ITraceExplorer constructTraceExplorer(Resource modelResource, Resource traceResource, Map tracedToExe) { +««« «traceExplorerClassName» explorer = new «traceExplorerClassName»(tracedToExe); +««« EObject root = traceResource.getContents().get(0); +««« if (root instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») { +««« explorer.loadTrace(modelResource, («getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») root); +««« return explorer; +««« } +««« return null; +««« } +««« +««« @Override +««« public ITraceExtractor constructTraceExtractor(Resource traceResource) { +««« «traceExtractorClassName» extractor = new «traceExtractorClassName»(); +««« EObject root = traceResource.getContents().get(0); +««« if (root instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») { +««« extractor.loadTrace((«getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») root); +««« return extractor; +««« } +««« return null; +««« } +««« +««« +««« @Override +««« public ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) { +««« return new «traceNotifierClassName»(traceListener); +««« } @Override public IStepFactory getFactory() { @@ -282,9 +287,9 @@ public class «className» extends AbstractTraceAddon { public class «stepFactoryClassName» implements IStepFactory { @Override - public fr.inria.diverse.trace.commons.model.trace.Step createStep(fr.inria.diverse.trace.commons.model.trace.MSE mse, List parameters, List result) { + public fr.inria.diverse.trace.commons.model.trace.Step createStep(fr.inria.diverse.trace.commons.model.trace.MSE mse, List parameters, List result) { - fr.inria.diverse.trace.commons.model.trace.Step step = null; + fr.inria.diverse.trace.commons.model.trace.Step step = null; org.eclipse.emf.ecore.EClass ec = mse.getCaller().eClass(); String stepRule = fr.inria.diverse.trace.commons.EcoreCraftingUtil.getFQN(ec, ".") + "." + mse.getAction().getName(); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF index 14aab078a..90bea06d4 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF @@ -13,6 +13,7 @@ Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", org.eclipse.xtext, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", - org.gemoc.commons.eclipse;bundle-version="0.1.0" + org.gemoc.commons.eclipse;bundle-version="0.1.0", + org.eclipse.emf.compare Export-Package: fr.inria.diverse.trace.gemoc.traceaddon diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index a0fe252b6..70f72d0f8 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -60,13 +60,10 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi private BatchModelChangeListener listenerAddon - abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, - Map exeToTraced) + abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map exeToTraced) abstract def IStateManager> constructStateManager(Resource modelResource, Map tracedToExe) - abstract def ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) - abstract def boolean isAddonForTrace(EObject traceRoot) override getTraceExplorer() { @@ -191,8 +188,8 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi val stateManager = constructStateManager(modelResource, exeToTraced.inverse) traceExplorer = new GenericTraceExplorer(trace, stateManager) traceExtractor = new GenericTraceExtractor(trace) - traceListener = new BatchModelChangeListener(EMFResource.getRelatedResources(traceResource)); - traceNotifier = constructTraceNotifier(traceListener) + traceListener = new BatchModelChangeListener(EMFResource.getRelatedResources(traceResource)) + traceNotifier = new GenericTraceNotifier(traceListener) traceNotifier.addListener(traceExtractor) traceNotifier.addListener(traceExplorer) } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java index 5ce0bba5d..c8d041375 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java @@ -48,12 +48,6 @@ public boolean isAddonForTrace(EObject traceRoot) { // return true; } - @Override - public ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) { - throw new UnsupportedOperationException(); -// return null; - } - @Override public IStateManager> constructStateManager(Resource modelResource, Map tracedToExe) { throw new UnsupportedOperationException(); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java index a3c357dd7..a6937315c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java @@ -231,18 +231,16 @@ private Step findNextStep(final List> stepPath, final Step< private void computeExplorerState(List> stepPath) { final List> rootSteps = getSubSteps(trace.getRootStep()); - final List> stepPathUnmodifiable = Collections.unmodifiableList(stepPath); + stepIntoResult = computeStepInto(stepPath, rootSteps); + stepOverResult = computeStepOver(stepPath, rootSteps); + stepReturnResult = computeStepReturn(stepPath, rootSteps); - stepIntoResult = computeStepInto(stepPathUnmodifiable, rootSteps); - stepOverResult = computeStepOver(stepPathUnmodifiable, rootSteps); - stepReturnResult = computeStepReturn(stepPathUnmodifiable, rootSteps); - - stepBackIntoResult = computeBackInto(stepPathUnmodifiable); - stepBackOverResult = computeBackOver(stepPathUnmodifiable); - stepBackOutResult = computeBackOut(stepPathUnmodifiable); + stepBackIntoResult = computeBackInto(stepPath); + stepBackOverResult = computeBackOver(stepPath); + stepBackOutResult = computeBackOut(stepPath); callStack.clear(); - callStack.addAll(stepPathUnmodifiable.stream().map(s -> (Step) s).collect(Collectors.toList())); + callStack.addAll(stepPath); } private void goTo(State state) { @@ -250,21 +248,6 @@ private void goTo(State state) { if (stateManager != null) { stateManager.restoreState(state); } -// if (modelResource != null) { -// try { -// final TransactionalEditingDomain ed = TransactionUtil.getEditingDomain(modelResource); -// if (ed != null) { -// final RecordingCommand command = new RecordingCommand(ed, "") { -// protected void doExecute() { -// -// } -// }; -// CommandExecution.execute(ed, command); -// } -// } catch (Exception e) { -// throw e; -// } -// } } private void jumpBeforeStep(Step step) { @@ -307,7 +290,11 @@ public Step getCurrentBigStep() { @Override public void jump(State state) { assert state != null; - goTo(state); + currentState = state; + goTo(currentState); + final List> steps = currentState.getStartedSteps(); + final Step step = steps.isEmpty() ? null : steps.get(0); + updateCallStack(step); } @Override @@ -315,7 +302,7 @@ public void jump(Value value) { assert value != null; List> states = value.getStates(); if (!states.isEmpty()) { - goTo(states.get(0)); + jump(states.get(0)); } } @@ -494,13 +481,14 @@ public List> getCallStack() { @Override public void updateCallStack(Step step) { - Step step_cast = (Step) step; final List> newPath = new ArrayList<>(); - newPath.add(step_cast); - EObject container = step.eContainer(); - while (container != null && container instanceof Step) { - newPath.add(0, (Step) container); - container = container.eContainer(); + if (step != null) { + newPath.add(step); + EObject container = step.eContainer(); + while (container != null && container instanceof Step && container != trace.getRootStep()) { + newPath.add(0, (Step) container); + container = container.eContainer(); + } } computeExplorerState(newPath); notifyListeners(); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index e95b24baa..7cea7fa2d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -10,16 +10,44 @@ *******************************************************************************/ package fr.inria.diverse.trace.gemoc.traceaddon; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.eclipse.emf.common.util.Monitor; +import org.eclipse.emf.compare.Comparison; +import org.eclipse.emf.compare.EMFCompare; +import org.eclipse.emf.compare.Match; +import org.eclipse.emf.compare.diff.DefaultDiffEngine; +import org.eclipse.emf.compare.diff.DiffBuilder; +import org.eclipse.emf.compare.diff.FeatureFilter; +import org.eclipse.emf.compare.diff.IDiffEngine; +import org.eclipse.emf.compare.diff.IDiffProcessor; +import org.eclipse.emf.compare.internal.spec.MatchSpec; +import org.eclipse.emf.compare.postprocessor.BasicPostProcessorDescriptorImpl; +import org.eclipse.emf.compare.postprocessor.IPostProcessor; +import org.eclipse.emf.compare.postprocessor.IPostProcessor.Descriptor.Registry; +import org.eclipse.emf.compare.postprocessor.PostProcessorDescriptorRegistryImpl; +import org.eclipse.emf.compare.scope.DefaultComparisonScope; +import org.eclipse.emf.compare.scope.IComparisonScope; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.util.EcoreEList; import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; +import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.State; @@ -30,14 +58,21 @@ import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; +@SuppressWarnings("restriction") public class GenericTraceExtractor implements ITraceExtractor, State, TracedObject, Dimension, Value> { private Trace trace; - private HashMap,Boolean> ignoredDimensions = new HashMap<>(); - final private IQualifiedNameProvider nameProvider = new DefaultDeclarativeQualifiedNameProvider(); + private Map,Boolean> ignoredDimensions = new HashMap<>(); + private final IQualifiedNameProvider nameProvider = new DefaultDeclarativeQualifiedNameProvider(); + private Map> listeners = new HashMap<>(); + /** + * Constructor + * @param trace The trace + */ public GenericTraceExtractor(Trace, TracedObject, State> trace) { this.trace = trace; + configureDiffEngine(); } @Override @@ -47,20 +82,28 @@ public void loadTrace(Trace, TracedObject, State> trace) { @Override public void notifyListeners() { - // TODO Auto-generated method stub - + for (Map.Entry> entry : listeners.entrySet()) { + entry.getValue().forEach(c -> c.execute()); + } } @Override public void registerCommand(ITraceViewListener listener, TraceViewCommand command) { - // TODO Auto-generated method stub - + if (listener != null) { + Set commands = listeners.get(listener); + if (commands == null) { + commands = new HashSet<>(); + listeners.put(listener, commands); + } + commands.add(command); + } } @Override public void removeListener(ITraceViewListener listener) { - // TODO Auto-generated method stub - + if (listener != null) { + listeners.remove(listener); + } } @Override @@ -73,23 +116,253 @@ public boolean isDimensionIgnored(Dimension dimension) { final Boolean ignored = ignoredDimensions.get(dimension); return ignored != null && ignored.booleanValue(); } + + private boolean isDimensionIgnored(int index) { + return isDimensionIgnored(getDimensions().get(index)); + } + + @Override + public boolean isStateBreakable(State state) { +// final boolean b = state.getStartedSteps().size() == 1; +// if (b) { +// Step s = state.getStartedSteps().get(0); +// return !(s instanceof ImplicitStep); +// } + return true; + } + + private final IPostProcessor customPostProcessor = new IPostProcessor() { + + private final Function getIdFunction = e -> e.eClass().getName(); + + @Override + public void postMatch(Comparison comparison, Monitor monitor) { + final List matches = new ArrayList<>(comparison.getMatches()); + final List treatedMatches = new ArrayList<>(); + matches.forEach(m1 -> { + matches.forEach(m2 -> { + if (m1 != m2 && !treatedMatches.contains(m2)) { + final EObject left; + final EObject right; + if (m1.getLeft() != null && m1.getRight() == null && m2.getLeft() == null + && m2.getRight() != null) { + left = m1.getLeft(); + right = m2.getRight(); + } else if (m2.getLeft() != null && m2.getRight() == null && m1.getLeft() == null + && m1.getRight() != null) { + left = m2.getLeft(); + right = m1.getRight(); + } else { + return; + } + final String leftId = getIdFunction.apply(left); + final String rightId = getIdFunction.apply(right); + if (leftId.equals(rightId)) { + comparison.getMatches().remove(m1); + comparison.getMatches().remove(m2); + final Match match = new MatchSpec(); + match.setLeft(left); + match.setRight(right); + comparison.getMatches().add(match); + } + } + }); + treatedMatches.add(m1); + }); + } + + @Override + public void postDiff(Comparison comparison, Monitor monitor) { + } + + @Override + public void postRequirements(Comparison comparison, Monitor monitor) { + } + + @Override + public void postEquivalences(Comparison comparison, Monitor monitor) { + } + + @Override + public void postConflicts(Comparison comparison, Monitor monitor) { + } + + @Override + public void postComparison(Comparison comparison, Monitor monitor) { + } + }; + + private boolean compareInitialized = false; + private IPostProcessor.Descriptor descriptor = null; + private Registry registry = null; + private EMFCompare compare; + private IDiffEngine diffEngine = null; + + private void configureDiffEngine() { + IDiffProcessor diffProcessor = new DiffBuilder(); + diffEngine = new DefaultDiffEngine(diffProcessor) { + @Override + protected FeatureFilter createFeatureFilter() { + return new FeatureFilter() { + @Override + protected boolean isIgnoredReference(Match match, EReference reference) { + final String name = reference.getName(); + return name.equals("parent") || name.equals("states") || name.equals("statesNoOpposite"); + } + }; + } + }; + } + + private boolean compareEObjects(EObject e1, EObject e2) { + if (e1 == e2) { + return true; + } + + if (e1 == null || e2 == null) { + return false; + } + + if (!compareInitialized) { + descriptor = new BasicPostProcessorDescriptorImpl(customPostProcessor, Pattern.compile(".*"), null); + registry = new PostProcessorDescriptorRegistryImpl(); + registry.put(customPostProcessor.getClass().getName(), descriptor); + compare = EMFCompare.builder().setPostProcessorRegistry(registry).setDiffEngine(diffEngine).build(); + compareInitialized = true; + } + final IComparisonScope scope = new DefaultComparisonScope(e1, e2, null); + final Comparison comparison = compare.compare(scope); + return comparison.getDifferences().isEmpty(); + } + @Override public boolean compareStates(State state1, State state2, boolean respectIgnored) { - // TODO Auto-generated method stub - return false; + if (state1.getValues().size() != state2.getValues().size()) { + return false; + } + + final List> values1 = getStateValues(state1); + final List> values2 = getStateValues(state2); + + boolean result = true; + for (int i = 0; i < values1.size(); i++) { + if (!respectIgnored || !isDimensionIgnored(i)) { + final Value value1 = values1.get(i); + final Value value2 = values2.get(i); + if (value1 != value2) { + result = result && compareEObjects(value1, value2); + if (!result) { + break; + } + } + } + } + + return result; + } + + private final List> cachedDimensions = new ArrayList<>(); + private final Map, List>> stateEquivalenceClasses = Collections + .synchronizedMap(new HashMap<>()); + private final Map, List>> cachedMaskedStateEquivalenceClasses = Collections + .synchronizedMap(new HashMap<>()); + private final List> observedValues = new ArrayList<>(); + + private List computeStateComparisonList(List> values) { + final List valueIndexes = new ArrayList<>(); + for (int i = 0; i < values.size(); i++) { + final Value value = values.get(i); + int idx = -1; + for (int j = 0; j < observedValues.size(); j++) { + final Value v1 = observedValues.get(j); + final Value v2 = value; + if (compareEObjects(v1, v2)) { + idx = j; + break; + } + } + if (idx != -1) { + valueIndexes.add(idx); + } else { + valueIndexes.add(observedValues.size()); + observedValues.add(value); + } + } + return valueIndexes; + } + + private void updateEquivalenceClasses(State state) { + final List> values = getStateValues(state); + final List valueIndexes = computeStateComparisonList(values); + List> equivalenceClass = stateEquivalenceClasses.get(valueIndexes); + if (equivalenceClass == null) { + equivalenceClass = new ArrayList<>(); + stateEquivalenceClasses.put(valueIndexes, equivalenceClass); + } + equivalenceClass.add(state); + final List> dimensionsToMask = getIgnoredDimensions(); + // If the cached masked equivalence classes have not been flushed, updated them. + if (!(dimensionsToMask.isEmpty() || cachedMaskedStateEquivalenceClasses.isEmpty())) { + final List> dimensions = getDimensions(); + final List dimensionIndexesToMask = dimensionsToMask.stream() + .map(d -> dimensions.indexOf(d)) + .sorted() + .collect(Collectors.toList()); + final List maskedIndexList = applyMask(valueIndexes, dimensionIndexesToMask); + equivalenceClass = cachedMaskedStateEquivalenceClasses.get(maskedIndexList); + if (equivalenceClass == null) { + equivalenceClass = new ArrayList<>(); + cachedMaskedStateEquivalenceClasses.put(maskedIndexList, equivalenceClass); + } + equivalenceClass.add(state); + } + } + + private List applyMask(List source, List mask) { + final List result = new ArrayList<>(source); + int j = 0; + for (Integer i : mask) { + result.remove(i - j); + j++; + } + return result; + } + + private List>> getStateEquivalenceClasses() { + final Set> dimensionsToMask = ignoredDimensions.keySet(); + if (dimensionsToMask.isEmpty()) { + return new ArrayList<>(stateEquivalenceClasses.values()); + } + if (cachedMaskedStateEquivalenceClasses.isEmpty()) { + final List> dimensions = getDimensions(); + final List dimensionIndexesToMask = dimensionsToMask.stream() + .map(d -> dimensions.indexOf(d)) + .sorted() + .collect(Collectors.toList()); + stateEquivalenceClasses.forEach((indexList, stateList) -> { + final List maskedIndexList = applyMask(indexList, dimensionIndexesToMask); + List> equivalenceClass = cachedMaskedStateEquivalenceClasses.get(maskedIndexList); + if (equivalenceClass == null) { + equivalenceClass = new ArrayList<>(); + cachedMaskedStateEquivalenceClasses.put(maskedIndexList, equivalenceClass); + } + equivalenceClass.addAll(stateList); + }); + } + return new ArrayList<>(cachedMaskedStateEquivalenceClasses.values()); } @Override public List>> computeStateEquivalenceClasses(List> states) { - // TODO Auto-generated method stub - return null; + return getStateEquivalenceClasses().stream() + .map(l -> l.stream().filter(s -> states.contains(s)).collect(Collectors.toList())) + .collect(Collectors.toList()); } @Override public List>> computeStateEquivalenceClasses() { - // TODO Auto-generated method stub - return null; + return getStateEquivalenceClasses().stream().map(l -> new ArrayList<>(l)).collect(Collectors.toList()); } @Override @@ -103,17 +376,25 @@ public int getNumberOfDimensions() { .map(o -> o.getDimensions().size()) .reduce(0, (i1, i2) -> i1 + i2); } - - @Override - public String getStateDescription(int stateIndex) { - // TODO Auto-generated method stub - return null; + + private List> getStateValues(State state) { + final Map, Value> dimensionToValue = new HashMap<>(); + state.getValues().forEach(v -> dimensionToValue.put((Dimension) v.eContainer(), v)); + return getDimensions().stream().map(d -> dimensionToValue.get(d)).collect(Collectors.toList()); } @Override - public String getStateDescription(State state) { - // TODO Auto-generated method stub - return null; + public String getStateDescription(State state) { + String result = ""; + final List> values = getStateValues(state); + for (int i = 0; i < values.size(); i++) { + if (!isDimensionIgnored(i)) { + String description = getValueDescription(values.get(i)); + result += (description == null ? "" : (result.length() == 0 ? "" : "\n") + description); + } + } + + return result; } @Override @@ -126,6 +407,15 @@ public int getStatesTraceLength() { return trace.getStates().get(stateIndex); } + @Override + public List> getStates(int firstStateIndex, int lastStateIndex) { + final List> result = new ArrayList<>(); + final int effectiveFrom = Math.max(0, firstStateIndex); + final int effectiveTo = Math.min(trace.getStates().size(), lastStateIndex + 1); + trace.getStates().subList(effectiveFrom, effectiveTo).forEach(s -> result.add(s)); + return result; + } + @Override public int getStateIndex(State state) { return trace.getStates().indexOf(state); @@ -141,23 +431,57 @@ public int getValueLastStateIndex(Value value) { List> states = value.getStates(); return trace.getStates().indexOf(states.get(states.size())); } - - @Override - public String getValueDescription(int traceIndex, int stateIndex) { - // TODO Auto-generated method stub - return null; + + private String getValueName(Value value) { + final String eClassName = value.eClass().getName(); + return eClassName.substring(eClassName.indexOf('_') + 1, eClassName.indexOf("_Value")); } - - @Override - public String getValueDescription(Value value) { - // TODO Auto-generated method stub - return null; + + private String getObjectDescription(Object object) { + if (object == null) { + return "null"; + } + if (object instanceof EObject) { + final Object originalObject = getOriginalObject((EObject) object); + if (originalObject != null) { + if (originalObject instanceof EObject) { + final QualifiedName qname = nameProvider.getFullyQualifiedName((EObject) originalObject); + if (qname != null) { + return qname.getLastSegment(); + } + } + return originalObject.toString(); + } + QualifiedName qname = nameProvider.getFullyQualifiedName((EObject) object); + if (qname != null) { + return qname.getLastSegment(); + } + } + if (object instanceof Collection) { + @SuppressWarnings("unchecked") + final Collection o_cast = (Collection) object; + if (!o_cast.isEmpty()) { + List strings = o_cast.stream().map(o -> getObjectDescription(o)).collect(Collectors.toList()); + return strings.toString(); + } + } + return object.toString(); } @Override - public String getDimensionLabel(int traceIndex) { - // TODO - return null; + public String getValueDescription(Value value) { + assert value != null; + String description = getDimensionLabel((Dimension)value.eContainer()) + " : "; + final String attributeName = getValueName(value); + if (attributeName.length() > 0) { + final Optional attribute = value.eClass().getEAllStructuralFeatures().stream() + .filter(r -> r.getName().equals(attributeName)).findFirst(); + if (attribute.isPresent()) { + final Object o = value.eGet(attribute.get()); + return description + getObjectDescription(o); + } + } + return description + value; } private Object getOriginalObject(EObject eObject) { @@ -204,37 +528,77 @@ public String getDimensionLabel(Dimension dimension) { } @Override - public int getValuesTraceLength(int traceIndex) { - return 0; + public int getDimensionLength(Dimension dimension) { + return dimension.getValues().size(); } - @Override - public int getValuesTraceLength(Dimension dimension) { - return dimension.getValues().size(); + private void updateEquivalenceClasses(List> states) { + states.stream().distinct().forEach(s -> updateEquivalenceClasses(s)); } @Override public void statesAdded(List> states) { - // TODO Auto-generated method stub + updateEquivalenceClasses(states); + notifyListeners(); } @Override public void stepsStarted(List> steps) { - // TODO Auto-generated method stub } @Override public void stepsEnded(List> steps) { - // TODO Auto-generated method stub } @Override public void valuesAdded(List> values) { - // TODO Auto-generated method stub } @Override - public void dimensionsAdded(List> dimensions) { - // TODO Auto-generated method stub + public void dimensionsAdded(List> addedDimensions) { + if (!addedDimensions.isEmpty()) { + cachedMaskedStateEquivalenceClasses.clear(); + cachedDimensions.clear(); + final List> dimensions = getDimensions(); + final List insertedTracesIndexes = new ArrayList<>(); + for (Dimension dimension : addedDimensions) { + final int i = dimensions.indexOf(dimension); + insertedTracesIndexes.add(i); + } + Collections.sort(insertedTracesIndexes); + final List> keys = new ArrayList<>(stateEquivalenceClasses.keySet()); + for (List key : keys) { + List> states = stateEquivalenceClasses.remove(key); + for (Integer i : insertedTracesIndexes) { + key.add(i, -1); + } + stateEquivalenceClasses.put(key, states); + } + } + } + + @Override + public List> getSteps(int firstStateIndex, int lastStateIndex) { + final Step rootStep = trace.getRootStep(); + if (rootStep instanceof BigStep) { + final List> steps = new ArrayList<>(((BigStep) rootStep).getSubSteps()); + steps.removeIf(s -> getStateIndex(s.getEndingState()) < firstStateIndex || getStateIndex(s.getStartingState()) > lastStateIndex); + return steps; + } + return Collections.singletonList(rootStep); + } + + @Override + public List> getDimensions() { + if (cachedDimensions.isEmpty()) { + trace.getTracedObjects().forEach(o -> cachedDimensions.addAll(o.getDimensions())); + } + return cachedDimensions; + } + + private List> getIgnoredDimensions() { + return getDimensions().stream() + .filter(d -> isDimensionIgnored(d)) + .collect(Collectors.toList()); } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java new file mode 100644 index 000000000..b01ff36a8 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java @@ -0,0 +1,90 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package fr.inria.diverse.trace.gemoc.traceaddon; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange; + +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; +import fr.inria.diverse.trace.gemoc.api.ITraceListener; +import fr.inria.diverse.trace.gemoc.api.ITraceNotifier; + +public class GenericTraceNotifier implements ITraceNotifier { + + private BatchModelChangeListener traceListener; + + private final List listeners = new ArrayList<>(); + + public GenericTraceNotifier(BatchModelChangeListener traceListener) { + this.traceListener = traceListener; + } + + @Override + public void notifyListeners() { + for (ITraceListener listener : listeners) { + notifyListener(listener); + } + } + + @Override + public void notifyListener(ITraceListener listener) { + final List changes = traceListener.getChanges(listener); + if (!changes.isEmpty()) { + final List> startedSteps = new ArrayList<>(); + final List> endedSteps = new ArrayList<>(); + final List> newStates = new ArrayList<>(); + final List> newValues = new ArrayList<>(); + final List> newDimensions = new ArrayList<>(); + changes.forEach(c -> { + if (c instanceof NewObjectModelChange) { + final EObject o = c.getChangedObject(); + if (o instanceof Value) { + newValues.add((Value) o); + } else if (o instanceof Step) { + startedSteps.add((Step) o); + } else if (o instanceof State) { + final State newState = (State) o; + newStates.add(newState); + endedSteps.addAll(newState.getEndedSteps()); + } else if (o instanceof TracedObject) { + ((TracedObject) o).getDimensions(); + } + } + }); + listener.valuesAdded(newValues); + listener.dimensionsAdded(newDimensions); + listener.statesAdded(newStates); + listener.stepsStarted(startedSteps); + listener.stepsEnded(endedSteps); + } + } + + @Override + public void addListener(ITraceListener listener) { + listeners.add(listener); + traceListener.registerObserver(listener); + } + + @Override + public void removeListener(ITraceListener listener) { + listeners.remove(listener); + traceListener.removeObserver(listener); + } +} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java index c656a3114..2ea3c5f39 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java @@ -21,7 +21,7 @@ public class GenericTraceStepFactory implements IStepFactory { @Override public Step createStep(MSE mse, List parameters, List result) { - return TraceFactory.eINSTANCE.createSequentialStep(); + return TraceFactory.eINSTANCE.createGenericSequentialStep(); } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird index 65ab43223..405d283ba 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird @@ -16,17 +16,6 @@ - - - - bold - - - - bold - - - bold @@ -52,11 +41,6 @@ - - - - - @@ -66,17 +50,26 @@ - - - bold - - + + + + bold + + + + + - - - italic - - + + + + bold + + + + bold + + @@ -94,17 +87,21 @@ - - - + + + + + + + - - - + + + - - - + + + @@ -115,30 +112,26 @@ - - - - - - - - - - - - - + - - - + + + + + + + + + + + @@ -193,7 +186,7 @@ - + @@ -251,18 +244,6 @@ - - - - - - - - - - - - @@ -287,15 +268,11 @@ - - - - - + @@ -347,7 +324,7 @@ - + @@ -358,18 +335,10 @@ - + - - - - - - - - @@ -379,45 +348,54 @@ + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + - - - - - - + + + + @@ -484,33 +462,33 @@ - + - + - + - + - + - + - + - + - + @@ -612,67 +590,195 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -687,7 +793,7 @@ - + @@ -696,38 +802,45 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic - + - - - - - italic - + + + + + - + - - - - - bold + + + + + - + - - - - - italic + + + + + - + + + + + + + + + - + @@ -740,33 +853,8 @@ - - - - - italic - - - - - - - - - bold - - - - - - - - italic - - - - + @@ -779,10 +867,26 @@ - - - - + + + + + + + + + + + + + + + + + + + + @@ -878,31 +982,6 @@ - - - - - - - bold - - - bold - - - - - - - - - - - - - - - @@ -950,30 +1029,6 @@ - - - - - bold - - - - - - - - - - - - - - - - - - - @@ -1063,14 +1118,6 @@ - - - - - - - - @@ -1092,7 +1139,8 @@ - + + routingStyle italic @@ -1157,13 +1205,13 @@ - + - + @@ -1189,6 +1237,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -1197,6 +1248,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -1210,22 +1264,12 @@ - - - - - - - - - - - - - + + + @@ -1253,6 +1297,14 @@ + + + + + + + + @@ -1284,9 +1336,13 @@ - + + + + + routingStyle @@ -1323,32 +1379,203 @@ - - - - - + + + + + labelSize - + labelSize - - - - - + + + + + labelSize - + labelSize + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + + + + + + + + + + + labelSize + bold + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + italic + + + + + + + + + + + + bold + + + bold + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + italic + + + + + + + + + + + + + + + italic + + + + + + + + + + + + + + + italic + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore index cefe4c357..d2674643f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore @@ -2,6 +2,17 @@ + + + + + + + + + + + @@ -24,9 +35,31 @@ - - - + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + @@ -36,6 +69,13 @@ + + + + + + + @@ -50,6 +90,10 @@
+ + @@ -78,7 +122,11 @@ - + + +
+ + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java index 75456ea51..a6792b831 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java @@ -5,6 +5,7 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; /** @@ -111,6 +112,15 @@ public interface BasePackage extends EPackage { */ int SPECIFIC_TRACE_FEATURE_COUNT = TracePackage.TRACE_FEATURE_COUNT + 0; + /** + * The operation id for the 'Get Traced Objects' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACE___GET_TRACED_OBJECTS = TracePackage.TRACE_OPERATION_COUNT + 0; + /** * The number of operations of the 'Specific Trace' class. * @@ -118,7 +128,7 @@ public interface BasePackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_TRACE_OPERATION_COUNT = TracePackage.TRACE_OPERATION_COUNT + 0; + int SPECIFIC_TRACE_OPERATION_COUNT = TracePackage.TRACE_OPERATION_COUNT + 1; /** @@ -131,6 +141,16 @@ public interface BasePackage extends EPackage { */ EClass getSpecificTrace(); + /** + * Returns the meta object for the '{@link base.SpecificTrace#getTracedObjects() Get Traced Objects}' operation. + * + * + * @return the meta object for the 'Get Traced Objects' operation. + * @see base.SpecificTrace#getTracedObjects() + * @generated + */ + EOperation getSpecificTrace__GetTracedObjects(); + /** * Returns the factory that creates the instances of the model. * @@ -164,6 +184,14 @@ interface Literals { */ EClass SPECIFIC_TRACE = eINSTANCE.getSpecificTrace(); + /** + * The meta object literal for the 'Get Traced Objects' operation. + * + * + * @generated + */ + EOperation SPECIFIC_TRACE___GET_TRACED_OBJECTS = eINSTANCE.getSpecificTrace__GetTracedObjects(); + } } //BasePackage diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java index 954ff0712..ee9604a37 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java @@ -12,6 +12,8 @@ import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.Trace; +import org.eclipse.emf.common.util.EList; + /** * * A representation of the model object 'Specific Trace'. @@ -23,4 +25,12 @@ * @generated */ public interface SpecificTrace extends Trace, SpecificTracedObject>, SpecificState> { + /** + * + * + * @model kind="operation" + * @generated + */ + EList>> getTracedObjects(); + } // SpecificTrace diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java index 017854147..4b785a762 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java @@ -6,16 +6,86 @@ import fr.inria.diverse.trace.commons.model.trace.State; +import org.eclipse.emf.common.util.EList; + /** * * A representation of the model object 'Specific State'. * * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link base.States.SpecificState#getStartedStepsRef Started Steps Ref}
    • + *
  • {@link base.States.SpecificState#getEndedStepsRef Ended Steps Ref}
    • + *
* * @see base.States.StatesPackage#getSpecificState() * @model * @generated */ public interface SpecificState extends State { + /** + * Returns the value of the 'Started Steps Ref' reference list. + * The list contents are of type {@link base.Steps.SpecificStep}. + * It is bidirectional and its opposite is '{@link base.Steps.SpecificStep#getStartingStateRef Starting State Ref}'. + * + *

+ * If the meaning of the 'Started Steps Ref' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Started Steps Ref' reference list. + * @see base.States.StatesPackage#getSpecificState_StartedStepsRef() + * @see base.Steps.SpecificStep#getStartingStateRef + * @model opposite="startingStateRef" + * @generated + */ + EList getStartedStepsRef(); + + /** + * Returns the value of the 'Ended Steps Ref' reference list. + * The list contents are of type {@link base.Steps.SpecificStep}. + * It is bidirectional and its opposite is '{@link base.Steps.SpecificStep#getEndingStateRef Ending State Ref}'. + * + *

+ * If the meaning of the 'Ended Steps Ref' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Ended Steps Ref' reference list. + * @see base.States.StatesPackage#getSpecificState_EndedStepsRef() + * @see base.Steps.SpecificStep#getEndingStateRef + * @model opposite="endingStateRef" + * @generated + */ + EList getEndedStepsRef(); + + /** + * + * + * @model kind="operation" + * @generated + */ + EList getValues(); + + /** + * + * + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getStartedStepsRef();'" + * @generated + */ + EList getStartedSteps(); + + /** + * + * + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getEndedStepsRef();'" + * @generated + */ + EList getEndedSteps(); } // SpecificState diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java index 576b70c5a..fd70ffa2b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java @@ -3,6 +3,7 @@ package base.States; import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import org.eclipse.emf.common.util.EList; /** * @@ -15,4 +16,12 @@ * @generated */ public interface SpecificTracedObject extends TracedObject> { + + /** + * + * + * @model kind="operation" + * @generated + */ + EList> getDimensionsInternal(); } // SpecificTracedObject diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java index b15cf3c7d..d0eb77af8 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java @@ -4,6 +4,8 @@ import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.emf.common.util.EList; + /** * * A representation of the model object 'Specific Value'. @@ -15,5 +17,13 @@ * @generated */ public interface SpecificValue extends Value { + /** + * + * + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList result = new org.eclipse.emf.common.util.BasicEList();\nresult.addAll(getStates());\nreturn result;'" + * @generated + */ + EList getStates(); } // SpecificValue diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java index 4f5f3ad10..2aa287d05 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java @@ -5,7 +5,9 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; /** * @@ -93,6 +95,24 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_STATE__VALUES = TracePackage.STATE__VALUES; + /** + * The feature id for the 'Started Steps Ref' reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STATE__STARTED_STEPS_REF = TracePackage.STATE_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Ended Steps Ref' reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STATE__ENDED_STEPS_REF = TracePackage.STATE_FEATURE_COUNT + 1; + /** * The number of structural features of the 'Specific State' class. * @@ -100,7 +120,34 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STATE_FEATURE_COUNT = TracePackage.STATE_FEATURE_COUNT + 0; + int SPECIFIC_STATE_FEATURE_COUNT = TracePackage.STATE_FEATURE_COUNT + 2; + + /** + * The operation id for the 'Get Values' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STATE___GET_VALUES = TracePackage.STATE_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Get Started Steps' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STATE___GET_STARTED_STEPS = TracePackage.STATE_OPERATION_COUNT + 1; + + /** + * The operation id for the 'Get Ended Steps' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STATE___GET_ENDED_STEPS = TracePackage.STATE_OPERATION_COUNT + 2; /** * The number of operations of the 'Specific State' class. @@ -109,7 +156,7 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 0; + int SPECIFIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 3; /** * The meta object id for the '{@link base.States.impl.SpecificValueImpl Specific Value}' class. @@ -139,6 +186,15 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_VALUE_FEATURE_COUNT = TracePackage.VALUE_FEATURE_COUNT + 0; + /** + * The operation id for the 'Get States' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_VALUE___GET_STATES = TracePackage.VALUE_OPERATION_COUNT + 0; + /** * The number of operations of the 'Specific Value' class. * @@ -146,7 +202,7 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_VALUE_OPERATION_COUNT = TracePackage.VALUE_OPERATION_COUNT + 0; + int SPECIFIC_VALUE_OPERATION_COUNT = TracePackage.VALUE_OPERATION_COUNT + 1; /** * The meta object id for the '{@link base.States.SpecificAttributeValue Specific Attribute Value}' class. @@ -176,6 +232,15 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_ATTRIBUTE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 0; + /** + * The operation id for the 'Get States' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ATTRIBUTE_VALUE___GET_STATES = SPECIFIC_VALUE___GET_STATES; + /** * The number of operations of the 'Specific Attribute Value' class. * @@ -250,6 +315,15 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_TRACED_OBJECT_FEATURE_COUNT = TracePackage.TRACED_OBJECT_FEATURE_COUNT + 0; + /** + * The operation id for the 'Get Dimensions Internal' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 0; + /** * The number of operations of the 'Specific Traced Object' class. * @@ -257,7 +331,7 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_TRACED_OBJECT_OPERATION_COUNT = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 0; + int SPECIFIC_TRACED_OBJECT_OPERATION_COUNT = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 1; /** * The meta object id for the '{@link base.States.SpecificReferenceValue Specific Reference Value}' class. @@ -287,6 +361,15 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_REFERENCE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 0; + /** + * The operation id for the 'Get States' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_REFERENCE_VALUE___GET_STATES = SPECIFIC_VALUE___GET_STATES; + /** * The number of operations of the 'Specific Reference Value' class. * @@ -307,6 +390,58 @@ public interface StatesPackage extends EPackage { */ EClass getSpecificState(); + /** + * Returns the meta object for the reference list '{@link base.States.SpecificState#getStartedStepsRef Started Steps Ref}'. + * + * + * @return the meta object for the reference list 'Started Steps Ref'. + * @see base.States.SpecificState#getStartedStepsRef() + * @see #getSpecificState() + * @generated + */ + EReference getSpecificState_StartedStepsRef(); + + /** + * Returns the meta object for the reference list '{@link base.States.SpecificState#getEndedStepsRef Ended Steps Ref}'. + * + * + * @return the meta object for the reference list 'Ended Steps Ref'. + * @see base.States.SpecificState#getEndedStepsRef() + * @see #getSpecificState() + * @generated + */ + EReference getSpecificState_EndedStepsRef(); + + /** + * Returns the meta object for the '{@link base.States.SpecificState#getValues() Get Values}' operation. + * + * + * @return the meta object for the 'Get Values' operation. + * @see base.States.SpecificState#getValues() + * @generated + */ + EOperation getSpecificState__GetValues(); + + /** + * Returns the meta object for the '{@link base.States.SpecificState#getStartedSteps() Get Started Steps}' operation. + * + * + * @return the meta object for the 'Get Started Steps' operation. + * @see base.States.SpecificState#getStartedSteps() + * @generated + */ + EOperation getSpecificState__GetStartedSteps(); + + /** + * Returns the meta object for the '{@link base.States.SpecificState#getEndedSteps() Get Ended Steps}' operation. + * + * + * @return the meta object for the 'Get Ended Steps' operation. + * @see base.States.SpecificState#getEndedSteps() + * @generated + */ + EOperation getSpecificState__GetEndedSteps(); + /** * Returns the meta object for class '{@link base.States.SpecificAttributeValue Specific Attribute Value}'. * @@ -337,6 +472,16 @@ public interface StatesPackage extends EPackage { */ EClass getSpecificTracedObject(); + /** + * Returns the meta object for the '{@link base.States.SpecificTracedObject#getDimensionsInternal() Get Dimensions Internal}' operation. + * + * + * @return the meta object for the 'Get Dimensions Internal' operation. + * @see base.States.SpecificTracedObject#getDimensionsInternal() + * @generated + */ + EOperation getSpecificTracedObject__GetDimensionsInternal(); + /** * Returns the meta object for class '{@link base.States.SpecificReferenceValue Specific Reference Value}'. * @@ -357,6 +502,16 @@ public interface StatesPackage extends EPackage { */ EClass getSpecificValue(); + /** + * Returns the meta object for the '{@link base.States.SpecificValue#getStates() Get States}' operation. + * + * + * @return the meta object for the 'Get States' operation. + * @see base.States.SpecificValue#getStates() + * @generated + */ + EOperation getSpecificValue__GetStates(); + /** * Returns the factory that creates the instances of the model. * @@ -390,6 +545,46 @@ interface Literals { */ EClass SPECIFIC_STATE = eINSTANCE.getSpecificState(); + /** + * The meta object literal for the 'Started Steps Ref' reference list feature. + * + * + * @generated + */ + EReference SPECIFIC_STATE__STARTED_STEPS_REF = eINSTANCE.getSpecificState_StartedStepsRef(); + + /** + * The meta object literal for the 'Ended Steps Ref' reference list feature. + * + * + * @generated + */ + EReference SPECIFIC_STATE__ENDED_STEPS_REF = eINSTANCE.getSpecificState_EndedStepsRef(); + + /** + * The meta object literal for the 'Get Values' operation. + * + * + * @generated + */ + EOperation SPECIFIC_STATE___GET_VALUES = eINSTANCE.getSpecificState__GetValues(); + + /** + * The meta object literal for the 'Get Started Steps' operation. + * + * + * @generated + */ + EOperation SPECIFIC_STATE___GET_STARTED_STEPS = eINSTANCE.getSpecificState__GetStartedSteps(); + + /** + * The meta object literal for the 'Get Ended Steps' operation. + * + * + * @generated + */ + EOperation SPECIFIC_STATE___GET_ENDED_STEPS = eINSTANCE.getSpecificState__GetEndedSteps(); + /** * The meta object literal for the '{@link base.States.SpecificAttributeValue Specific Attribute Value}' class. * @@ -420,6 +615,14 @@ interface Literals { */ EClass SPECIFIC_TRACED_OBJECT = eINSTANCE.getSpecificTracedObject(); + /** + * The meta object literal for the 'Get Dimensions Internal' operation. + * + * + * @generated + */ + EOperation SPECIFIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = eINSTANCE.getSpecificTracedObject__GetDimensionsInternal(); + /** * The meta object literal for the '{@link base.States.SpecificReferenceValue Specific Reference Value}' class. * @@ -440,6 +643,14 @@ interface Literals { */ EClass SPECIFIC_VALUE = eINSTANCE.getSpecificValue(); + /** + * The meta object literal for the 'Get States' operation. + * + * + * @generated + */ + EOperation SPECIFIC_VALUE___GET_STATES = eINSTANCE.getSpecificValue__GetStates(); + } } //StatesPackage diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java index c60b8c6ec..08dcbe0b1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java @@ -7,19 +7,59 @@ import base.States.StatesPackage; import base.Steps.SpecificStep; +import base.Steps.StepsPackage; import fr.inria.diverse.trace.commons.model.trace.impl.StateImpl; +import java.lang.reflect.InvocationTargetException; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; /** * * An implementation of the model object 'Specific State'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link base.States.impl.SpecificStateImpl#getStartedStepsRef Started Steps Ref}
    • + *
  • {@link base.States.impl.SpecificStateImpl#getEndedStepsRef Ended Steps Ref}
    • + *
* * @generated */ public class SpecificStateImpl extends StateImpl implements SpecificState { + /** + * The cached value of the '{@link #getStartedStepsRef() Started Steps Ref}' reference list. + * + * + * @see #getStartedStepsRef() + * @generated + * @ordered + */ + protected EList startedStepsRef; + + /** + * The cached value of the '{@link #getEndedStepsRef() Ended Steps Ref}' reference list. + * + * + * @see #getEndedStepsRef() + * @generated + * @ordered + */ + protected EList endedStepsRef; + /** * * @@ -39,4 +79,166 @@ protected EClass eStaticClass() { return StatesPackage.Literals.SPECIFIC_STATE; } + /** + * + * + * @generated + */ + public EList getStartedStepsRef() { + if (startedStepsRef == null) { + startedStepsRef = new EObjectWithInverseResolvingEList(SpecificStep.class, this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF); + } + return startedStepsRef; + } + + /** + * + * + * @generated + */ + public EList getEndedStepsRef() { + if (endedStepsRef == null) { + endedStepsRef = new EObjectWithInverseResolvingEList(SpecificStep.class, this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF); + } + return endedStepsRef; + } + + /** + * + * + * @generated + */ + public EList getStartedSteps() { + return getStartedStepsRef(); + } + + /** + * + * + * @generated + */ + public EList getEndedSteps() { + return getEndedStepsRef(); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: + return ((InternalEList)(InternalEList)getStartedStepsRef()).basicAdd(otherEnd, msgs); + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: + return ((InternalEList)(InternalEList)getEndedStepsRef()).basicAdd(otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: + return ((InternalEList)getStartedStepsRef()).basicRemove(otherEnd, msgs); + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: + return ((InternalEList)getEndedStepsRef()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: + return getStartedStepsRef(); + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: + return getEndedStepsRef(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: + getStartedStepsRef().clear(); + getStartedStepsRef().addAll((Collection)newValue); + return; + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: + getEndedStepsRef().clear(); + getEndedStepsRef().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: + getStartedStepsRef().clear(); + return; + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: + getEndedStepsRef().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: + return startedStepsRef != null && !startedStepsRef.isEmpty(); + case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: + return endedStepsRef != null && !endedStepsRef.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case StatesPackage.SPECIFIC_STATE___GET_STARTED_STEPS: + return getStartedSteps(); + case StatesPackage.SPECIFIC_STATE___GET_ENDED_STEPS: + return getEndedSteps(); + } + return super.eInvoke(operationID, arguments); + } + } //SpecificStateImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java index c73921613..b70053bf8 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java @@ -7,13 +7,8 @@ import base.States.StatesPackage; import fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl; - -import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.util.EObjectContainmentEList; - /** * * An implementation of the model object 'Specific Traced Object'. @@ -41,18 +36,4 @@ protected EClass eStaticClass() { return StatesPackage.Literals.SPECIFIC_TRACED_OBJECT; } - /** - * - * - * This is specialized for the more specific element type known in this context. - * @generated - */ - @Override - public EList> getDimensions() { - if (dimensions == null) { - dimensions = new EObjectContainmentEList>(SpecificDimension.class, this, StatesPackage.SPECIFIC_TRACED_OBJECT__DIMENSIONS); - } - return dimensions; - } - } //SpecificTracedObjectImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java index 1ef5f4666..5640f3914 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java @@ -8,6 +8,10 @@ import fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl; +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; /** @@ -37,4 +41,29 @@ protected EClass eStaticClass() { return StatesPackage.Literals.SPECIFIC_VALUE; } + /** + * + * + * @generated + */ + public EList getStates() { + final EList result = new org.eclipse.emf.common.util.BasicEList(); + result.addAll(getStates()); + return result; + } + + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case StatesPackage.SPECIFIC_VALUE___GET_STATES: + return getStates(); + } + return super.eInvoke(operationID, arguments); + } + } //SpecificValueImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java index 49d0065c3..4c621cf55 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java @@ -23,7 +23,9 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.ETypeParameter; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -158,6 +160,51 @@ public EClass getSpecificState() { return specificStateEClass; } + /** + * + * + * @generated + */ + public EReference getSpecificState_StartedStepsRef() { + return (EReference)specificStateEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getSpecificState_EndedStepsRef() { + return (EReference)specificStateEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EOperation getSpecificState__GetValues() { + return specificStateEClass.getEOperations().get(0); + } + + /** + * + * + * @generated + */ + public EOperation getSpecificState__GetStartedSteps() { + return specificStateEClass.getEOperations().get(1); + } + + /** + * + * + * @generated + */ + public EOperation getSpecificState__GetEndedSteps() { + return specificStateEClass.getEOperations().get(2); + } + /** * * @@ -185,6 +232,15 @@ public EClass getSpecificTracedObject() { return specificTracedObjectEClass; } + /** + * + * + * @generated + */ + public EOperation getSpecificTracedObject__GetDimensionsInternal() { + return specificTracedObjectEClass.getEOperations().get(0); + } + /** * * @@ -203,6 +259,15 @@ public EClass getSpecificValue() { return specificValueEClass; } + /** + * + * + * @generated + */ + public EOperation getSpecificValue__GetStates() { + return specificValueEClass.getEOperations().get(0); + } + /** * * @@ -232,16 +297,23 @@ public void createPackageContents() { // Create classes and their features specificStateEClass = createEClass(SPECIFIC_STATE); + createEReference(specificStateEClass, SPECIFIC_STATE__STARTED_STEPS_REF); + createEReference(specificStateEClass, SPECIFIC_STATE__ENDED_STEPS_REF); + createEOperation(specificStateEClass, SPECIFIC_STATE___GET_VALUES); + createEOperation(specificStateEClass, SPECIFIC_STATE___GET_STARTED_STEPS); + createEOperation(specificStateEClass, SPECIFIC_STATE___GET_ENDED_STEPS); specificAttributeValueEClass = createEClass(SPECIFIC_ATTRIBUTE_VALUE); specificDimensionEClass = createEClass(SPECIFIC_DIMENSION); specificTracedObjectEClass = createEClass(SPECIFIC_TRACED_OBJECT); + createEOperation(specificTracedObjectEClass, SPECIFIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL); specificReferenceValueEClass = createEClass(SPECIFIC_REFERENCE_VALUE); specificValueEClass = createEClass(SPECIFIC_VALUE); + createEOperation(specificValueEClass, SPECIFIC_VALUE___GET_STATES); } /** @@ -306,6 +378,14 @@ public void initializePackageContents() { // Initialize classes, features, and operations; add parameters initEClass(specificStateEClass, SpecificState.class, "SpecificState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getSpecificState_StartedStepsRef(), theStepsPackage.getSpecificStep(), theStepsPackage.getSpecificStep_StartingStateRef(), "startedStepsRef", null, 0, -1, SpecificState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSpecificState_EndedStepsRef(), theStepsPackage.getSpecificStep(), theStepsPackage.getSpecificStep_EndingStateRef(), "endedStepsRef", null, 0, -1, SpecificState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEOperation(getSpecificState__GetValues(), this.getSpecificValue(), "getValues", 0, -1, IS_UNIQUE, IS_ORDERED); + + initEOperation(getSpecificState__GetStartedSteps(), theStepsPackage.getSpecificStep(), "getStartedSteps", 0, -1, IS_UNIQUE, IS_ORDERED); + + initEOperation(getSpecificState__GetEndedSteps(), theStepsPackage.getSpecificStep(), "getEndedSteps", 0, -1, IS_UNIQUE, IS_ORDERED); initEClass(specificAttributeValueEClass, SpecificAttributeValue.class, "SpecificAttributeValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -313,9 +393,17 @@ public void initializePackageContents() { initEClass(specificTracedObjectEClass, SpecificTracedObject.class, "SpecificTracedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + EOperation op = initEOperation(getSpecificTracedObject__GetDimensionsInternal(), null, "getDimensionsInternal", 0, -1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(this.getSpecificDimension()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + initEOperation(op, g1); + initEClass(specificReferenceValueEClass, SpecificReferenceValue.class, "SpecificReferenceValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(specificValueEClass, SpecificValue.class, "SpecificValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEOperation(getSpecificValue__GetStates(), this.getSpecificState(), "getStates", 0, -1, IS_UNIQUE, IS_ORDERED); } } //StatesPackageImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java new file mode 100644 index 000000000..0f89fb33b --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java @@ -0,0 +1,20 @@ +/** + */ +package base.Steps; + +import base.States.SpecificState; + +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; + +/** + * + * A representation of the model object 'Specific Root Step'. + * + * + * + * @see base.Steps.StepsPackage#getSpecificRootStep() + * @model + * @generated + */ +public interface SpecificRootStep extends SequentialStep, SpecificStep { +} // SpecificRootStep diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java index 8deba6a97..ecae39cb3 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java @@ -11,11 +11,109 @@ * A representation of the model object 'Specific Step'. * * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link base.Steps.SpecificStep#getStartingStateRef Starting State Ref}
    • + *
  • {@link base.Steps.SpecificStep#getEndingStateRef Ending State Ref}
    • + *
* * @see base.Steps.StepsPackage#getSpecificStep() - * @model interface="true" abstract="true" + * @model abstract="true" * @generated */ public interface SpecificStep extends Step { + /** + * Returns the value of the 'Starting State Ref' reference. + * It is bidirectional and its opposite is '{@link base.States.SpecificState#getStartedStepsRef Started Steps Ref}'. + * + *

+ * If the meaning of the 'Starting State Ref' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Starting State Ref' reference. + * @see #setStartingStateRef(SpecificState) + * @see base.Steps.StepsPackage#getSpecificStep_StartingStateRef() + * @see base.States.SpecificState#getStartedStepsRef + * @model opposite="startedStepsRef" required="true" + * @generated + */ + SpecificState getStartingStateRef(); + + /** + * Sets the value of the '{@link base.Steps.SpecificStep#getStartingStateRef Starting State Ref}' reference. + * + * + * @param value the new value of the 'Starting State Ref' reference. + * @see #getStartingStateRef() + * @generated + */ + void setStartingStateRef(SpecificState value); + + /** + * Returns the value of the 'Ending State Ref' reference. + * It is bidirectional and its opposite is '{@link base.States.SpecificState#getEndedStepsRef Ended Steps Ref}'. + * + *

+ * If the meaning of the 'Ending State Ref' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Ending State Ref' reference. + * @see #setEndingStateRef(SpecificState) + * @see base.Steps.StepsPackage#getSpecificStep_EndingStateRef() + * @see base.States.SpecificState#getEndedStepsRef + * @model opposite="endedStepsRef" + * @generated + */ + SpecificState getEndingStateRef(); + + /** + * Sets the value of the '{@link base.Steps.SpecificStep#getEndingStateRef Ending State Ref}' reference. + * + * + * @param value the new value of the 'Ending State Ref' reference. + * @see #getEndingStateRef() + * @generated + */ + void setEndingStateRef(SpecificState value); + + /** + * + * + * @model kind="operation" required="true" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getStartingStateRef();'" + * @generated + */ + SpecificState getStartingState(); + + /** + * + * + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getEndingStateRef();'" + * @generated + */ + SpecificState getEndingState(); + + /** + * + * + * @model required="true" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return basicGetStartingStateRef();'" + * @generated + */ + SpecificState basicGetStartingState(); + + /** + * + * + * @model required="true" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return basicGetEndingStateRef();'" + * @generated + */ + SpecificState basicGetEndingState(); } // SpecificStep diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsFactory.java index edba82266..90de14729 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsFactory.java @@ -30,6 +30,15 @@ public interface StepsFactory extends EFactory { */ RootImplicitStep createRootImplicitStep(); + /** + * Returns a new object of class 'Specific Root Step'. + * + * + * @return a new object of class 'Specific Root Step'. + * @generated + */ + SpecificRootStep createSpecificRootStep(); + /** * Returns the package supported by this factory. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java index cfeec778a..9451cab87 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java @@ -5,7 +5,9 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; /** * @@ -57,10 +59,10 @@ public interface StepsPackage extends EPackage { StepsPackage eINSTANCE = base.Steps.impl.StepsPackageImpl.init(); /** - * The meta object id for the '{@link base.Steps.SpecificStep Specific Step}' class. + * The meta object id for the '{@link base.Steps.impl.SpecificStepImpl Specific Step}' class. * * - * @see base.Steps.SpecificStep + * @see base.Steps.impl.SpecificStepImpl * @see base.Steps.impl.StepsPackageImpl#getSpecificStep() * @generated */ @@ -93,6 +95,24 @@ public interface StepsPackage extends EPackage { */ int SPECIFIC_STEP__ENDING_STATE = TracePackage.STEP__ENDING_STATE; + /** + * The feature id for the 'Starting State Ref' reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP__STARTING_STATE_REF = TracePackage.STEP_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Ending State Ref' reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP__ENDING_STATE_REF = TracePackage.STEP_FEATURE_COUNT + 1; + /** * The number of structural features of the 'Specific Step' class. * @@ -100,7 +120,43 @@ public interface StepsPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STEP_FEATURE_COUNT = TracePackage.STEP_FEATURE_COUNT + 0; + int SPECIFIC_STEP_FEATURE_COUNT = TracePackage.STEP_FEATURE_COUNT + 2; + + /** + * The operation id for the 'Get Starting State' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP___GET_STARTING_STATE = TracePackage.STEP_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Get Ending State' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP___GET_ENDING_STATE = TracePackage.STEP_OPERATION_COUNT + 1; + + /** + * The operation id for the 'Basic Get Starting State' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP___BASIC_GET_STARTING_STATE = TracePackage.STEP_OPERATION_COUNT + 2; + + /** + * The operation id for the 'Basic Get Ending State' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_STEP___BASIC_GET_ENDING_STATE = TracePackage.STEP_OPERATION_COUNT + 3; /** * The number of operations of the 'Specific Step' class. @@ -109,7 +165,7 @@ public interface StepsPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STEP_OPERATION_COUNT = TracePackage.STEP_OPERATION_COUNT + 0; + int SPECIFIC_STEP_OPERATION_COUNT = TracePackage.STEP_OPERATION_COUNT + 4; /** * The meta object id for the '{@link base.Steps.impl.RootImplicitStepImpl Root Implicit Step}' class. @@ -166,6 +222,124 @@ public interface StepsPackage extends EPackage { */ int ROOT_IMPLICIT_STEP_OPERATION_COUNT = TracePackage.SMALL_STEP_OPERATION_COUNT + 0; + /** + * The meta object id for the '{@link base.Steps.impl.SpecificRootStepImpl Specific Root Step}' class. + * + * + * @see base.Steps.impl.SpecificRootStepImpl + * @see base.Steps.impl.StepsPackageImpl#getSpecificRootStep() + * @generated + */ + int SPECIFIC_ROOT_STEP = 2; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP__MSEOCCURRENCE = TracePackage.SEQUENTIAL_STEP__MSEOCCURRENCE; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP__STARTING_STATE = TracePackage.SEQUENTIAL_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP__ENDING_STATE = TracePackage.SEQUENTIAL_STEP__ENDING_STATE; + + /** + * The feature id for the 'Sub Steps' containment reference list. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP__SUB_STEPS = TracePackage.SEQUENTIAL_STEP__SUB_STEPS; + + /** + * The feature id for the 'Starting State Ref' reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP__STARTING_STATE_REF = TracePackage.SEQUENTIAL_STEP_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Ending State Ref' reference. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP__ENDING_STATE_REF = TracePackage.SEQUENTIAL_STEP_FEATURE_COUNT + 1; + + /** + * The number of structural features of the 'Specific Root Step' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP_FEATURE_COUNT = TracePackage.SEQUENTIAL_STEP_FEATURE_COUNT + 2; + + /** + * The operation id for the 'Get Starting State' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP___GET_STARTING_STATE = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Get Ending State' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP___GET_ENDING_STATE = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 1; + + /** + * The operation id for the 'Basic Get Starting State' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP___BASIC_GET_STARTING_STATE = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 2; + + /** + * The operation id for the 'Basic Get Ending State' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP___BASIC_GET_ENDING_STATE = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 3; + + /** + * The number of operations of the 'Specific Root Step' class. + * + * + * @generated + * @ordered + */ + int SPECIFIC_ROOT_STEP_OPERATION_COUNT = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 4; + /** * Returns the meta object for class '{@link base.Steps.SpecificStep Specific Step}'. @@ -177,6 +351,68 @@ public interface StepsPackage extends EPackage { */ EClass getSpecificStep(); + /** + * Returns the meta object for the reference '{@link base.Steps.SpecificStep#getStartingStateRef Starting State Ref}'. + * + * + * @return the meta object for the reference 'Starting State Ref'. + * @see base.Steps.SpecificStep#getStartingStateRef() + * @see #getSpecificStep() + * @generated + */ + EReference getSpecificStep_StartingStateRef(); + + /** + * Returns the meta object for the reference '{@link base.Steps.SpecificStep#getEndingStateRef Ending State Ref}'. + * + * + * @return the meta object for the reference 'Ending State Ref'. + * @see base.Steps.SpecificStep#getEndingStateRef() + * @see #getSpecificStep() + * @generated + */ + EReference getSpecificStep_EndingStateRef(); + + /** + * Returns the meta object for the '{@link base.Steps.SpecificStep#getStartingState() Get Starting State}' operation. + * + * + * @return the meta object for the 'Get Starting State' operation. + * @see base.Steps.SpecificStep#getStartingState() + * @generated + */ + EOperation getSpecificStep__GetStartingState(); + + /** + * Returns the meta object for the '{@link base.Steps.SpecificStep#getEndingState() Get Ending State}' operation. + * + * + * @return the meta object for the 'Get Ending State' operation. + * @see base.Steps.SpecificStep#getEndingState() + * @generated + */ + EOperation getSpecificStep__GetEndingState(); + + /** + * Returns the meta object for the '{@link base.Steps.SpecificStep#basicGetStartingState() Basic Get Starting State}' operation. + * + * + * @return the meta object for the 'Basic Get Starting State' operation. + * @see base.Steps.SpecificStep#basicGetStartingState() + * @generated + */ + EOperation getSpecificStep__BasicGetStartingState(); + + /** + * Returns the meta object for the '{@link base.Steps.SpecificStep#basicGetEndingState() Basic Get Ending State}' operation. + * + * + * @return the meta object for the 'Basic Get Ending State' operation. + * @see base.Steps.SpecificStep#basicGetEndingState() + * @generated + */ + EOperation getSpecificStep__BasicGetEndingState(); + /** * Returns the meta object for class '{@link base.Steps.RootImplicitStep Root Implicit Step}'. * @@ -187,6 +423,16 @@ public interface StepsPackage extends EPackage { */ EClass getRootImplicitStep(); + /** + * Returns the meta object for class '{@link base.Steps.SpecificRootStep Specific Root Step}'. + * + * + * @return the meta object for class 'Specific Root Step'. + * @see base.Steps.SpecificRootStep + * @generated + */ + EClass getSpecificRootStep(); + /** * Returns the factory that creates the instances of the model. * @@ -211,15 +457,63 @@ public interface StepsPackage extends EPackage { */ interface Literals { /** - * The meta object literal for the '{@link base.Steps.SpecificStep Specific Step}' class. + * The meta object literal for the '{@link base.Steps.impl.SpecificStepImpl Specific Step}' class. * * - * @see base.Steps.SpecificStep + * @see base.Steps.impl.SpecificStepImpl * @see base.Steps.impl.StepsPackageImpl#getSpecificStep() * @generated */ EClass SPECIFIC_STEP = eINSTANCE.getSpecificStep(); + /** + * The meta object literal for the 'Starting State Ref' reference feature. + * + * + * @generated + */ + EReference SPECIFIC_STEP__STARTING_STATE_REF = eINSTANCE.getSpecificStep_StartingStateRef(); + + /** + * The meta object literal for the 'Ending State Ref' reference feature. + * + * + * @generated + */ + EReference SPECIFIC_STEP__ENDING_STATE_REF = eINSTANCE.getSpecificStep_EndingStateRef(); + + /** + * The meta object literal for the 'Get Starting State' operation. + * + * + * @generated + */ + EOperation SPECIFIC_STEP___GET_STARTING_STATE = eINSTANCE.getSpecificStep__GetStartingState(); + + /** + * The meta object literal for the 'Get Ending State' operation. + * + * + * @generated + */ + EOperation SPECIFIC_STEP___GET_ENDING_STATE = eINSTANCE.getSpecificStep__GetEndingState(); + + /** + * The meta object literal for the 'Basic Get Starting State' operation. + * + * + * @generated + */ + EOperation SPECIFIC_STEP___BASIC_GET_STARTING_STATE = eINSTANCE.getSpecificStep__BasicGetStartingState(); + + /** + * The meta object literal for the 'Basic Get Ending State' operation. + * + * + * @generated + */ + EOperation SPECIFIC_STEP___BASIC_GET_ENDING_STATE = eINSTANCE.getSpecificStep__BasicGetEndingState(); + /** * The meta object literal for the '{@link base.Steps.impl.RootImplicitStepImpl Root Implicit Step}' class. * @@ -230,6 +524,16 @@ interface Literals { */ EClass ROOT_IMPLICIT_STEP = eINSTANCE.getRootImplicitStep(); + /** + * The meta object literal for the '{@link base.Steps.impl.SpecificRootStepImpl Specific Root Step}' class. + * + * + * @see base.Steps.impl.SpecificRootStepImpl + * @see base.Steps.impl.StepsPackageImpl#getSpecificRootStep() + * @generated + */ + EClass SPECIFIC_ROOT_STEP = eINSTANCE.getSpecificRootStep(); + } } //StepsPackage diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java new file mode 100644 index 000000000..2f0c1f3eb --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java @@ -0,0 +1,415 @@ +/** + */ +package base.Steps.impl; + +import base.States.SpecificState; +import base.States.StatesPackage; + +import base.Steps.SpecificRootStep; +import base.Steps.SpecificStep; +import base.Steps.StepsPackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl; + +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Specific Root Step'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link base.Steps.impl.SpecificRootStepImpl#getStartingStateRef Starting State Ref}
    • + *
  • {@link base.Steps.impl.SpecificRootStepImpl#getEndingStateRef Ending State Ref}
    • + *
+ * + * @generated + */ +public class SpecificRootStepImpl extends SequentialStepImpl implements SpecificRootStep { + /** + * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. + * + * + * @see #getStartingStateRef() + * @generated + * @ordered + */ + protected SpecificState startingStateRef; + + /** + * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. + * + * + * @see #getEndingStateRef() + * @generated + * @ordered + */ + protected SpecificState endingStateRef; + + /** + * + * + * @generated + */ + protected SpecificRootStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return StepsPackage.Literals.SPECIFIC_ROOT_STEP; + } + + /** + * + * + * @generated + */ + public SpecificState getStartingStateRef() { + if (startingStateRef != null && startingStateRef.eIsProxy()) { + InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; + startingStateRef = (SpecificState)eResolveProxy(oldStartingStateRef); + if (startingStateRef != oldStartingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); + } + } + return startingStateRef; + } + + /** + * + * + * @generated + */ + public SpecificState basicGetStartingStateRef() { + return startingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetStartingStateRef(SpecificState newStartingStateRef, NotificationChain msgs) { + SpecificState oldStartingStateRef = startingStateRef; + startingStateRef = newStartingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setStartingStateRef(SpecificState newStartingStateRef) { + if (newStartingStateRef != startingStateRef) { + NotificationChain msgs = null; + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); + if (newStartingStateRef != null) + msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); + msgs = basicSetStartingStateRef(newStartingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); + } + + /** + * + * + * @generated + */ + public SpecificState getEndingStateRef() { + if (endingStateRef != null && endingStateRef.eIsProxy()) { + InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; + endingStateRef = (SpecificState)eResolveProxy(oldEndingStateRef); + if (endingStateRef != oldEndingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); + } + } + return endingStateRef; + } + + /** + * + * + * @generated + */ + public SpecificState basicGetEndingStateRef() { + return endingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetEndingStateRef(SpecificState newEndingStateRef, NotificationChain msgs) { + SpecificState oldEndingStateRef = endingStateRef; + endingStateRef = newEndingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setEndingStateRef(SpecificState newEndingStateRef) { + if (newEndingStateRef != endingStateRef) { + NotificationChain msgs = null; + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); + if (newEndingStateRef != null) + msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); + msgs = basicSetEndingStateRef(newEndingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); + } + + /** + * + * + * @generated + */ + public SpecificState getStartingState() { + return getStartingStateRef(); + } + + /** + * + * + * @generated + */ + public SpecificState getEndingState() { + return getEndingStateRef(); + } + + /** + * + * + * @generated + */ + public SpecificState basicGetStartingState() { + return basicGetStartingStateRef(); + } + + /** + * + * + * @generated + */ + public SpecificState basicGetEndingState() { + return basicGetEndingStateRef(); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); + return basicSetStartingStateRef((SpecificState)otherEnd, msgs); + case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); + return basicSetEndingStateRef((SpecificState)otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: + return basicSetStartingStateRef(null, msgs); + case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: + return basicSetEndingStateRef(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: + if (resolve) return getStartingStateRef(); + return basicGetStartingStateRef(); + case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: + if (resolve) return getEndingStateRef(); + return basicGetEndingStateRef(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: + setStartingStateRef((SpecificState)newValue); + return; + case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: + setEndingStateRef((SpecificState)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: + setStartingStateRef((SpecificState)null); + return; + case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: + setEndingStateRef((SpecificState)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: + return startingStateRef != null; + case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: + return endingStateRef != null; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { + if (baseClass == SpecificStep.class) { + switch (derivedFeatureID) { + case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: return StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF; + case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: return StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF; + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { + if (baseClass == SpecificStep.class) { + switch (baseFeatureID) { + case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: return StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF; + case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: return StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public int eDerivedOperationID(int baseOperationID, Class baseClass) { + if (baseClass == SpecificStep.class) { + switch (baseOperationID) { + case StepsPackage.SPECIFIC_STEP___GET_STARTING_STATE: return StepsPackage.SPECIFIC_ROOT_STEP___GET_STARTING_STATE; + case StepsPackage.SPECIFIC_STEP___GET_ENDING_STATE: return StepsPackage.SPECIFIC_ROOT_STEP___GET_ENDING_STATE; + case StepsPackage.SPECIFIC_STEP___BASIC_GET_STARTING_STATE: return StepsPackage.SPECIFIC_ROOT_STEP___BASIC_GET_STARTING_STATE; + case StepsPackage.SPECIFIC_STEP___BASIC_GET_ENDING_STATE: return StepsPackage.SPECIFIC_ROOT_STEP___BASIC_GET_ENDING_STATE; + default: return -1; + } + } + return super.eDerivedOperationID(baseOperationID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case StepsPackage.SPECIFIC_ROOT_STEP___GET_STARTING_STATE: + return getStartingState(); + case StepsPackage.SPECIFIC_ROOT_STEP___GET_ENDING_STATE: + return getEndingState(); + case StepsPackage.SPECIFIC_ROOT_STEP___BASIC_GET_STARTING_STATE: + return basicGetStartingState(); + case StepsPackage.SPECIFIC_ROOT_STEP___BASIC_GET_ENDING_STATE: + return basicGetEndingState(); + } + return super.eInvoke(operationID, arguments); + } + +} //SpecificRootStepImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java new file mode 100644 index 000000000..2d2647bcd --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java @@ -0,0 +1,383 @@ +/** + */ +package base.Steps.impl; + +import base.States.SpecificState; +import base.States.StatesPackage; + +import base.Steps.SpecificStep; +import base.Steps.StepsPackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.StepImpl; + +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Specific Step'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link base.Steps.impl.SpecificStepImpl#getStartingStateRef Starting State Ref}
    • + *
  • {@link base.Steps.impl.SpecificStepImpl#getEndingStateRef Ending State Ref}
    • + *
+ * + * @generated + */ +public abstract class SpecificStepImpl extends StepImpl implements SpecificStep { + /** + * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. + * + * + * @see #getStartingStateRef() + * @generated + * @ordered + */ + protected SpecificState startingStateRef; + + /** + * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. + * + * + * @see #getEndingStateRef() + * @generated + * @ordered + */ + protected SpecificState endingStateRef; + + /** + * + * + * @generated + */ + protected SpecificStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return StepsPackage.Literals.SPECIFIC_STEP; + } + + /** + * + * + * This is specialized for the more specific type known in this context. + * @generated + */ + @Override + public void setStartingState(SpecificState newStartingState) { + super.setStartingState(newStartingState); + } + + /** + * + * + * This is specialized for the more specific type known in this context. + * @generated + */ + @Override + public void setEndingState(SpecificState newEndingState) { + super.setEndingState(newEndingState); + } + + /** + * + * + * @generated + */ + public SpecificState getStartingStateRef() { + if (startingStateRef != null && startingStateRef.eIsProxy()) { + InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; + startingStateRef = (SpecificState)eResolveProxy(oldStartingStateRef); + if (startingStateRef != oldStartingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); + } + } + return startingStateRef; + } + + /** + * + * + * @generated + */ + public SpecificState basicGetStartingStateRef() { + return startingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetStartingStateRef(SpecificState newStartingStateRef, NotificationChain msgs) { + SpecificState oldStartingStateRef = startingStateRef; + startingStateRef = newStartingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setStartingStateRef(SpecificState newStartingStateRef) { + if (newStartingStateRef != startingStateRef) { + NotificationChain msgs = null; + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); + if (newStartingStateRef != null) + msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); + msgs = basicSetStartingStateRef(newStartingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); + } + + /** + * + * + * @generated + */ + public SpecificState getEndingStateRef() { + if (endingStateRef != null && endingStateRef.eIsProxy()) { + InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; + endingStateRef = (SpecificState)eResolveProxy(oldEndingStateRef); + if (endingStateRef != oldEndingStateRef) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); + } + } + return endingStateRef; + } + + /** + * + * + * @generated + */ + public SpecificState basicGetEndingStateRef() { + return endingStateRef; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetEndingStateRef(SpecificState newEndingStateRef, NotificationChain msgs) { + SpecificState oldEndingStateRef = endingStateRef; + endingStateRef = newEndingStateRef; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setEndingStateRef(SpecificState newEndingStateRef) { + if (newEndingStateRef != endingStateRef) { + NotificationChain msgs = null; + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); + if (newEndingStateRef != null) + msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); + msgs = basicSetEndingStateRef(newEndingStateRef, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); + } + + /** + * + * + * @generated + */ + public SpecificState getStartingState() { + return getStartingStateRef(); + } + + /** + * + * + * @generated + */ + public SpecificState getEndingState() { + return getEndingStateRef(); + } + + /** + * + * + * @generated + */ + public SpecificState basicGetStartingState() { + return basicGetStartingStateRef(); + } + + /** + * + * + * @generated + */ + public SpecificState basicGetEndingState() { + return basicGetEndingStateRef(); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: + if (startingStateRef != null) + msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); + return basicSetStartingStateRef((SpecificState)otherEnd, msgs); + case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: + if (endingStateRef != null) + msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); + return basicSetEndingStateRef((SpecificState)otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: + return basicSetStartingStateRef(null, msgs); + case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: + return basicSetEndingStateRef(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: + if (resolve) return getStartingStateRef(); + return basicGetStartingStateRef(); + case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: + if (resolve) return getEndingStateRef(); + return basicGetEndingStateRef(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: + setStartingStateRef((SpecificState)newValue); + return; + case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: + setEndingStateRef((SpecificState)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: + setStartingStateRef((SpecificState)null); + return; + case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: + setEndingStateRef((SpecificState)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: + return startingStateRef != null; + case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: + return endingStateRef != null; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case StepsPackage.SPECIFIC_STEP___GET_STARTING_STATE: + return getStartingState(); + case StepsPackage.SPECIFIC_STEP___GET_ENDING_STATE: + return getEndingState(); + case StepsPackage.SPECIFIC_STEP___BASIC_GET_STARTING_STATE: + return basicGetStartingState(); + case StepsPackage.SPECIFIC_STEP___BASIC_GET_ENDING_STATE: + return basicGetEndingState(); + } + return super.eInvoke(operationID, arguments); + } + +} //SpecificStepImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java index b1dd8baef..dfb863491 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java @@ -57,6 +57,7 @@ public StepsFactoryImpl() { public EObject create(EClass eClass) { switch (eClass.getClassifierID()) { case StepsPackage.ROOT_IMPLICIT_STEP: return createRootImplicitStep(); + case StepsPackage.SPECIFIC_ROOT_STEP: return createSpecificRootStep(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -72,6 +73,16 @@ public RootImplicitStep createRootImplicitStep() { return rootImplicitStep; } + /** + * + * + * @generated + */ + public SpecificRootStep createSpecificRootStep() { + SpecificRootStepImpl specificRootStep = new SpecificRootStepImpl(); + return specificRootStep; + } + /** * * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java index 94867da42..61bc32d71 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java @@ -9,6 +9,7 @@ import base.States.impl.StatesPackageImpl; import base.Steps.RootImplicitStep; +import base.Steps.SpecificRootStep; import base.Steps.SpecificStep; import base.Steps.StepsFactory; import base.Steps.StepsPackage; @@ -19,7 +20,9 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -44,6 +47,13 @@ public class StepsPackageImpl extends EPackageImpl implements StepsPackage { */ private EClass rootImplicitStepEClass = null; + /** + * + * + * @generated + */ + private EClass specificRootStepEClass = null; + /** * Creates an instance of the model Package, registered with * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package @@ -125,6 +135,60 @@ public EClass getSpecificStep() { return specificStepEClass; } + /** + * + * + * @generated + */ + public EReference getSpecificStep_StartingStateRef() { + return (EReference)specificStepEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getSpecificStep_EndingStateRef() { + return (EReference)specificStepEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EOperation getSpecificStep__GetStartingState() { + return specificStepEClass.getEOperations().get(0); + } + + /** + * + * + * @generated + */ + public EOperation getSpecificStep__GetEndingState() { + return specificStepEClass.getEOperations().get(1); + } + + /** + * + * + * @generated + */ + public EOperation getSpecificStep__BasicGetStartingState() { + return specificStepEClass.getEOperations().get(2); + } + + /** + * + * + * @generated + */ + public EOperation getSpecificStep__BasicGetEndingState() { + return specificStepEClass.getEOperations().get(3); + } + /** * * @@ -134,6 +198,15 @@ public EClass getRootImplicitStep() { return rootImplicitStepEClass; } + /** + * + * + * @generated + */ + public EClass getSpecificRootStep() { + return specificRootStepEClass; + } + /** * * @@ -163,8 +236,16 @@ public void createPackageContents() { // Create classes and their features specificStepEClass = createEClass(SPECIFIC_STEP); + createEReference(specificStepEClass, SPECIFIC_STEP__STARTING_STATE_REF); + createEReference(specificStepEClass, SPECIFIC_STEP__ENDING_STATE_REF); + createEOperation(specificStepEClass, SPECIFIC_STEP___GET_STARTING_STATE); + createEOperation(specificStepEClass, SPECIFIC_STEP___GET_ENDING_STATE); + createEOperation(specificStepEClass, SPECIFIC_STEP___BASIC_GET_STARTING_STATE); + createEOperation(specificStepEClass, SPECIFIC_STEP___BASIC_GET_ENDING_STATE); rootImplicitStepEClass = createEClass(ROOT_IMPLICIT_STEP); + + specificRootStepEClass = createEClass(SPECIFIC_ROOT_STEP); } /** @@ -207,11 +288,31 @@ public void initializePackageContents() { g2 = createEGenericType(theStatesPackage.getSpecificState()); g1.getETypeArguments().add(g2); rootImplicitStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theTracePackage.getSequentialStep()); + g2 = createEGenericType(this.getSpecificStep()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(theStatesPackage.getSpecificState()); + g1.getETypeArguments().add(g2); + specificRootStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(this.getSpecificStep()); + specificRootStepEClass.getEGenericSuperTypes().add(g1); // Initialize classes, features, and operations; add parameters - initEClass(specificStepEClass, SpecificStep.class, "SpecificStep", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(specificStepEClass, SpecificStep.class, "SpecificStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getSpecificStep_StartingStateRef(), theStatesPackage.getSpecificState(), theStatesPackage.getSpecificState_StartedStepsRef(), "startingStateRef", null, 1, 1, SpecificStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSpecificStep_EndingStateRef(), theStatesPackage.getSpecificState(), theStatesPackage.getSpecificState_EndedStepsRef(), "endingStateRef", null, 0, 1, SpecificStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEOperation(getSpecificStep__GetStartingState(), theStatesPackage.getSpecificState(), "getStartingState", 1, 1, IS_UNIQUE, IS_ORDERED); + + initEOperation(getSpecificStep__GetEndingState(), theStatesPackage.getSpecificState(), "getEndingState", 0, 1, IS_UNIQUE, IS_ORDERED); + + initEOperation(getSpecificStep__BasicGetStartingState(), theStatesPackage.getSpecificState(), "basicGetStartingState", 1, 1, IS_UNIQUE, IS_ORDERED); + + initEOperation(getSpecificStep__BasicGetEndingState(), theStatesPackage.getSpecificState(), "basicGetEndingState", 1, 1, IS_UNIQUE, IS_ORDERED); initEClass(rootImplicitStepEClass, RootImplicitStep.class, "RootImplicitStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(specificRootStepEClass, SpecificRootStep.class, "SpecificRootStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); } } //StepsPackageImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java index 8dc3dfb9a..54e4a441e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java @@ -4,6 +4,8 @@ import base.Steps.*; +import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.SmallStep; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; @@ -80,6 +82,10 @@ public Adapter caseRootImplicitStep(RootImplicitStep object) { return createRootImplicitStepAdapter(); } @Override + public Adapter caseSpecificRootStep(SpecificRootStep object) { + return createSpecificRootStepAdapter(); + } + @Override public > Adapter caseStep(Step object) { return createStepAdapter(); } @@ -88,6 +94,14 @@ public Adapter caseRootImplicitStep(RootImplicitStep object) { return createSmallStepAdapter(); } @Override + public , StateSubType extends State> Adapter caseBigStep(BigStep object) { + return createBigStepAdapter(); + } + @Override + public , StateSubType extends State> Adapter caseSequentialStep(SequentialStep object) { + return createSequentialStepAdapter(); + } + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); } @@ -135,6 +149,20 @@ public Adapter createRootImplicitStepAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link base.Steps.SpecificRootStep Specific Root Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see base.Steps.SpecificRootStep + * @generated + */ + public Adapter createSpecificRootStepAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. * @@ -163,6 +191,34 @@ public Adapter createSmallStepAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.BigStep + * @generated + */ + public Adapter createBigStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep + * @generated + */ + public Adapter createSequentialStepAdapter() { + return null; + } + /** * Creates a new adapter for the default case. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java index 7cd6d79c5..b89fac621 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java @@ -4,6 +4,8 @@ import base.Steps.*; +import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.SmallStep; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; @@ -85,6 +87,16 @@ protected T doSwitch(int classifierID, EObject theEObject) { if (result == null) result = defaultCase(theEObject); return result; } + case StepsPackage.SPECIFIC_ROOT_STEP: { + SpecificRootStep specificRootStep = (SpecificRootStep)theEObject; + T result = caseSpecificRootStep(specificRootStep); + if (result == null) result = caseSequentialStep(specificRootStep); + if (result == null) result = caseSpecificStep(specificRootStep); + if (result == null) result = caseBigStep(specificRootStep); + if (result == null) result = caseStep(specificRootStep); + if (result == null) result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } @@ -119,6 +131,21 @@ public T caseRootImplicitStep(RootImplicitStep object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Specific Root Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Specific Root Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseSpecificRootStep(SpecificRootStep object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Step'. * @@ -149,6 +176,36 @@ public T caseRootImplicitStep(RootImplicitStep object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Big Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Big Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , StateSubType extends State> T caseBigStep(BigStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Sequential Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Sequential Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , StateSubType extends State> T caseSequentialStep(SequentialStep object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'EObject'. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java index 604cc5f1b..b48bd285d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java @@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -117,6 +118,15 @@ public EClass getSpecificTrace() { return specificTraceEClass; } + /** + * + * + * @generated + */ + public EOperation getSpecificTrace__GetTracedObjects() { + return specificTraceEClass.getEOperations().get(0); + } + /** * * @@ -146,6 +156,7 @@ public void createPackageContents() { // Create classes and their features specificTraceEClass = createEClass(SPECIFIC_TRACE); + createEOperation(specificTraceEClass, SPECIFIC_TRACE___GET_TRACED_OBJECTS); } /** @@ -213,6 +224,18 @@ public void initializePackageContents() { // Initialize classes, features, and operations; add parameters initEClass(specificTraceEClass, SpecificTrace.class, "SpecificTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + EOperation op = initEOperation(getSpecificTrace__GetTracedObjects(), null, "getTracedObjects", 0, -1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(theStatesPackage.getSpecificTracedObject()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g3 = createEGenericType(theStatesPackage.getSpecificDimension()); + g2.setEUpperBound(g3); + g4 = createEGenericType(); + g3.getETypeArguments().add(g4); + g5 = createEGenericType(theStatesPackage.getSpecificValue()); + g4.setEUpperBound(g5); + initEOperation(op, g1); + // Create resource createResource(eNS_URI); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java index 38f1b8821..0440971c6 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java @@ -15,7 +15,6 @@ import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl; - import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -62,20 +61,6 @@ public NotificationChain basicSetRootStep(SequentialStep - * - * This is specialized for the more specific element type known in this context. - * @generated - */ - @Override - public EList>> getTracedObjects() { - if (tracedObjects == null) { - tracedObjects = new EObjectContainmentEList>>(SpecificTracedObject.class, this, BasePackage.SPECIFIC_TRACE__TRACED_OBJECTS); - } - return tracedObjects; - } - /** * * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend index 58df67282..04c31d169 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend @@ -32,6 +32,7 @@ class TraceMMExplorer { @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificTracedObjectClass @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificDimensionClass @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificStepClass + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificRootStepClass @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificValueClass @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificAttributeValueClass @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) protected val EClass specificReferenceValueClass @@ -101,7 +102,12 @@ class TraceMMExplorer { c.name.equals(TraceMMStrings.class_Step) ] as EClass stepsPackage = specificStepClass.EPackage - + + // Find the SpecificRootStep class + specificRootStepClass = tracemm.eAllContents.filter(EClass).findFirst [ c | + c.name.equals(TraceMMStrings.class_RootStep) + ] as EClass + // Find the States package statesPackage = tracemm.eAllContents.filter(EPackage).findFirst [ p | p.name.equals(TraceMMStrings.package_States) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend index 4ac169416..8f4b63165 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend @@ -93,39 +93,6 @@ class TraceMMGenerator { stepsGen = new TraceMMGeneratorSteps(mmext, tracemmresult, traceability, traceMMExplorer, gemoc) stepsGen.process - - - // Link State -> Step class - val refState2StartedSteps = EcoreCraftingUtil.addReferenceToClass(traceMMExplorer.specificStateClass, - TraceMMStrings.ref_StateToStep_started, traceMMExplorer.specificStepClass) - refState2StartedSteps.ordered = true - refState2StartedSteps.unique = true - refState2StartedSteps.upperBound = -1 - refState2StartedSteps.lowerBound = 0 - - val refState2EndedSteps = EcoreCraftingUtil.addReferenceToClass(traceMMExplorer.specificStateClass, - TraceMMStrings.ref_StateToStep_ended, traceMMExplorer.specificStepClass) - refState2EndedSteps.ordered = true - refState2EndedSteps.unique = true - refState2EndedSteps.upperBound = -1 - refState2EndedSteps.lowerBound = 0 - - // Link Step -> State class - val refStep2StartingState = EcoreCraftingUtil.addReferenceToClass(traceMMExplorer.specificStepClass, - TraceMMStrings.ref_StepToState_starting, traceMMExplorer.specificStateClass) - refStep2StartingState.unique = true - refStep2StartingState.upperBound = 1 - refStep2StartingState.lowerBound = 1 - refStep2StartingState.EOpposite = refState2StartedSteps - refState2StartedSteps.EOpposite = refStep2StartingState - - val refStep2EndingState = EcoreCraftingUtil.addReferenceToClass(traceMMExplorer.specificStepClass, - TraceMMStrings.ref_StepToState_ending, traceMMExplorer.specificStateClass) - refStep2EndingState.unique = true - refStep2EndingState.upperBound = 1 - refStep2EndingState.lowerBound = 0 - refStep2EndingState.EOpposite = refState2EndedSteps - refState2EndedSteps.EOpposite = refStep2EndingState // Validation val results = Diagnostician.INSTANCE.validate(this.mmext); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index 0910f528e..b5dc421e5 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -22,7 +22,6 @@ import java.util.Map import java.util.Set import org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.EOperation import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature @@ -30,6 +29,7 @@ import org.eclipse.emf.ecore.EcoreFactory import org.eclipse.emf.ecore.util.EcoreUtil import static fr.inria.diverse.trace.commons.EcoreCraftingUtil.* +import org.eclipse.emf.ecore.EGenericType class TraceMMGeneratorStates { @@ -51,6 +51,7 @@ class TraceMMGeneratorStates { private val Set allNewEClasses private val Map runtimeClass2ClassExtension = new HashMap private val Set multipleOrig = new HashSet + private val List tracedClassGetters = new ArrayList private val List valuesGetters = new ArrayList new(Ecorext mmext, EPackage mm, TraceMMGenerationTraceability traceability, TraceMMExplorer traceMMExplorer, @@ -195,10 +196,26 @@ class TraceMMGeneratorStates { multipleOrig.addAll(concreteSuperTypes) } + val tracedClasses = new ArrayList // We go through all dynamic classes and we create traced versions of them // we sort them by name to ensure reproducibility of the generated ecore file for (runtimeClass : allRuntimeClasses.sortBy[name]) { - handleTraceClass(runtimeClass) + val tracedClass = handleTraceClass(runtimeClass) + tracedClasses.add(tracedClass) + } + + if (!tracedClassGetters.empty) { + val getTracedObjectsEOperation = traceMMExplorer.specificTraceClass.EOperations.findFirst[name == "getTracedObjects"] + val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation + getTracedObjectsEOperation.EAnnotations.add(bodyAnnotation) + bodyAnnotation.source = GenModelPackage.eNS_URI + bodyAnnotation.details.put("body", ''' + final EList>> result = new org.eclipse.emf.common.util.BasicEList<>(); + «FOR getter : tracedClassGetters» + result.addAll(«getter»); + «ENDFOR» + return result; + ''') } if (!valuesGetters.empty) { @@ -207,7 +224,7 @@ class TraceMMGeneratorStates { getValuesEOperation.EAnnotations.add(bodyAnnotation) bodyAnnotation.source = GenModelPackage.eNS_URI bodyAnnotation.details.put("body", ''' - final EList result = new org.eclipse.emf.common.util.BasicEList(); + final EList result = new org.eclipse.emf.common.util.BasicEList<>(); «FOR getter : valuesGetters» result.addAll(«getter»); «ENDFOR» @@ -286,8 +303,9 @@ class TraceMMGeneratorStates { // Link Trace class -> Traced class if (!tracedClass.abstract) { - val refTraceClassToTracedClass = addReferenceToClass(traceMMExplorer.specificTraceClass, - TraceMMStrings.ref_createTraceClassToTracedClass(tracedClass), tracedClass) + val refName = TraceMMStrings.ref_createTraceClassToTracedClass(tracedClass) + val refTraceClassToTracedClass = addReferenceToClass(traceMMExplorer.specificTraceClass, refName, tracedClass) + tracedClassGetters.add(EcoreCraftingUtil.stringGetter(refName)) refTraceClassToTracedClass.containment = true refTraceClassToTracedClass.ordered = false refTraceClassToTracedClass.unique = true @@ -315,6 +333,8 @@ class TraceMMGeneratorStates { if (!runtimeProperties.isEmpty) traceability.addRuntimeClass(runtimeClass) + val dimensionsGetters = new ArrayList + // We go through the runtime properties of this class for (runtimeProperty : runtimeProperties) { @@ -355,18 +375,6 @@ class TraceMMGeneratorStates { ExecutionMetamodelTraceability.createTraceabilityAnnotation(valueClass, ExecutionMetamodelTraceability.getTraceabilityAnnotationValue(runtimeProperty)) - // Adding the getStates operation - val EOperation getStatesEOperation = traceMMExplorer.specificValueClass.EOperations.findFirst[name == "getStates"] - val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation - getStatesEOperation.EAnnotations.add(bodyAnnotation) - bodyAnnotation.source = GenModelPackage.eNS_URI - bodyAnnotation.details.put("body", ''' - final EList result = new org.eclipse.emf.common.util.BasicEList(); - result.addAll(getStates()); - return result; - ''') - valueClass.EOperations.add(getStatesEOperation) - //------------ Dimension class val dimensionClass = EcoreFactory.eINSTANCE.createEClass dimensionClass.name = TraceMMStrings.class_createDimensionClassName(runtimeClass, runtimeProperty) @@ -385,6 +393,7 @@ class TraceMMGeneratorStates { dimensionRef.containment = true dimensionRef.lowerBound = 0 dimensionRef.upperBound = 1 + dimensionsGetters.add(EcoreCraftingUtil.stringGetter(dimensionRef)) traceability.putDimensionClass(runtimeProperty, dimensionClass) traceability.putDimensionRef(runtimeProperty, dimensionRef) @@ -410,6 +419,28 @@ class TraceMMGeneratorStates { refState2Global.EOpposite = refState2Value refState2Value.EOpposite = refState2Global } + + val getDimensionsEOperation = EcoreFactory.eINSTANCE.createEOperation + val genericType = EcoreFactory.eINSTANCE.createEGenericType + genericType.EClassifier = traceMMExplorer.specificDimensionClass + val typeBinding = EcoreFactory.eINSTANCE.createEGenericType + genericType.ETypeArguments.add(typeBinding) + getDimensionsEOperation.EGenericType = genericType + getDimensionsEOperation.lowerBound = 0 + getDimensionsEOperation.upperBound = -1 + getDimensionsEOperation.name = "getDimensionsInternal" + val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation + getDimensionsEOperation.EAnnotations.add(bodyAnnotation) + bodyAnnotation.source = GenModelPackage.eNS_URI + bodyAnnotation.details.put("body", ''' + final EList> result = new org.eclipse.emf.ecore.util.BasicInternalEList<>(); + «FOR getter : dimensionsGetters» + result.add(«getter»); + «ENDFOR» + return result; + ''') + tracedClass.EOperations.add(getDimensionsEOperation) + return tracedClass } else { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend index 1e426f0ac..483e85596 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend @@ -34,6 +34,8 @@ class TraceMMStrings { public static val String class_Step = "SpecificStep" + public static val String class_RootStep = "SpecificRootStep" + public static val String package_States = "States" public static val String package_Steps = "Steps" diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3ExecutionExtensionGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3ExecutionExtensionGenerator.xtend index c05532e76..70f70270f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3ExecutionExtensionGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3ExecutionExtensionGenerator.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plaink3.tracematerialextractor import org.eclipse.emf.ecore.EPackage diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend index ff86c5fc6..82efd3348 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package fr.inria.diverse.trace.plaink3.tracematerialextractor import ecorext.Ecorext diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend index c549acf71..dce46982f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend @@ -16,10 +16,8 @@ import fr.inria.diverse.trace.commons.ManifestUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerator import fr.inria.diverse.trace.plugin.generator.clean.StandaloneEMFProjectGenerator +import fr.inria.diverse.trace.plugin.generator.codegen.StateManagerGeneratorJava import fr.inria.diverse.trace.plugin.generator.codegen.TraceConstructorGeneratorJava -import fr.inria.diverse.trace.plugin.generator.codegen.TraceExplorerGeneratorJava -import fr.inria.diverse.trace.plugin.generator.codegen.TraceExtractorGeneratorJava -import fr.inria.diverse.trace.plugin.generator.codegen.TraceNotifierGeneratorJava import java.util.HashSet import java.util.Set import org.eclipse.core.resources.IProject @@ -65,6 +63,8 @@ class GenericTracePluginGenerator { @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) var String traceExplorerClassName @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + var String stateManagerClassName + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) var String traceExtractorClassName @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) var String traceNotifierClassName @@ -180,26 +180,30 @@ class GenericTracePluginGenerator { traceConstructorClassName = tconstructorgen.className packageFragment.createCompilationUnit(traceConstructorClassName + ".java", tconstructorgen.generateCode, true, m) - // Generate trace explorer - val TraceExplorerGeneratorJava texplorergen = new TraceExplorerGeneratorJava(languageName, - pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, - abstractSyntax, partialTraceManagement) - traceExplorerClassName = texplorergen.className - packageFragment.createCompilationUnit(traceExplorerClassName + ".java", texplorergen.generateCode, true, m) - - // Generate trace extractor - val TraceExtractorGeneratorJava textractorgen = new TraceExtractorGeneratorJava(languageName, - pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, - abstractSyntax, partialTraceManagement) - traceExtractorClassName = textractorgen.className - packageFragment.createCompilationUnit(traceExtractorClassName + ".java", textractorgen.generateCode, true, m) - - // Generate trace notifier - val TraceNotifierGeneratorJava tnotifiergen = new TraceNotifierGeneratorJava(languageName, - pluginName + ".tracemanager", tmmgenerator.traceability, referencedGenPackages) - traceNotifierClassName = tnotifiergen.className - packageFragment.createCompilationUnit(traceNotifierClassName + ".java", tnotifiergen.generateCode, true, m) - +// // Generate trace explorer +// val TraceExplorerGeneratorJava texplorergen = new TraceExplorerGeneratorJava(languageName, +// pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, +// abstractSyntax, partialTraceManagement) +// traceExplorerClassName = texplorergen.className +// packageFragment.createCompilationUnit(traceExplorerClassName + ".java", texplorergen.generateCode, true, m) + + // Generate state manager + val StateManagerGeneratorJava statemanagergem = new StateManagerGeneratorJava(languageName, + pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages) + stateManagerClassName = statemanagergem.className + packageFragment.createCompilationUnit(stateManagerClassName + ".java", statemanagergem.generateCode, true, m) + +// // Generate trace extractor +// val TraceExtractorGeneratorJava textractorgen = new TraceExtractorGeneratorJava(languageName, +// pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, +// abstractSyntax, partialTraceManagement) +// traceExtractorClassName = textractorgen.className +// packageFragment.createCompilationUnit(traceExtractorClassName + ".java", textractorgen.generateCode, true, m) + +// // Generate trace notifier +// val TraceNotifierGeneratorJava tnotifiergen = new TraceNotifierGeneratorJava(languageName, +// pluginName + ".tracemanager", tmmgenerator.traceability, referencedGenPackages) +// traceNotifierClassName = tnotifiergen.className +// packageFragment.createCompilationUnit(traceNotifierClassName + ".java", tnotifiergen.generateCode, true, m) } - } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend new file mode 100644 index 000000000..8ae22812f --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend @@ -0,0 +1,247 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package fr.inria.diverse.trace.plugin.generator.codegen + +import fr.inria.diverse.trace.commons.CodeGenUtil +import fr.inria.diverse.trace.commons.EcoreCraftingUtil +import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability +import java.util.HashSet +import java.util.Set +import org.eclipse.emf.codegen.ecore.genmodel.GenPackage +import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EClassifier +import org.eclipse.emf.ecore.EReference +import org.eclipse.emf.ecore.EStructuralFeature +import fr.inria.diverse.trace.metamodel.generator.TraceMMStrings +import ecorext.ClassExtension +import java.util.Collection +import org.eclipse.emf.ecore.EPackage + +class StateManagerGeneratorJava { + + // Inputs + private val String className + private val String packageQN + private val EPackage traceMM + private val TraceMMGenerationTraceability traceability + private val Set refGenPackages + + // Shortcuts + private val String stateFQN + + private boolean getTracedToExeUsed = false + + public def String getClassName() { + return className + } + + new(String languageName, String packageQN, EPackage traceMM, TraceMMGenerationTraceability traceability, Set refGenPackages) { + this.traceMM = traceMM + this.className = languageName.replaceAll(" ", "").toFirstUpper + "StateManager" + this.packageQN = packageQN + this.traceability = traceability + this.refGenPackages = refGenPackages + + stateFQN = getJavaFQN(traceability.traceMMExplorer.getSpecificStateClass) + } + + private def String getFQN(EStructuralFeature eFeature) { + return EcoreCraftingUtil.getBaseFQN(eFeature.EContainingClass) + "." + eFeature.name + } + + private def String getJavaFQN(EClassifier c) { + return getJavaFQN(c,false) + } + + private def String getJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { + return EcoreCraftingUtil.getJavaFQN(c,refGenPackages,enforcePrimitiveJavaClass) + } + + public def String generateCode() { + val String code = generateStateManagerClass() + try { + return CodeGenUtil.formatJavaCode(code) + } catch (Throwable t) { + return code + } + } + + private def String stringGetterExeValue(String javaVarName, EStructuralFeature p) { + return ''' + «IF (p instanceof EReference && traceability.hasTracedClass(p.EType as EClass))» + + ««« If many elements are in this fields, we have to cast the element with a collection + «IF p.many» + (Collection) + «ELSE» + («getJavaFQN(p.EType, true)») + «ENDIF» + «getTracedToExeMethodName»(«javaVarName».«EcoreCraftingUtil.stringGetter(p)») + «ELSE» + «javaVarName».«EcoreCraftingUtil.stringGetter(p)» + «ENDIF»''' + } + + private def Set getConcreteSubtypesTraceClassOf(EClass tracedClass) { + val Set result = new HashSet() + result.addAll(this.traceMM.eAllContents.filter(EClass).filter [ c | + !c.abstract && c.EAllSuperTypes.contains(tracedClass) + ].toSet) + if (!tracedClass.abstract) + result.add(tracedClass) + return result + } + + private def String getTracedToExeMethodName() { + getTracedToExeUsed = true + return "getTracedToExe" + } + + private def String generateImports() { + return + ''' + import java.util.ArrayList; + import java.util.Collection; + import java.util.Map; + + import org.eclipse.emf.ecore.EObject; + import org.eclipse.emf.ecore.resource.Resource; + import org.eclipse.emf.transaction.RecordingCommand; + import org.eclipse.emf.transaction.TransactionalEditingDomain; + import org.eclipse.emf.transaction.util.TransactionUtil; + import org.gemoc.executionframework.engine.core.CommandExecution; + + import fr.inria.diverse.trace.commons.model.trace.State; + import fr.inria.diverse.trace.gemoc.api.IStateManager; + ''' + } + + private def String generateFields() { + return + ''' + private final Resource modelResource; + + private final Map tracedToExe; + ''' + } + + private def String generateConstructors() { + return + ''' + public «className»(Resource modelResource, Map tracedToExe) { + this.modelResource = modelResource; + this.tracedToExe = tracedToExe; + } + ''' + } + + private def String generateMethods() { + return + ''' + @Override + public void restoreState(State state) { + if (modelResource != null && state instanceof «stateFQN») { + try { + final TransactionalEditingDomain ed = TransactionUtil.getEditingDomain(modelResource); + if (ed != null) { + final RecordingCommand command = new RecordingCommand(ed, "") { + protected void doExecute() { + restoreStateExecute((«stateFQN») state); + } + }; + CommandExecution.execute(ed, command); + } + } catch (Exception e) { + throw e; + } + } + } + + private EObject getTracedToExe(EObject tracedObject) { + return tracedToExe.get(tracedObject); + } + + private Collection getTracedToExe(Collection tracedObjects) { + Collection result = new ArrayList(); + for (EObject tracedObject : tracedObjects) { + result.add(tracedToExe.get(tracedObject)); + } + return result; + } + + @SuppressWarnings("unchecked") + private void restoreStateExecute(«stateFQN» state) { + «FOR p : traceability.allMutableProperties.sortBy[FQN]» + «val EReference pdimension = traceability.getDimensionRef(p)» + «val EClass stateClass = traceability.getValueClass(p)» + for («getJavaFQN(stateClass)» value : state.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createGlobalToState(stateClass))») { + final EObject parent = value.eContainer().eContainer(); + ««« Case in which we can use the "originalObject" reference and simply set its values + «IF p.eContainer instanceof ClassExtension» + ««« We have to test at runtime be can't know at design time the type of the object containing the property + ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. + «FOR concreteSubType : getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» + if (parent instanceof «getJavaFQN(concreteSubType)») { + «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» + «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; + «IF !origRefs.isEmpty» + «val EReference origRef = origRefs.get(0)» + «IF p.many» + «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; + originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); + originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value",p)»); + «ELSE» + «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p)»; + «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; + if (current != toset) { + ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; + } + «ENDIF» + «ENDIF» + } + «ENDFOR» + ««« Case in which we have to recreate/restore execution objects in the model + «ELSEIF p.eContainer instanceof EClass» + «getJavaFQN(p.EContainingClass)» exeObject = («getJavaFQN(p.EContainingClass)») «getTracedToExeMethodName»(parent); + «IF p.many» + exeObject.«EcoreCraftingUtil.stringGetter(p)».clear(); + «IF p instanceof EReference» + exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) «getTracedToExeMethodName»(value.«EcoreCraftingUtil.stringGetter(p)»)); + «ELSE» + exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) value.«EcoreCraftingUtil.stringGetter(p)»); + «ENDIF» + «ELSE» + exeObject.«EcoreCraftingUtil.stringSetter(p, stringGetterExeValue("value",p), refGenPackages)»; + «ENDIF» + «ENDIF» + } + «ENDFOR» + } + ''' + } + + private def String generateStateManagerClass() { + return + ''' + package «packageQN»; + + «generateImports» + + public class «className» implements IStateManager> { + + «generateFields» + «generateConstructors» + «generateMethods» + } + ''' + } + +} \ No newline at end of file diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 9ced396e0..4bb1a075a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -977,7 +977,7 @@ private def String generateAddStateUsingListenerMethods() { «IF gemoc» @SuppressWarnings("unchecked") @Override - public void addStep(fr.inria.diverse.trace.commons.model.trace.Step step) { + public void addStep(fr.inria.diverse.trace.commons.model.trace.Step step) { «specificStepFQN» step_cast = null; if (step != null && step instanceof «specificStepFQN») { step_cast = («specificStepFQN») step; @@ -989,11 +989,11 @@ private def String generateAddStateUsingListenerMethods() { // Creating generic (or almost generic) links «stateFQN» state = traceRoot.getStates().get(traceRoot.getStates().size()-1); - step_cast.setStartingState(state); + step_cast.setStartingStateRef(state); if (!context.isEmpty() && context.getFirst() != null) { - ((SequentialStep<«specificStepFQN»>) context.getFirst()).getSubSteps().add(step_cast); + ((SequentialStep<«specificStepFQN», «stateFQN»>) context.getFirst()).getSubSteps().add(step_cast); } else { - traceRoot.getRootStep().getSubSteps().add(step_cast); + ((SequentialStep<«specificStepFQN», «stateFQN»>) traceRoot.getRootStep()).getSubSteps().add(step_cast); } // Adding step in its dedicated sequence/dimension @@ -1101,16 +1101,16 @@ private def String generateAddStateUsingListenerMethods() { } «ENDFOR» if (implicitStep != null) { - implicitStep.setStartingState(startingState); - implicitStep.setEndingState(endingState); - (( SequentialStep<«specificStepFQN»>) currentStep).getSubSteps().add(implicitStep); + implicitStep.setStartingStateRef(startingState); + implicitStep.setEndingStateRef(endingState); + ((SequentialStep<«specificStepFQN», «stateFQN»>) currentStep).getSubSteps().add(implicitStep); } «ENDIF» } @Override - public void endStep(fr.inria.diverse.trace.commons.model.trace.Step step) { + public void endStep(fr.inria.diverse.trace.commons.model.trace.Step step) { «specificStepFQN» popped = context.pop(); if (popped != null) popped.«stringSetter(TraceMMStrings.ref_StepToState_ending, "lastState")»; @@ -1128,7 +1128,7 @@ private def String generateAddStateUsingListenerMethods() { traceRoot.setLaunchconfiguration(launchConfiguration); // Create root sequential step - fr.inria.diverse.trace.commons.model.trace.SequentialStep<«specificStepFQN»> rootStep = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createSequentialStep(); + fr.inria.diverse.trace.commons.model.trace.SequentialStep<«specificStepFQN», «stateFQN»> rootStep = «EcoreCraftingUtil.stringCreate(traceability.traceMMExplorer.getSpecificRootStepClass)»; traceRoot.setRootStep(rootStep); // Put in the resource diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend index 1b87c1190..945f121ca 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend @@ -115,7 +115,7 @@ class TraceExplorerGeneratorJava { private def Set getConcreteSubtypesTraceClassOf(EClass tracedClass) { val Set result = new HashSet() - result.addAll(this.traceMM.eAllContents.filter(EClass).filter [ c | + result.addAll(traceMM.eAllContents.filter(EClass).filter [ c | !c.abstract && c.EAllSuperTypes.contains(tracedClass) ].toSet) if (!tracedClass.abstract) diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index 8586246ed..48741d165 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -21,18 +21,15 @@ import org.eclipse.emf.ecore.EObject; +import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; -import fr.inria.diverse.trace.commons.model.trace.GenericTrace; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; -import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; +import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; @@ -84,8 +81,8 @@ public class MultidimensionalTimelineRenderer extends Pane implements ITraceViewListener { - private ITraceExplorer traceExplorer; - private ITraceExtractor traceExtractor; + private ITraceExplorer, State, TracedObject, Dimension, Value> traceExplorer; + private ITraceExtractor, State, TracedObject, Dimension, Value> traceExtractor; final private IntegerProperty currentState; final private IntegerProperty currentStep; @@ -113,7 +110,7 @@ public class MultidimensionalTimelineRenderer extends Pane implements ITraceView private int lastClickedState = -1; - final private Consumer jumpConsumer = (i) -> traceExplorer.jump(i); + final private Consumer jumpConsumer = (i) -> traceExplorer.jump(traceExtractor.getState(i)); final private Supplier lastClickedStateSupplier = () -> lastClickedState; private boolean stateColoration; @@ -149,8 +146,6 @@ public class MultidimensionalTimelineRenderer extends Pane implements ITraceView private static final int CURRENT_BIGSTEP = 2; private Consumer> displayMenu = null; - - private Trace, TracedObject>, State> trace; public MultidimensionalTimelineRenderer() { headerPane = new VBox(); @@ -250,12 +245,12 @@ public void onChanged(javafx.collections.ListChangeListener.Change state, boolean jump) { + int toShow = Math.min(nbStates.intValue() - 1, Math.max(0, traceExtractor.getStateIndex(state))); int effectiveToShow = Math.min(visibleStatesRange.intValue() - 1, Math.max(0, toShow - nbDisplayableStates.intValue() / 2)); if (jump) { - traceExplorer.jump(toShow); + traceExplorer.jump(traceExtractor.getState(effectiveToShow)); } currentState.set(effectiveToShow); } @@ -325,7 +320,7 @@ private Pane setupStatesPane() { return headerPane; } - private Pane setupValuePane(int line, Label titleLabel, Pane contentPane) { + private Pane setupValuePane(Dimension dimension, Label titleLabel, Pane contentPane) { final HBox titlePane = new HBox(); final VBox valueVBox = new VBox(); final Node backValueGraphicNode = new ImageView(backValueGraphic); @@ -334,19 +329,19 @@ private Pane setupValuePane(int line, Label titleLabel, Pane contentPane) { backValueGraphicNode.setScaleY(1 / buttonScale); final Button backValue = new Button("", backValueGraphicNode); backValue.setOnAction((e) -> { - traceExplorer.backValue(line); + traceExplorer.backValue(dimension); }); backValue.setScaleX(buttonScale); backValue.setScaleY(buttonScale); - backValue.setDisable(!traceExplorer.canBackValue(line)); + backValue.setDisable(!traceExplorer.canBackValue(dimension)); final Node stepValueGraphicNode = new ImageView(stepValueGraphic); stepValueGraphicNode.setScaleX(1 / buttonScale); stepValueGraphicNode.setScaleY(1 / buttonScale); final Button stepValue = new Button("", stepValueGraphicNode); stepValue.setOnAction((e) -> { - traceExplorer.stepValue(line); + traceExplorer.stepValue(dimension); }); - stepValue.setDisable(!traceExplorer.canStepValue(line)); + stepValue.setDisable(!traceExplorer.canStepValue(dimension)); stepValue.setScaleX(buttonScale); stepValue.setScaleY(buttonScale); titlePane.setAlignment(Pos.CENTER_LEFT); @@ -356,7 +351,7 @@ private Pane setupValuePane(int line, Label titleLabel, Pane contentPane) { final CheckBox showValueCheckBox = new CheckBox(); showValueCheckBox.setScaleX(buttonScale); showValueCheckBox.setScaleY(buttonScale); - boolean hide = traceExtractor.isValueTraceIgnored(line); + boolean hide = traceExtractor.isDimensionIgnored(dimension); if (hide) { showValueCheckBox.setSelected(false); } else { @@ -367,7 +362,7 @@ private Pane setupValuePane(int line, Label titleLabel, Pane contentPane) { stepValue.visibleProperty().bind(sel); sel.addListener((v, o, n) -> { if (o != n) { - traceExtractor.ignoreValueTrace(line, !n); + traceExtractor.ignoreDimension(dimension, !n); if (n) { valueVBox.getChildren().add(contentPane); } else { @@ -383,7 +378,7 @@ private Pane setupValuePane(int line, Label titleLabel, Pane contentPane) { } valuesLines.getChildren().add(valueVBox); - valueVBox.setUserData(line); + valueVBox.setUserData(dimension); titleLabel.minWidthProperty().bind(valueTitleWidth); titleLabel.widthProperty().addListener((v, o, n) -> { if (n.doubleValue() > valueTitleWidth.get()) { @@ -404,12 +399,12 @@ private HBox createStateTraceLine() { return hBox; } - private HBox createValueTraceLine(int traceIndex) { + private HBox createValueTraceLine(Dimension dimension) { final HBox hBox = new HBox(); - final String title = traceExtractor.getValueLabel(traceIndex) + " "; + final String title = traceExtractor.getDimensionLabel(dimension) + " "; final Label titleLabel = new Label(title); titleLabel.setFont(valuesFont); - final Pane pane = setupValuePane(traceIndex, titleLabel, hBox); + final Pane pane = setupValuePane(dimension, titleLabel, hBox); pane.setFocusTraversable(true); return hBox; } @@ -422,15 +417,15 @@ private String computeStateLabel(int stateNumber) { } } - private void fillStateLine(HBox line, List stateWrappers, int selectedState) { + private void fillStateLine(HBox line, List> states, int selectedState) { final Color currentColor = Color.CORAL; final Color otherColor = Color.SLATEBLUE; final int height = DIAMETER; final int width = DIAMETER; final int currentStateIndex = Math.max(0, currentState.intValue()); - final int diff = stateWrappers.isEmpty() ? 0 : currentStateIndex - traceExtractor.getStateIndex(stateWrappers.get(0)); + final int diff = states.isEmpty() ? 0 : currentStateIndex - traceExtractor.getStateIndex(states.get(0)); - final List> colorGroups = stateColoration ? computeColorGroups(stateWrappers) + final List> colorGroups = stateColoration ? computeColorGroups(states) : Collections.emptyList(); final int nbColors = colorGroups.size(); final List colorPalette = new ArrayList<>(); @@ -444,10 +439,10 @@ private void fillStateLine(HBox line, List stateWrappers, int selectedSta } } - final int[] stateToColor = new int[stateWrappers.size()]; + final int[] stateToColor = new int[states.size()]; for (int i = 0; i < nbColors; i++) { - final List states = colorGroups.get(i); - for (Integer state : states) { + final List stateGroup = colorGroups.get(i); + for (Integer state : stateGroup) { stateToColor[state % stateToColor.length] = i; } } @@ -457,8 +452,8 @@ private void fillStateLine(HBox line, List stateWrappers, int selectedSta line.setTranslateX(-(UNIT * diff)); } - for (State stateWrapper : stateWrappers) { - final int stateIndex = traceExtractor.getStateIndex(stateWrapper); + for (State state : states) { + final int stateIndex = traceExtractor.getStateIndex(state); final Rectangle rectangle; if (selectedState == stateIndex) { rectangle = new Rectangle(width, height, currentColor); @@ -477,16 +472,15 @@ private void fillStateLine(HBox line, List stateWrappers, int selectedSta rectangle.setArcHeight(height); rectangle.setArcWidth(width); - rectangle.setUserData(stateWrapper); + rectangle.setUserData(state); rectangle.addEventHandler(MouseEvent.MOUSE_CLICKED, (e) -> { if (e.getClickCount() > 1 && e.getButton() == MouseButton.PRIMARY) { - Object o = rectangle.getUserData(); - traceExplorer.jump((EObject) o); + traceExplorer.jump(state); } if (e.getClickCount() == 1 && e.getButton() == MouseButton.SECONDARY) { lastClickedState = stateIndex; final List enabledItems = new ArrayList<>(); - enabledItems.add(stateWrapper.breakable); + enabledItems.add(traceExtractor.isStateBreakable(state)); enabledItems.add(true); displayMenu.accept(enabledItems); } @@ -494,7 +488,7 @@ private void fillStateLine(HBox line, List stateWrappers, int selectedSta displayGridBinding = displayGridBinding.or(rectangle.hoverProperty()); - final String s = traceExtractor.getStateDescription(stateIndex); + final String s = traceExtractor.getStateDescription(state); final Tooltip t = new Tooltip(s); Tooltip.install(rectangle, t); Label text = new Label(computeStateLabel(stateIndex)); @@ -506,7 +500,7 @@ private void fillStateLine(HBox line, List stateWrappers, int selectedSta text.setMaxWidth(width); StackPane layout = new StackPane(); StackPane.setMargin(rectangle, MARGIN_INSETS); - if (!stateWrapper.breakable) { + if (!traceExtractor.isStateBreakable(state)) { Shape hatching = Shape.intersect(rectangle, diagonalHatching); hatching.setFill(Color.LIGHTGRAY); layout.getChildren().addAll(rectangle, hatching, text); @@ -517,7 +511,9 @@ private void fillStateLine(HBox line, List stateWrappers, int selectedSta } } - private void fillValueLine(HBox line, int idx, List valueWrappers, int selectedState) { + private void fillValueLine(HBox line, Dimension dimension, int start, int end, int selectedState) { + final List> values = new ArrayList<>(); + dimension.getValues().subList(start, end).forEach(v -> values.add(v)); final Color currentColor = Color.DARKORANGE; final Color otherColor = Color.DARKBLUE; final int height = V_HEIGHT; @@ -527,13 +523,13 @@ private void fillValueLine(HBox line, int idx, List valueWrappers, int se final int currentStateIndex = Math.max(0, currentState.intValue()); int stateIndex = currentStateIndex; - int diff = valueWrappers.isEmpty() ? 0 : currentStateIndex - valueWrappers.get(0).firstStateIndex; + int diff = values.isEmpty() ? 0 : currentStateIndex - traceExtractor.getValueFirstStateIndex(values.get(0)); if (diff > 0) { line.setTranslateX(-(UNIT * diff)); } - for (Value valueWrapper : valueWrappers) { + for (Value valueWrapper : values) { final int firstStateIndex = traceExtractor.getValueFirstStateIndex(valueWrapper); final int lastStateIndex = traceExtractor.getValueLastStateIndex(valueWrapper); @@ -559,14 +555,13 @@ private void fillValueLine(HBox line, int idx, List valueWrappers, int se rectangle.setUserData(valueWrapper); rectangle.addEventHandler(MouseEvent.MOUSE_CLICKED, (e) -> { if (e.getClickCount() > 1 && e.getButton() == MouseButton.PRIMARY) { - Object o = rectangle.getUserData(); - traceExplorer.jump((EObject) o); + traceExplorer.jump(valueWrapper); } }); displayGridBinding = displayGridBinding.or(rectangle.hoverProperty()); - final String s = traceExtractor.getValueDescription(idx, firstStateIndex); + final String s = traceExtractor.getValueDescription(valueWrapper); final Tooltip t = new Tooltip(s); Tooltip.install(rectangle, t); line.getChildren().add(rectangle); @@ -576,17 +571,15 @@ private void fillValueLine(HBox line, int idx, List valueWrappers, int se } } - private NumberExpression createSteps(Step stepWrapper, int depth, int currentStateStartIndex, + private NumberExpression createSteps(Step stepWrapper, int depth, int currentStateIndex, int selectedStateIndex, List accumulator, Object[] stepTargets) { - final int startingIndex = stepWrapper. + final int stepStartingIndex = traceExtractor.getStateIndex(stepWrapper.getStartingState()); - final boolean endedStep = stepWrapper.endingIndex != -1; - - final int stepStartingIndex = stepWrapper.startingIndex; + final boolean endedStep = stepWrapper.getEndingState() != null; - final int startingIndex = stepStartingIndex - currentStateStartIndex; - final int endingIndex = (endedStep ? stepWrapper.endingIndex : nbStates.intValue()) - currentStateStartIndex; + final int startingIndex = stepStartingIndex - currentStateIndex; + final int endingIndex = (endedStep ? traceExtractor.getStateIndex(stepWrapper.getEndingState()) : nbStates.intValue()) - currentStateIndex; final Path path = new Path(); path.setStrokeWidth(2); @@ -606,13 +599,13 @@ private NumberExpression createSteps(Step stepWrapper, int depth, int currentSta accumulator.add(path); - final List subSteps = stepWrapper.subSteps; + final List> subSteps = stepWrapper instanceof BigStep ? ((BigStep) stepWrapper).getSubSteps() : + Collections.emptyList(); NumberExpression yOffset = new SimpleDoubleProperty(0); if (subSteps != null && !subSteps.isEmpty()) { - for (Step subStep : subSteps) { - final Step subStepWrapper = traceExtractor.getStepWrapper(subStep); - if (subStepWrapper.startingIndex != subStepWrapper.endingIndex) { - yOffset = Bindings.max(yOffset, createSteps(subStepWrapper, depth + 1, currentStateStartIndex, + for (Step subStep : subSteps) { + if (subStep.getStartingState() != subStep.getEndingState()) { + yOffset = Bindings.max(yOffset, createSteps(subStep, depth + 1, currentStateIndex, selectedStateIndex, accumulator, stepTargets)); } } @@ -639,22 +632,20 @@ private NumberExpression createSteps(Step stepWrapper, int depth, int currentSta } private void sortValueLines() { - final List nodes = new ArrayList<>(valuesLines.getChildren()); - nodes.sort((n1, n2) -> { - final int line1 = (Integer) n1.getUserData(); - final int line2 = (Integer) n2.getUserData(); - final boolean hiden1 = traceExtractor.isValueTraceIgnored(line1); - final boolean hiden2 = traceExtractor.isValueTraceIgnored(line2); - if (hiden1 == hiden2) { - return line1 - line2; - } else if (hiden1) { - return 1; - } else { - return -1; + final Map, Node> map = new HashMap<>(); + List lines = valuesLines.getChildren(); + final List nodes = new ArrayList<>(lines); + nodes.forEach(n -> map.put((Dimension) n.getUserData(), n)); + lines.clear(); + traceExtractor.getDimensions().forEach(d -> { + if (!traceExtractor.isDimensionIgnored(d)) { + final Node n = map.get(d); + nodes.remove(n); + nodes.add(n); + lines.add(n); } }); - valuesLines.getChildren().clear(); - valuesLines.getChildren().addAll(nodes); + lines.addAll(nodes); } public void refresh() { @@ -672,7 +663,7 @@ public void refresh() { final int currentStateStartIndex = Math.max(0, currentState.intValue()); final int currentStateEndIndex = currentStateStartIndex + nbDisplayableStates.intValue(); - final int selectedStateIndex = traceExplorer.getCurrentStateIndex(); + final int selectedStateIndex = traceExtractor.getStateIndex(traceExplorer.getCurrentState()); displayGridBinding = new BooleanBinding() { @Override @@ -684,15 +675,13 @@ protected boolean computeValue() { { final HBox hBox = createStateTraceLine(); fillStateLine(hBox, - traceExtractor.getStateWrappers(currentStateStartIndex - 1, currentStateEndIndex + 1), + traceExtractor.getStates(currentStateStartIndex - 1, currentStateEndIndex + 1), selectedStateIndex); } - for (int i = 0; i < traceExtractor.getNumberOfTraces(); i++) { - final HBox hBox = createValueTraceLine(i); - fillValueLine(hBox, i, - traceExtractor.getValueWrappers(i, currentStateStartIndex - 1, currentStateEndIndex + 1), - selectedStateIndex); + for (Dimension dimension : traceExtractor.getDimensions()) { + final HBox hBox = createValueTraceLine(dimension); + fillValueLine(hBox, dimension, currentStateStartIndex - 1, currentStateEndIndex + 1, selectedStateIndex); } sortValueLines(); @@ -701,14 +690,13 @@ protected boolean computeValue() { // ---------------- Steps creation - final List rootSteps = traceExtractor.getStepWrappers(currentStateStartIndex - 1, - currentStateEndIndex + 1); + final List> rootSteps = traceExtractor.getSteps(currentStateStartIndex - 1, currentStateEndIndex + 1); final List steps = new ArrayList<>(); final Object[] stepTargets = new Object[3]; - Step tmp = traceExplorer.getCurrentForwardStep(); + Step tmp = traceExplorer.getCurrentForwardStep(); if (tmp != null) { stepTargets[CURRENT_FORWARD_STEP] = tmp; } @@ -721,8 +709,8 @@ protected boolean computeValue() { stepTargets[CURRENT_BIGSTEP] = tmp; } - for (Step stepWrapper : rootSteps) { - if (stepWrapper.startingIndex != stepWrapper.endingIndex) { + for (Step stepWrapper : rootSteps) { + if (stepWrapper.getStartingState() != stepWrapper.getEndingState()) { createSteps(stepWrapper, 0, currentStateStartIndex, selectedStateIndex, steps, stepTargets); } } @@ -781,7 +769,7 @@ public Consumer getJumpConsumer() { return jumpConsumer; } - public void setTraceExplorer(ITraceExplorer traceExplorer) { + public void setTraceExplorer(ITraceExplorer, State, TracedObject, Dimension, Value> traceExplorer) { if (this.traceExplorer != null) { this.traceExplorer.removeListener(this); } @@ -792,7 +780,7 @@ public void setTraceExplorer(ITraceExplorer traceExplorer) { update(); } - public void setTraceExtractor(ITraceExtractor traceExtractor) { + public void setTraceExtractor(ITraceExtractor, State, TracedObject, Dimension, Value> traceExtractor) { this.traceExtractor = traceExtractor; } @@ -803,7 +791,7 @@ public void update() { if (traceExplorer != null) { nbStates.set(traceExtractor.getStatesTraceLength()); if (!scrollLock) { - showState(traceExplorer.getCurrentStateIndex(), false); + showState(traceExplorer.getCurrentState(), false); } } else { nbStates.set(0); @@ -823,29 +811,22 @@ public Supplier getLastClickedStateSupplier() { return lastClickedStateSupplier; } - private List> computeColorGroups(List stateWrappers) { - final Map eObjectToWrapper = new HashMap<>(); - final List states = stateWrappers.stream() - .map(w -> { - eObjectToWrapper.put(w.state, w); - return w.state; - }) - .collect(Collectors.toList()); + private List> computeColorGroups(List> states) { return traceExtractor.computeStateEquivalenceClasses().stream() .sorted((l1, l2) -> { final int min1 = l1.stream() - .map(e -> traceExtractor.getStateWrapper(e).stateIndex) + .map(e -> traceExtractor.getStateIndex(e)) .min((i1, i2) -> i1 - i2) .get(); final int min2 = l2.stream() - .map(e -> traceExtractor.getStateWrapper(e).stateIndex) + .map(e -> traceExtractor.getStateIndex(e)) .min((i1, i2) -> i1 - i2) .get(); return min1 - min2; }) .map(l -> l.stream() .filter(s -> states.contains(s)) - .map(e -> eObjectToWrapper.get(e).stateIndex) + .map(e -> traceExtractor.getStateIndex(e)) .collect(Collectors.toList())) .collect(Collectors.toList()); } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java index 5bbbebfd0..ee06e4a1a 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java @@ -64,8 +64,13 @@ import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.core.IRunConfiguration; +import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon; @@ -80,7 +85,7 @@ public class MultidimensionalTimelineViewPart extends EngineSelectionDependentVi private MultidimensionalTimelineRenderer timelineRenderer; - private IMultiDimensionalTraceAddon traceAddon; + private IMultiDimensionalTraceAddon, State, TracedObject, Dimension, Value> traceAddon; final private List statesToBreakTo = new ArrayList<>(); @@ -131,7 +136,7 @@ public void widgetSelected(SelectionEvent evt) { launchAndBreakAtVectorMenuItem.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent evt) { - final EObject state = traceAddon.getTraceExtractor().getStateWrapper(getLastClickedState.get()).state; + final State state = traceAddon.getTraceExtractor().getState(getLastClickedState.get()); breakAtVectorState = state; if (debugger != null && !debugger.isTerminated()) { debugger.terminate(); @@ -352,7 +357,7 @@ protected void init() { setEnabled(true); dialog = new InputDialog(shell, "Jump to state", "Enter the desired state", "0", s -> { - ITraceExtractor extractor = traceAddon.getTraceExtractor(); + ITraceExtractor, State, TracedObject, Dimension, Value> extractor = traceAddon.getTraceExtractor(); if (extractor == null) { return "Not trace currently loaded"; } @@ -407,7 +412,7 @@ private boolean canDisplayTimeline(IExecutionEngine engine) { return false; } - private EObject breakAtVectorState = null; + private State breakAtVectorState = null; private int breakAtStateIndex = -1; @Override @@ -415,22 +420,24 @@ public void engineSelectionChanged(IExecutionEngine engine) { if (engine != null) { this.engine = engine; if (canDisplayTimeline(engine)) { + @SuppressWarnings("rawtypes") Set traceAddons = engine .getAddonsTypedBy(IMultiDimensionalTraceAddon.class); if (!traceAddons.isEmpty()) { - final IMultiDimensionalTraceAddon traceAddon = traceAddons.iterator().next(); - final ITraceExtractor extractor = traceAddon.getTraceExtractor(); + @SuppressWarnings("unchecked") + final IMultiDimensionalTraceAddon, State, TracedObject, Dimension, Value> traceAddon = traceAddons.iterator().next(); + final ITraceExtractor, State, TracedObject, Dimension, Value> extractor = traceAddon.getTraceExtractor(); final Collection debuggers = engine.getAddonsTypedBy(AbstractGemocDebugger.class); if (!debuggers.isEmpty()) { debugger = debuggers.stream().findFirst().get(); if (breakAtVectorState != null) { BiPredicate predicate = new BiPredicate() { - final EObject baseState = breakAtVectorState; + final State baseState = breakAtVectorState; @Override public boolean test(IExecutionEngine executionEngine, MSEOccurrence mseOccurrence) { - final ITraceExtractor traceExtractor = traceAddon.getTraceExtractor(); + final ITraceExtractor, State, TracedObject, Dimension, Value> traceExtractor = traceAddon.getTraceExtractor(); final int lastStateIndex = traceExtractor.getStatesTraceLength() - 1; - final EObject state = traceExtractor.getStateWrapper(lastStateIndex).state; + final State state = traceExtractor.getState(lastStateIndex); return traceExtractor.compareStates(baseState, state, true); } }; diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java index b9ee07ec4..184baadbf 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java @@ -62,8 +62,8 @@ public void setUpdateCommand(BiConsumer command) { private void updateGraph() { // Finding out whether the list of ignored values has changed final List newIgnoredValueTraces = new ArrayList<>(); - for (int i = 0; i < traceExtractor.getNumberOfTraces(); i++) { - newIgnoredValueTraces.add(traceExtractor.isValueTraceIgnored(i)); + for (int i = 0; i < traceExtractor.getNumberOfDimensions(); i++) { + newIgnoredValueTraces.add(traceExtractor.isDimensionIgnored(i)); } // If it did we have to recompute the graph if (!newIgnoredValueTraces.equals(ignoredValueTraces)) { From cc9f8b5d87d768d9c657202dd09b484096ded574 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 3 Feb 2017 17:25:36 +0100 Subject: [PATCH 098/267] Fix wrong checkstyle configuration paths --- trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle | 2 +- .../plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle | 2 +- .../fr.inria.diverse.trace.annotations.editor/.checkstyle | 2 +- .../plugins/fr.inria.diverse.trace.annotations/.checkstyle | 2 +- .../fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle | 2 +- .../plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle | 2 +- .../plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle | 2 +- .../generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle | 2 +- .../fr.inria.diverse.trace.metamodel.generator/.checkstyle | 2 +- .../.checkstyle | 2 +- .../plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle b/trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle @@ -1,7 +1,7 @@ - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle @@ -1,7 +1,7 @@ - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.checkstyle @@ -1,7 +1,7 @@ - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.annotations/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.annotations/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.trace.annotations/.checkstyle @@ -1,7 +1,7 @@ - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle @@ -1,7 +1,7 @@ - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle @@ -1,7 +1,7 @@ - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle @@ -1,7 +1,7 @@ - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle @@ -1,7 +1,7 @@ - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.checkstyle @@ -1,7 +1,7 @@ - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle @@ -1,7 +1,7 @@ - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle index 2d51ed574..42097404b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle @@ -1,7 +1,7 @@ - + From af2d9141ba11824a3c3df82319e30bd854b574e8 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 3 Feb 2017 17:25:51 +0100 Subject: [PATCH 099/267] Improve error management/display in trace addon generation --- .../XDSMLProject2TraceAddonHandler.xtend | 7 +- .../AbstractEMFProjectGenerator.xtend | 8 +- .../clean/StandaloneEMFProjectGenerator.xtend | 74 ++++++++++++++----- 3 files changed, 59 insertions(+), 30 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend index 92120193c..9ccaa9325 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend @@ -12,8 +12,6 @@ package fr.inria.diverse.trace.gemoc.ui.commands import fr.inria.diverse.melange.metamodel.melange.Language import fr.inria.diverse.trace.gemoc.generator.TraceAddonGeneratorIntegration -import java.io.PrintWriter -import java.io.StringWriter import org.eclipse.core.commands.ExecutionEvent import org.eclipse.core.commands.ExecutionException import org.eclipse.core.commands.IHandler @@ -62,10 +60,7 @@ class XDSMLProject2TraceAddonHandler extends AbstractMelangeSelectHandler implem monitor) } catch (Exception e) { - val StringWriter sw = new StringWriter(); - e.printStackTrace(new PrintWriter(sw)); - val String exceptionAsString = sw.toString(); - return new Status(Status.ERROR, pluginId, exceptionAsString) + return new Status(Status.ERROR, pluginId, "An error occured while generating the trace addon. Please expand below for the complete error stack trace.",e) } return new Status(Status.OK, pluginId, "Multidimensional Trace addon plugin generated.") } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend index af490df3f..134495200 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend @@ -23,7 +23,6 @@ import org.eclipse.xtend.lib.annotations.Accessors abstract class AbstractEMFProjectGenerator { // Inputs - //protected val URI ecoreURI protected val EPackage ecoreModel protected val String projectName @@ -38,11 +37,6 @@ abstract class AbstractEMFProjectGenerator { // Transient protected var GenModel genModel -// new(String projectName, URI ecoreURI) { -// this.projectName = projectName -// this.ecoreURI = ecoreURI -// } - new(String projectName, EPackage ecoreModel) { this.projectName = projectName this.ecoreModel = ecoreModel @@ -66,6 +60,6 @@ abstract class AbstractEMFProjectGenerator { /** * Generates the code using the genmodel (within a Job). */ - def void generateModelCode(IProgressMonitor m) + def void generateModelCode(IProgressMonitor m) throws Exception } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend index db19c90d5..ba2e15c1c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Inria - initial API and implementation *******************************************************************************/ @@ -12,6 +12,9 @@ package fr.inria.diverse.trace.plugin.generator.clean import fr.inria.diverse.trace.plugin.generator.AbstractEMFProjectGenerator import java.io.IOException +import java.io.PrintWriter +import java.io.StringWriter +import java.util.ArrayList import java.util.Collection import java.util.Collections import java.util.HashSet @@ -88,7 +91,7 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { URI.createPlatformResourceURI('''«projectName»/«MODEL_GEN_FOLDER»/«ecoreModel.name».ecore''', true)) ecoreModelResource.contents.add(ecoreModel) ecoreModelResource.save - + ecoreModelResource.unload ecoreModelResource.load(null) @@ -218,20 +221,20 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { return pluginID; } - private def GenJDKLevel getComplicanceLevel() { - val String complianceLevel = CodeGenUtil.EclipseUtil.getJavaComplianceLevel(project); - if ("1.4".equals(complianceLevel)) { - return GenJDKLevel.JDK14_LITERAL; - } else if ("1.5".equals(complianceLevel)) { - return GenJDKLevel.JDK50_LITERAL; - } else if ("1.6".equals(complianceLevel)) { - return GenJDKLevel.JDK60_LITERAL; - } else if ("1.7".equals(complianceLevel)) { - return GenJDKLevel.JDK70_LITERAL; - } else { - return GenJDKLevel.JDK80_LITERAL; - } + private def GenJDKLevel getComplicanceLevel() { + val String complianceLevel = CodeGenUtil.EclipseUtil.getJavaComplianceLevel(project); + if ("1.4".equals(complianceLevel)) { + return GenJDKLevel.JDK14_LITERAL; + } else if ("1.5".equals(complianceLevel)) { + return GenJDKLevel.JDK50_LITERAL; + } else if ("1.6".equals(complianceLevel)) { + return GenJDKLevel.JDK60_LITERAL; + } else if ("1.7".equals(complianceLevel)) { + return GenJDKLevel.JDK70_LITERAL; + } else { + return GenJDKLevel.JDK80_LITERAL; } + } /** * In case of missing parameter types, the types are temporarily set to @@ -291,19 +294,56 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { } } - protected def boolean generateCode(IProgressMonitor progressMonitor) { + private def List expandDiagnostics(Diagnostic d) { + val result = new ArrayList + result.add(d) + result.addAll(d.children) + for (c : d.children) { + result.addAll(expandDiagnostics(c)) + } + return result + } + + private def String exceptionToStackString(Throwable e) { + val StringWriter sw = new StringWriter(); + e.printStackTrace(new PrintWriter(sw)); + val String exceptionAsString = sw.toString() + return exceptionAsString + } + + private def String diagnosticErrorsToString(Diagnostic diagnostic) { + + val errors = expandDiagnostics(diagnostic).filter[d|d.severity == Diagnostic.ERROR].toSet + val exceptions = errors.filter[e|e.exception != null].map[e|exceptionToStackString(e.exception)].toSet + return ''' + «FOR e : exceptions BEFORE "Encountered exceptions:\n" SEPARATOR "\n" AFTER "\n"» + - «e» + «ENDFOR» + «FOR e : errors BEFORE "Encountered diagnostic errors:\n" SEPARATOR "\n" AFTER "\n"» + - «e.message» + «ENDFOR» + ''' + } + + protected def void generateCode(IProgressMonitor progressMonitor) throws Exception { var boolean success = false; prepareGenModelForCodeGeneration(genModel); val Generator generator = GenModelUtil.createGenerator(genModel); val boolean canGenerate = generator.canGenerate(genModel, GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE); + var String message = '''Cannot generate code of EPackage «this.ecoreModel.name»''' if (canGenerate) { val Diagnostic diagnostic = generator.generate(genModel, GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE, BasicMonitor.toMonitor(progressMonitor)); if (diagnostic.getSeverity() == Diagnostic.OK) { success = true; + } else { + message += ''': «diagnosticErrorsToString(diagnostic)».''' } + } else { + message += "generator.canGenerate returns false." } - return success; + if (!success) + throw new Exception(message) } protected def void prepareGenModelForCodeGeneration(GenModel genModel) { From 36da05c21c9edd1e3cac0572cf15696a0f70d237 Mon Sep 17 00:00:00 2001 From: d-leroy Date: Fri, 3 Feb 2017 17:39:29 +0100 Subject: [PATCH 100/267] Removed all derived references and EOperations, and replaced them with concrete ones --- .../ui/launcher/AbstractGemocLauncher.java | 2 +- .../AbstractSequentialExecutionEngine.java | 5 +- .../api/core/IExecutionEngine.java | 2 +- .../javaengine/ui/launcher/Launcher.java | 22 +- .../javaengine/PlainK3ExecutionEngine.java | 38 +- .../.project | 6 - .../META-INF/MANIFEST.MF | 11 +- .../model/GenericTrace.aird | 2074 ++------- .../model/GenericTrace.ecore | 144 +- .../model/GenericTrace.genmodel | 139 - .../plugin.xml | 16 + .../model/trace/AddonExtensionParameter.java | 17 - .../model/trace/AnimatorURIParameter.java | 17 - .../trace/commons/model/trace/BigStep.java | 39 - .../model/trace/BooleanAttributeValue.java | 50 - .../trace/commons/model/trace/Dimension.java | 41 - .../model/trace/EntryPointParameter.java | 17 - .../model/trace/GenericAttributeValue.java | 17 - .../commons/model/trace/GenericDimension.java | 50 - .../trace/commons/model/trace/GenericMSE.java | 96 - .../model/trace/GenericParallelStep.java | 17 - .../model/trace/GenericReferenceValue.java | 50 - .../model/trace/GenericSequentialStep.java | 17 - .../commons/model/trace/GenericSmallStep.java | 17 - .../commons/model/trace/GenericState.java | 107 - .../commons/model/trace/GenericStep.java | 96 - .../commons/model/trace/GenericTrace.java | 17 - .../model/trace/GenericTracedObject.java | 18 - .../commons/model/trace/GenericValue.java | 51 - .../InitializationArgumentsParameter.java | 17 - .../trace/InitializationMethodParameter.java | 17 - .../model/trace/IntegerAttributevalue.java | 49 - .../model/trace/LanguageNameParameter.java | 17 - .../model/trace/LaunchConfiguration.java | 69 - .../trace/LaunchConfigurationParameter.java | 51 - .../trace/commons/model/trace/MSE.java | 36 - .../trace/commons/model/trace/MSEModel.java | 42 - .../commons/model/trace/MSEOccurrence.java | 86 - .../model/trace/ModelRootParameter.java | 17 - .../model/trace/ModelURIParameter.java | 17 - .../commons/model/trace/ParallelStep.java | 17 - .../commons/model/trace/SequentialStep.java | 17 - .../trace/commons/model/trace/SmallStep.java | 17 - .../trace/commons/model/trace/State.java | 77 - .../trace/commons/model/trace/Step.java | 108 - .../model/trace/StringAttributeValue.java | 49 - .../trace/commons/model/trace/Trace.java | 111 - .../commons/model/trace/TraceFactory.java | 241 - .../commons/model/trace/TracePackage.java | 3909 ----------------- .../commons/model/trace/TracedObject.java | 50 - .../trace/commons/model/trace/Value.java | 41 - .../impl/AddonExtensionParameterImpl.java | 37 - .../trace/impl/AnimatorURIParameterImpl.java | 37 - .../commons/model/trace/impl/BigStepImpl.java | 149 - .../trace/impl/BooleanAttributeValueImpl.java | 162 - .../model/trace/impl/DimensionImpl.java | 152 - .../trace/impl/EntryPointParameterImpl.java | 37 - .../trace/impl/GenericAttributeValueImpl.java | 37 - .../trace/impl/GenericDimensionImpl.java | 175 - .../model/trace/impl/GenericMSEImpl.java | 255 -- .../trace/impl/GenericParallelStepImpl.java | 332 -- .../trace/impl/GenericReferenceValueImpl.java | 156 - .../trace/impl/GenericSequentialStepImpl.java | 331 -- .../trace/impl/GenericSmallStepImpl.java | 332 -- .../model/trace/impl/GenericStateImpl.java | 318 -- .../model/trace/impl/GenericStepImpl.java | 319 -- .../model/trace/impl/GenericTraceImpl.java | 71 - .../trace/impl/GenericTracedObjectImpl.java | 38 - .../model/trace/impl/GenericValueImpl.java | 190 - .../InitializationArgumentsParameterImpl.java | 37 - .../InitializationMethodParameterImpl.java | 37 - .../trace/impl/IntegerAttributevalueImpl.java | 162 - .../trace/impl/LanguageNameParameterImpl.java | 37 - .../trace/impl/LaunchConfigurationImpl.java | 222 - .../LaunchConfigurationParameterImpl.java | 163 - .../commons/model/trace/impl/MSEImpl.java | 83 - .../model/trace/impl/MSEModelImpl.java | 152 - .../model/trace/impl/MSEOccurrenceImpl.java | 250 -- .../trace/impl/ModelRootParameterImpl.java | 37 - .../trace/impl/ModelURIParameterImpl.java | 37 - .../model/trace/impl/ParallelStepImpl.java | 39 - .../model/trace/impl/SequentialStepImpl.java | 39 - .../model/trace/impl/SmallStepImpl.java | 37 - .../commons/model/trace/impl/StateImpl.java | 228 - .../commons/model/trace/impl/StepImpl.java | 366 -- .../trace/impl/StringAttributeValueImpl.java | 162 - .../model/trace/impl/TraceFactoryImpl.java | 386 -- .../commons/model/trace/impl/TraceImpl.java | 316 -- .../model/trace/impl/TracePackageImpl.java | 1685 ------- .../model/trace/impl/TracedObjectImpl.java | 163 - .../commons/model/trace/impl/ValueImpl.java | 123 - .../model/trace/util/TraceAdapterFactory.java | 824 ---- .../commons/model/trace/util/TraceSwitch.java | 968 ---- .../trace/gemoc/api/ITraceConstructor.java | 3 +- .../trace/gemoc/api/ITraceExtractor.java | 2 +- .../GenericEngineTraceAddonGenerator.xtend | 2 +- .../gemoc/traceaddon/AbstractTraceAddon.xtend | 4 +- .../traceaddon/GenericTraceConstructor.java | 2 +- .../traceaddon/GenericTraceExtractor.java | 2 +- .../traceaddon/GenericTraceStepFactory.java | 4 +- .../.project | 6 - .../model/base.aird | 619 +-- .../model/base.ecore | 44 - .../src/base/States/SpecificState.java | 70 - .../src/base/States/SpecificTracedObject.java | 9 - .../src/base/States/SpecificValue.java | 10 - .../src/base/States/StatesPackage.java | 219 +- .../base/States/impl/SpecificStateImpl.java | 192 +- .../base/States/impl/SpecificValueImpl.java | 27 +- .../base/States/impl/StatesPackageImpl.java | 88 - .../src/base/Steps/SpecificStep.java | 98 - .../src/base/Steps/StepsPackage.java | 228 +- .../base/Steps/impl/SpecificRootStepImpl.java | 375 -- .../src/base/Steps/impl/SpecificStepImpl.java | 329 +- .../src/base/Steps/impl/StepsPackageImpl.java | 73 - .../generator/TraceMMGeneratorStates.xtend | 109 +- .../codegen/StateManagerGeneratorJava.xtend | 141 +- .../TraceConstructorGeneratorJava.xtend | 51 +- .../MultidimensionalTimelineViewPart.java | 2 +- 119 files changed, 785 insertions(+), 19853 deletions(-) delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BooleanAttributeValue.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericAttributeValue.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericDimension.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/IntegerAttributevalue.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/StringAttributeValue.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BooleanAttributeValueImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/IntegerAttributevalueImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StringAttributeValueImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java index 2f29bd034..71823b528 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java @@ -17,7 +17,7 @@ import org.gemoc.xdsmlframework.api.core.IRunConfiguration; import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; abstract public class AbstractGemocLauncher extends fr.obeo.dsl.debug.ide.sirius.ui.launch.AbstractDSLLaunchConfigurationDelegateUI { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index 9a9fce762..c8e156a68 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -36,9 +36,10 @@ import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; +import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.GenericMSE; -import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; import fr.inria.diverse.trace.commons.model.trace.MSE; import fr.inria.diverse.trace.commons.model.trace.MSEModel; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; @@ -134,7 +135,7 @@ private Step createStep(EObject caller, String className, String methodName) MSE mse = findOrCreateMSE(caller, className, methodName); Step result; if (traceAddon == null) { - GenericSequentialStep step = TraceFactory.eINSTANCE.createGenericSequentialStep(); + GenericSequentialStep step = GenerictraceFactory.eINSTANCE.createGenericSequentialStep(); MSEOccurrence occurrence = null; occurrence = TraceFactory.eINSTANCE.createMSEOccurrence(); step.setMseoccurrence(occurrence); diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java index 38b8c6d64..9afcc13dc 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java @@ -16,7 +16,7 @@ import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; /** diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java index 4a9285006..2fa47e6e7 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java @@ -39,12 +39,12 @@ import org.gemoc.executionframework.ui.views.engine.EnginesStatusView; import org.gemoc.xdsmlframework.api.core.ExecutionMode; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.core.IRunConfiguration; import fr.inria.diverse.commons.messagingsystem.api.MessagingSystem; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; @@ -165,28 +165,28 @@ public Map parseLaunchConfiguration(LaunchConfiguration launchCo Map attributes = new HashMap<>(); for (LaunchConfigurationParameter param : launchConfiguration.getParameters()) { switch (param.eClass().getClassifierID()) { - case TracePackage.LANGUAGE_NAME_PARAMETER: { + case LaunchconfigurationPackage.LANGUAGE_NAME_PARAMETER: { attributes.put(IRunConfiguration.LAUNCH_SELECTED_LANGUAGE, param.getValue()); } - case TracePackage.MODEL_URI_PARAMETER: { + case LaunchconfigurationPackage.MODEL_URI_PARAMETER: { attributes.put("Resource", param.getValue()); } - case TracePackage.ANIMATOR_URI_PARAMETER: { + case LaunchconfigurationPackage.ANIMATOR_URI_PARAMETER: { attributes.put("airdResource", param.getValue()); } - case TracePackage.ENTRY_POINT_PARAMETER: { + case LaunchconfigurationPackage.ENTRY_POINT_PARAMETER: { attributes.put(IRunConfiguration.LAUNCH_METHOD_ENTRY_POINT, param.getValue()); } - case TracePackage.MODEL_ROOT_PARAMETER: { + case LaunchconfigurationPackage.MODEL_ROOT_PARAMETER: { attributes.put(IRunConfiguration.LAUNCH_MODEL_ENTRY_POINT, param.getValue()); } - case TracePackage.INITIALIZATION_METHOD_PARAMETER: { + case LaunchconfigurationPackage.INITIALIZATION_METHOD_PARAMETER: { attributes.put(IRunConfiguration.LAUNCH_INITIALIZATION_METHOD, param.getValue()); } - case TracePackage.INITIALIZATION_ARGUMENTS_PARAMETER: { + case LaunchconfigurationPackage.INITIALIZATION_ARGUMENTS_PARAMETER: { attributes.put(IRunConfiguration.LAUNCH_INITIALIZATION_ARGUMENTS, param.getValue()); } - case TracePackage.ADDON_EXTENSION_PARAMETER: { + case LaunchconfigurationPackage.ADDON_EXTENSION_PARAMETER: { attributes.put(param.getValue(), true); } } diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java index a21801f19..659b8e8fd 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java @@ -50,16 +50,16 @@ import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepCommand; import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepManagerRegistry; import fr.inria.diverse.melange.adapters.EObjectAdapter; -import fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter; -import fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter; -import fr.inria.diverse.trace.commons.model.trace.EntryPointParameter; -import fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter; -import fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter; -import fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.ModelRootParameter; -import fr.inria.diverse.trace.commons.model.trace.ModelURIParameter; -import fr.inria.diverse.trace.commons.model.trace.TraceFactory; +import fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationFactory; +import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter; public class PlainK3ExecutionEngine extends AbstractCommandBasedSequentialExecutionEngine implements IStepManager { @@ -412,51 +412,51 @@ public static Resource loadModel(URI modelURI) { @Override public LaunchConfiguration extractLaunchConfiguration() { final IRunConfiguration configuration = getExecutionContext().getRunConfiguration(); - final LaunchConfiguration launchConfiguration = TraceFactory.eINSTANCE.createLaunchConfiguration(); + final LaunchConfiguration launchConfiguration = LaunchconfigurationFactory.eINSTANCE.createLaunchConfiguration(); launchConfiguration.setType(LAUNCH_CONFIGURATION_TYPE); if (configuration.getLanguageName() != "") { - final LanguageNameParameter languageNameParam = TraceFactory.eINSTANCE.createLanguageNameParameter(); + final LanguageNameParameter languageNameParam = LaunchconfigurationFactory.eINSTANCE.createLanguageNameParameter(); languageNameParam.setValue(configuration.getLanguageName()); launchConfiguration.getParameters().add(languageNameParam); } final URI modelURI = configuration.getExecutedModelURI(); if (modelURI != null) { final String scheme = modelURI.scheme() + ":/resource"; - final ModelURIParameter modelURIParam = TraceFactory.eINSTANCE.createModelURIParameter(); + final ModelURIParameter modelURIParam = LaunchconfigurationFactory.eINSTANCE.createModelURIParameter(); modelURIParam.setValue(modelURI.toString().substring(scheme.length())); launchConfiguration.getParameters().add(modelURIParam); } final URI animatorURI = configuration.getAnimatorURI(); if (configuration.getAnimatorURI() != null) { final String scheme = animatorURI.scheme() + ":/resource"; - final AnimatorURIParameter animatorURIParam = TraceFactory.eINSTANCE.createAnimatorURIParameter(); + final AnimatorURIParameter animatorURIParam = LaunchconfigurationFactory.eINSTANCE.createAnimatorURIParameter(); animatorURIParam.setValue(animatorURI.toString().substring(scheme.length())); launchConfiguration.getParameters().add(animatorURIParam); } if (configuration.getExecutionEntryPoint() != null) { - final EntryPointParameter entryPointParam = TraceFactory.eINSTANCE.createEntryPointParameter(); + final EntryPointParameter entryPointParam = LaunchconfigurationFactory.eINSTANCE.createEntryPointParameter(); entryPointParam.setValue(configuration.getExecutionEntryPoint()); launchConfiguration.getParameters().add(entryPointParam); } if (configuration.getModelEntryPoint() != null) { - final ModelRootParameter modelRootParam = TraceFactory.eINSTANCE.createModelRootParameter(); + final ModelRootParameter modelRootParam = LaunchconfigurationFactory.eINSTANCE.createModelRootParameter(); modelRootParam.setValue(configuration.getModelEntryPoint()); launchConfiguration.getParameters().add(modelRootParam); } if (configuration.getModelInitializationMethod() != null) { - final InitializationMethodParameter initializationMethodParam = TraceFactory.eINSTANCE + final InitializationMethodParameter initializationMethodParam = LaunchconfigurationFactory.eINSTANCE .createInitializationMethodParameter(); initializationMethodParam.setValue(configuration.getModelInitializationMethod()); launchConfiguration.getParameters().add(initializationMethodParam); } if (configuration.getModelInitializationArguments() != null) { - final InitializationArgumentsParameter initializationArgumentsParam = TraceFactory.eINSTANCE + final InitializationArgumentsParameter initializationArgumentsParam = LaunchconfigurationFactory.eINSTANCE .createInitializationArgumentsParameter(); initializationArgumentsParam.setValue(configuration.getModelInitializationArguments()); launchConfiguration.getParameters().add(initializationArgumentsParam); } configuration.getEngineAddonExtensions().forEach(extensionPoint -> { - final AddonExtensionParameter addonExtensionParam = TraceFactory.eINSTANCE.createAddonExtensionParameter(); + final AddonExtensionParameter addonExtensionParam = LaunchconfigurationFactory.eINSTANCE.createAddonExtensionParameter(); addonExtensionParam.setValue(extensionPoint.getName()); launchConfiguration.getParameters().add(addonExtensionParam); }); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project index a47b90f74..5d409b39e 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project @@ -25,16 +25,10 @@ - - net.sf.eclipsecs.core.CheckstyleBuilder - - - org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature - net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF index 615b8d584..01fe7a9dd 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF @@ -10,7 +10,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: fr.inria.diverse.trace.commons.model.helper, fr.inria.diverse.trace.commons.model.trace, fr.inria.diverse.trace.commons.model.trace.impl, - fr.inria.diverse.trace.commons.model.trace.util + fr.inria.diverse.trace.commons.model.trace.util, + fr.inria.diverse.trace.commons.model.launchconfiguration, + fr.inria.diverse.trace.commons.model.launchconfiguration.impl, + fr.inria.diverse.trace.commons.model.launchconfiguration.util, + fr.inria.diverse.trace.commons.model.generictrace, + fr.inria.diverse.trace.commons.model.generictrace.impl, + fr.inria.diverse.trace.commons.model.generictrace.util Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport + org.eclipse.emf.ecore;visibility:=reexport, + fr.inria.diverse.trace.commons.model;visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird index 6531a090f..1c056bc87 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird @@ -4,6 +4,7 @@ GenericTrace.ecore platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore http://www.eclipse.org/emf/2002/Ecore + LaunchConfiguration.ecore @@ -55,21 +56,6 @@ - - - bold - - - - - - - - - - - - @@ -90,6 +76,12 @@ + + + bold + + + @@ -169,10 +161,6 @@ - - - - @@ -189,7 +177,7 @@ - + @@ -228,7 +216,7 @@ - + @@ -248,7 +236,7 @@ - + @@ -279,7 +267,7 @@ - + @@ -310,34 +298,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -349,7 +310,7 @@ - + @@ -375,11 +336,15 @@ + + + + - + @@ -395,15 +360,11 @@ - - - - - + @@ -423,7 +384,7 @@ - + @@ -435,7 +396,7 @@ - + @@ -443,7 +404,7 @@ - + @@ -455,7 +416,7 @@ - + @@ -466,7 +427,7 @@ - + @@ -474,29 +435,7 @@ - - - - - - - - - - - - - - - - - - - - - - - + @@ -559,127 +498,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -687,183 +565,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -916,7 +667,7 @@ - + @@ -932,17 +683,17 @@ - + - + - + - + @@ -996,84 +747,36 @@ - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1124,529 +827,49 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + @@ -1655,17 +878,49 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1766,7 +1021,7 @@ - + KEEP_LOCATION @@ -1801,16 +1056,8 @@ - - - - - - - - - + @@ -1861,7 +1108,7 @@ - + @@ -1881,7 +1128,7 @@ - + @@ -1909,7 +1156,7 @@ - + @@ -1937,45 +1184,15 @@ - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -2006,11 +1223,19 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + italic + + + + + bold + + + @@ -2148,53 +1373,6 @@ - - - - - - - - routingStyle - - - italic - - - - - - - - - - - - - routingStyle - - - italic - - - - - - - - - - - - routingStyle - - - italic - - - - - @@ -2204,7 +1382,7 @@ - + @@ -2226,16 +1404,8 @@ - - - - - - - - - + @@ -2258,10 +1428,10 @@ - + - + KEEP_LOCATION @@ -2303,7 +1473,7 @@ - + @@ -2317,7 +1487,7 @@ - + KEEP_LOCATION @@ -2337,25 +1507,6 @@ - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - @@ -2369,32 +1520,7 @@ - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - routingStyle - - - italic - - - - - - + @@ -2527,144 +1653,6 @@ - - - - - - - labelSize - - - labelSize - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - routingStyle - - - italic - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - routingStyle - - - italic - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - routingStyle - - - italic - - - - - @@ -2678,130 +1666,145 @@ - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + @@ -2822,587 +1825,164 @@ - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - italic - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - italic - - - - - - - - - - - - italic - - - - - - - - - - - - italic - - + + + + + + + + - + - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - + + + + + + bold - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - italic - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - italic - - - - - - - - - - - - italic - - - - - - - - - - - - italic - - - - - - - - - - - - italic - - - - - - - - - - - - italic - - - - - - - - - - - - italic - - - - - - - - - - - italic - - - - - - - - - - - - italic - - - - - - - - - - + bold - - + - + - - - - - - labelSize - - - labelSize - + + + + + + + + - + - - - + + + + + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO - - italic - + + - - - - + + + + + - - - - + + + + + + - - - - - - - - - italic - - - - - - - - - - - - - - italic - - - - - - - - - - - - - routingStyle - - - italic - - - - - - - - - - - - - routingStyle - - + + + + + italic - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - italic - - - - - - - - + - + - - - - - - - - italic - - - - - - - - - - - + + + + + italic - - - - - - - - - - - routingStyle - - + + + + + + + + + italic - - - - - - - - - - - - - - - - - - - - - - labelSize - - - labelSize - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + labelSize - + labelSize - - - - - - - - - - - - - - - - - - bold - - - bold - - - - diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index 2c6eb1092..1f6d92e33 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -113,26 +113,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -155,7 +135,7 @@ + containment="true"> + eType="ecore:EClass LaunchConfiguration.ecore#//LaunchConfiguration" containment="true"/> @@ -171,14 +151,8 @@ - - - - -
- + containment="true"> @@ -201,7 +175,7 @@ + eOpposite="#//State/values"> @@ -225,116 +199,8 @@ + eOpposite="#//Value/states"> - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel deleted file mode 100644 index 401d4a67f..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel +++ /dev/null @@ -1,139 +0,0 @@ - - - GenericTrace.ecore - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/plugin.xml b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/plugin.xml index a41ef84c2..2fbf03ce3 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/plugin.xml +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/plugin.xml @@ -6,6 +6,14 @@ + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java deleted file mode 100644 index 560e7e910..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AddonExtensionParameter.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Addon Extension Parameter'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getAddonExtensionParameter() - * @model - * @generated - */ -public interface AddonExtensionParameter extends LaunchConfigurationParameter { -} // AddonExtensionParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java deleted file mode 100644 index 1a2079167..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/AnimatorURIParameter.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Animator URI Parameter'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getAnimatorURIParameter() - * @model - * @generated - */ -public interface AnimatorURIParameter extends LaunchConfigurationParameter { -} // AnimatorURIParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java deleted file mode 100644 index 0b0d58364..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -/** - * - * A representation of the model object 'Big Step'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps Sub Steps}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getBigStep() - * @model abstract="true" - * @generated - */ -public interface BigStep, StateSubType extends State> extends Step { - /** - * Returns the value of the 'Sub Steps' containment reference list. - * - *

- * If the meaning of the 'Sub Steps' containment reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Sub Steps' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getBigStep_SubSteps() - * @model containment="true" - * @generated - */ - EList getSubSteps(); - -} // BigStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BooleanAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BooleanAttributeValue.java deleted file mode 100644 index 2e0d31bbd..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BooleanAttributeValue.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Boolean Attribute Value'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue#isAttributeValue Attribute Value}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getBooleanAttributeValue() - * @model - * @generated - */ -public interface BooleanAttributeValue extends GenericAttributeValue { - /** - * Returns the value of the 'Attribute Value' attribute. - * The default value is "false". - * - *

- * If the meaning of the 'Attribute Value' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Attribute Value' attribute. - * @see #setAttributeValue(boolean) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getBooleanAttributeValue_AttributeValue() - * @model default="false" - * @generated - */ - boolean isAttributeValue(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue#isAttributeValue Attribute Value}' attribute. - * - * - * @param value the new value of the 'Attribute Value' attribute. - * @see #isAttributeValue() - * @generated - */ - void setAttributeValue(boolean value); - -} // BooleanAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java deleted file mode 100644 index 5d22b289f..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Dimension'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.Dimension#getValues Values}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getDimension() - * @model abstract="true" - * @generated - */ -public interface Dimension> extends EObject { - /** - * Returns the value of the 'Values' containment reference list. - * - *

- * If the meaning of the 'Values' containment reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Values' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getDimension_Values() - * @model containment="true" - * @generated - */ - EList getValues(); - -} // Dimension diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java deleted file mode 100644 index b8cc38f5e..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/EntryPointParameter.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Entry Point Parameter'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getEntryPointParameter() - * @model - * @generated - */ -public interface EntryPointParameter extends LaunchConfigurationParameter { -} // EntryPointParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericAttributeValue.java deleted file mode 100644 index f71210ac4..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericAttributeValue.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Generic Attribute Value'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericAttributeValue() - * @model abstract="true" - * @generated - */ -public interface GenericAttributeValue extends GenericValue { -} // GenericAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericDimension.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericDimension.java deleted file mode 100644 index 3ca7d49a5..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericDimension.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.ecore.EStructuralFeature; - -/** - * - * A representation of the model object 'Generic Dimension'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericDimension#getDynamicProperty Dynamic Property}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericDimension() - * @model - * @generated - */ -public interface GenericDimension extends Dimension { - /** - * Returns the value of the 'Dynamic Property' reference. - * - *

- * If the meaning of the 'Dynamic Property' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Dynamic Property' reference. - * @see #setDynamicProperty(EStructuralFeature) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericDimension_DynamicProperty() - * @model - * @generated - */ - EStructuralFeature getDynamicProperty(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericDimension#getDynamicProperty Dynamic Property}' reference. - * - * - * @param value the new value of the 'Dynamic Property' reference. - * @see #getDynamicProperty() - * @generated - */ - void setDynamicProperty(EStructuralFeature value); - -} // GenericDimension diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java deleted file mode 100644 index 4a9524377..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EOperation; - -/** - * - * A representation of the model object 'Generic MSE'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericMSE() - * @model - * @generated - */ -public interface GenericMSE extends MSE { - /** - * Returns the value of the 'Caller Reference' reference. - * - *

- * If the meaning of the 'Caller Reference' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Caller Reference' reference. - * @see #setCallerReference(EObject) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericMSE_CallerReference() - * @model - * @generated - */ - EObject getCallerReference(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}' reference. - * - * - * @param value the new value of the 'Caller Reference' reference. - * @see #getCallerReference() - * @generated - */ - void setCallerReference(EObject value); - - /** - * Returns the value of the 'Action Reference' reference. - * - *

- * If the meaning of the 'Action Reference' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Action Reference' reference. - * @see #setActionReference(EOperation) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericMSE_ActionReference() - * @model - * @generated - */ - EOperation getActionReference(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}' reference. - * - * - * @param value the new value of the 'Action Reference' reference. - * @see #getActionReference() - * @generated - */ - void setActionReference(EOperation value); - - /** - * - * - * @model kind="operation" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return callerReference;'" - * @generated - */ - EObject getCaller(); - - /** - * - * - * @model kind="operation" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return actionReference;'" - * @generated - */ - EOperation getAction(); - -} // GenericMSE diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java deleted file mode 100644 index 216278174..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericParallelStep.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Generic Parallel Step'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericParallelStep() - * @model - * @generated - */ -public interface GenericParallelStep extends ParallelStep, GenericStep { -} // GenericParallelStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java deleted file mode 100644 index 67b92458e..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericReferenceValue.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Generic Reference Value'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue#getReferenceValue Reference Value}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericReferenceValue() - * @model - * @generated - */ -public interface GenericReferenceValue extends GenericValue { - /** - * Returns the value of the 'Reference Value' reference. - * - *

- * If the meaning of the 'Reference Value' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Reference Value' reference. - * @see #setReferenceValue(EObject) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericReferenceValue_ReferenceValue() - * @model - * @generated - */ - EObject getReferenceValue(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue#getReferenceValue Reference Value}' reference. - * - * - * @param value the new value of the 'Reference Value' reference. - * @see #getReferenceValue() - * @generated - */ - void setReferenceValue(EObject value); - -} // GenericReferenceValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java deleted file mode 100644 index b6274f6d4..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSequentialStep.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Generic Sequential Step'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericSequentialStep() - * @model - * @generated - */ -public interface GenericSequentialStep extends SequentialStep, GenericStep { -} // GenericSequentialStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java deleted file mode 100644 index cf2675dda..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericSmallStep.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Generic Small Step'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericSmallStep() - * @model - * @generated - */ -public interface GenericSmallStep extends SmallStep, GenericStep { -} // GenericSmallStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java deleted file mode 100644 index 67db2ee90..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericState.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -/** - * - * A representation of the model object 'Generic State'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesRef Values Ref}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef Started Steps Ref}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedStepsRef Ended Steps Ref}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState() - * @model - * @generated - */ -public interface GenericState extends State { - /** - * Returns the value of the 'Values Ref' reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericValue}. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesRef States Ref}'. - * - *

- * If the meaning of the 'Values Ref' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Values Ref' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState_ValuesRef() - * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesRef - * @model opposite="statesRef" - * @generated - */ - EList getValuesRef(); - - /** - * Returns the value of the 'Started Steps Ref' reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericStep}. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef Starting State Ref}'. - * - *

- * If the meaning of the 'Started Steps Ref' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Started Steps Ref' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState_StartedStepsRef() - * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef - * @model opposite="startingStateRef" - * @generated - */ - EList getStartedStepsRef(); - - /** - * Returns the value of the 'Ended Steps Ref' reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericStep}. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef Ending State Ref}'. - * - *

- * If the meaning of the 'Ended Steps Ref' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Ended Steps Ref' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericState_EndedStepsRef() - * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef - * @model opposite="endingStateRef" - * @generated - */ - EList getEndedStepsRef(); - - /** - * - * - * @model kind="operation" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getValuesRef();'" - * @generated - */ - EList getValues(); - - /** - * - * - * @model kind="operation" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getStartedStepsRef();'" - * @generated - */ - EList getStartedSteps(); - - /** - * - * - * @model kind="operation" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getEndedStepsRef();'" - * @generated - */ - EList getEndedSteps(); - -} // GenericState diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java deleted file mode 100644 index 247adb869..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericStep.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Generic Step'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef Starting State Ref}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef Ending State Ref}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericStep() - * @model abstract="true" - * @generated - */ -public interface GenericStep extends Step { - /** - * Returns the value of the 'Starting State Ref' reference. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef Started Steps Ref}'. - * - *

- * If the meaning of the 'Starting State Ref' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Starting State Ref' reference. - * @see #setStartingStateRef(GenericState) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericStep_StartingStateRef() - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef - * @model opposite="startedStepsRef" required="true" - * @generated - */ - GenericState getStartingStateRef(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef Starting State Ref}' reference. - * - * - * @param value the new value of the 'Starting State Ref' reference. - * @see #getStartingStateRef() - * @generated - */ - void setStartingStateRef(GenericState value); - - /** - * Returns the value of the 'Ending State Ref' reference. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedStepsRef Ended Steps Ref}'. - * - *

- * If the meaning of the 'Ending State Ref' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Ending State Ref' reference. - * @see #setEndingStateRef(GenericState) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericStep_EndingStateRef() - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedStepsRef - * @model opposite="endedStepsRef" - * @generated - */ - GenericState getEndingStateRef(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef Ending State Ref}' reference. - * - * - * @param value the new value of the 'Ending State Ref' reference. - * @see #getEndingStateRef() - * @generated - */ - void setEndingStateRef(GenericState value); - - /** - * - * - * @model kind="operation" required="true" - * @generated - */ - GenericState getStartingState(); - - /** - * - * - * @model kind="operation" - * @generated - */ - GenericState getEndingState(); - -} // GenericStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java deleted file mode 100644 index 74cf4b1c5..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTrace.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Generic Trace'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericTrace() - * @model - * @generated - */ -public interface GenericTrace extends Trace, GenericState> { -} // GenericTrace diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java deleted file mode 100644 index e34a73038..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericTracedObject.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Generic Traced Object'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericTracedObject() - * @model - * @generated - */ -public interface GenericTracedObject extends TracedObject { -} // GenericTracedObject diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java deleted file mode 100644 index 2ecac7b02..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericValue.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -/** - * - * A representation of the model object 'Generic Value'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesRef States Ref}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericValue() - * @model abstract="true" - * @generated - */ -public interface GenericValue extends Value { - /** - * Returns the value of the 'States Ref' reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.GenericState}. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesRef Values Ref}'. - * - *

- * If the meaning of the 'States Ref' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'States Ref' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericValue_StatesRef() - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesRef - * @model opposite="valuesRef" - * @generated - */ - EList getStatesRef(); - - /** - * - * - * @model kind="operation" required="true" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getStatesRef();'" - * @generated - */ - EList getStates(); - -} // GenericValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java deleted file mode 100644 index ad087250e..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationArgumentsParameter.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Initialization Arguments Parameter'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getInitializationArgumentsParameter() - * @model - * @generated - */ -public interface InitializationArgumentsParameter extends LaunchConfigurationParameter { -} // InitializationArgumentsParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java deleted file mode 100644 index e6cad0b9e..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/InitializationMethodParameter.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Initialization Method Parameter'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getInitializationMethodParameter() - * @model - * @generated - */ -public interface InitializationMethodParameter extends LaunchConfigurationParameter { -} // InitializationMethodParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/IntegerAttributevalue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/IntegerAttributevalue.java deleted file mode 100644 index cee126784..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/IntegerAttributevalue.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Integer Attributevalue'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue#getAttributeValue Attribute Value}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getIntegerAttributevalue() - * @model - * @generated - */ -public interface IntegerAttributevalue extends GenericAttributeValue { - /** - * Returns the value of the 'Attribute Value' attribute. - * - *

- * If the meaning of the 'Attribute Value' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Attribute Value' attribute. - * @see #setAttributeValue(int) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getIntegerAttributevalue_AttributeValue() - * @model - * @generated - */ - int getAttributeValue(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue#getAttributeValue Attribute Value}' attribute. - * - * - * @param value the new value of the 'Attribute Value' attribute. - * @see #getAttributeValue() - * @generated - */ - void setAttributeValue(int value); - -} // IntegerAttributevalue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java deleted file mode 100644 index 34c8086d0..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LanguageNameParameter.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Language Name Parameter'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLanguageNameParameter() - * @model - * @generated - */ -public interface LanguageNameParameter extends LaunchConfigurationParameter { -} // LanguageNameParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java deleted file mode 100644 index 948bef421..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Launch Configuration'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getParameters Parameters}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getType Type}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfiguration() - * @model - * @generated - */ -public interface LaunchConfiguration extends EObject { - /** - * Returns the value of the 'Parameters' containment reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter}. - * - *

- * If the meaning of the 'Parameters' containment reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Parameters' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfiguration_Parameters() - * @model containment="true" - * @generated - */ - EList getParameters(); - - /** - * Returns the value of the 'Type' attribute. - * - *

- * If the meaning of the 'Type' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Type' attribute. - * @see #setType(String) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfiguration_Type() - * @model required="true" - * @generated - */ - String getType(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getType Type}' attribute. - * - * - * @param value the new value of the 'Type' attribute. - * @see #getType() - * @generated - */ - void setType(String value); - -} // LaunchConfiguration diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java deleted file mode 100644 index 850dd83cc..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/LaunchConfigurationParameter.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Launch Configuration Parameter'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue Value}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfigurationParameter() - * @model abstract="true" - * @generated - */ -public interface LaunchConfigurationParameter extends EObject { - /** - * Returns the value of the 'Value' attribute. - * The default value is "". - * - *

- * If the meaning of the 'Value' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Value' attribute. - * @see #setValue(String) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getLaunchConfigurationParameter_Value() - * @model default="" - * @generated - */ - String getValue(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue Value}' attribute. - * - * - * @param value the new value of the 'Value' attribute. - * @see #getValue() - * @generated - */ - void setValue(String value); - -} // LaunchConfigurationParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java deleted file mode 100644 index 3cb6663af..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.ecore.ENamedElement; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EOperation; - -/** - * - * A representation of the model object 'MSE'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSE() - * @model abstract="true" - * @generated - */ -public interface MSE extends ENamedElement { - /** - * - * - * @model kind="operation" - * @generated - */ - EObject getCaller(); - - /** - * - * - * @model kind="operation" - * @generated - */ - EOperation getAction(); - -} // MSE diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java deleted file mode 100644 index e8dce1532..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'MSE Model'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs Owned MS Es}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEModel() - * @model - * @generated - */ -public interface MSEModel extends EObject { - /** - * Returns the value of the 'Owned MS Es' containment reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.MSE}. - * - *

- * If the meaning of the 'Owned MS Es' containment reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Owned MS Es' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEModel_OwnedMSEs() - * @model containment="true" - * @generated - */ - EList getOwnedMSEs(); - -} // MSEModel diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java deleted file mode 100644 index 4a1773fb2..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'MSE Occurrence'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters Parameters}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult Result}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence() - * @model - * @generated - */ -public interface MSEOccurrence extends EObject { - /** - * Returns the value of the 'Mse' reference. - * - *

- * If the meaning of the 'Mse' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Mse' reference. - * @see #setMse(MSE) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence_Mse() - * @model required="true" - * @generated - */ - MSE getMse(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}' reference. - * - * - * @param value the new value of the 'Mse' reference. - * @see #getMse() - * @generated - */ - void setMse(MSE value); - - /** - * Returns the value of the 'Parameters' attribute list. - * The list contents are of type {@link java.lang.Object}. - * - *

- * If the meaning of the 'Parameters' attribute list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Parameters' attribute list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence_Parameters() - * @model - * @generated - */ - EList getParameters(); - - /** - * Returns the value of the 'Result' attribute list. - * The list contents are of type {@link java.lang.Object}. - * - *

- * If the meaning of the 'Result' attribute list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Result' attribute list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence_Result() - * @model - * @generated - */ - EList getResult(); - -} // MSEOccurrence diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java deleted file mode 100644 index 10b4d2ae1..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelRootParameter.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Model Root Parameter'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getModelRootParameter() - * @model - * @generated - */ -public interface ModelRootParameter extends LaunchConfigurationParameter { -} // ModelRootParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java deleted file mode 100644 index 4e229ac6a..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ModelURIParameter.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Model URI Parameter'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getModelURIParameter() - * @model - * @generated - */ -public interface ModelURIParameter extends LaunchConfigurationParameter { -} // ModelURIParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java deleted file mode 100644 index 194ee2dcc..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Parallel Step'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getParallelStep() - * @model abstract="true" - * @generated - */ -public interface ParallelStep, StateSubType extends State> extends BigStep { -} // ParallelStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java deleted file mode 100644 index 917b66595..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Sequential Step'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getSequentialStep() - * @model abstract="true" - * @generated - */ -public interface SequentialStep, StateSubType extends State> extends BigStep { -} // SequentialStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java deleted file mode 100644 index 4758d7752..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'Small Step'. - * - * - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getSmallStep() - * @model abstract="true" - * @generated - */ -public interface SmallStep> extends Step { -} // SmallStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java deleted file mode 100644 index de9ed1afd..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'State'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getValues Values}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState() - * @model abstract="true" - * @generated - */ -public interface State, ValueSubType extends Value> extends EObject { - /** - * Returns the value of the 'Started Steps' reference list. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}'. - * - *

- * If the meaning of the 'Started Steps' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Started Steps' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_StartedSteps() - * @see fr.inria.diverse.trace.commons.model.trace.Step#getStartingState - * @model opposite="startingState" - * @generated - */ - EList getStartedSteps(); - - /** - * Returns the value of the 'Ended Steps' reference list. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}'. - * - *

- * If the meaning of the 'Ended Steps' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Ended Steps' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_EndedSteps() - * @see fr.inria.diverse.trace.commons.model.trace.Step#getEndingState - * @model opposite="endingState" - * @generated - */ - EList getEndedSteps(); - - /** - * Returns the value of the 'Values' reference list. - * - *

- * If the meaning of the 'Values' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Values' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_Values() - * @model transient="true" volatile="true" derived="true" - * @generated - */ - EList getValues(); - -} // State diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java deleted file mode 100644 index 130fe3b3e..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java +++ /dev/null @@ -1,108 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Step'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep() - * @model abstract="true" - * @generated - */ -public interface Step> extends EObject { - /** - * Returns the value of the 'Mseoccurrence' containment reference. - * - *

- * If the meaning of the 'Mseoccurrence' containment reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Mseoccurrence' containment reference. - * @see #setMseoccurrence(MSEOccurrence) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_Mseoccurrence() - * @model containment="true" - * @generated - */ - MSEOccurrence getMseoccurrence(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}' containment reference. - * - * - * @param value the new value of the 'Mseoccurrence' containment reference. - * @see #getMseoccurrence() - * @generated - */ - void setMseoccurrence(MSEOccurrence value); - - /** - * Returns the value of the 'Starting State' reference. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}'. - * - *

- * If the meaning of the 'Starting State' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Starting State' reference. - * @see #setStartingState(State) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_StartingState() - * @see fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps - * @model opposite="startedSteps" required="true" - * @generated - */ - StateSubType getStartingState(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}' reference. - * - * - * @param value the new value of the 'Starting State' reference. - * @see #getStartingState() - * @generated - */ - void setStartingState(StateSubType value); - - /** - * Returns the value of the 'Ending State' reference. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}'. - * - *

- * If the meaning of the 'Ending State' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Ending State' reference. - * @see #setEndingState(State) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_EndingState() - * @see fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps - * @model opposite="endedSteps" - * @generated - */ - StateSubType getEndingState(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}' reference. - * - * - * @param value the new value of the 'Ending State' reference. - * @see #getEndingState() - * @generated - */ - void setEndingState(StateSubType value); - -} // Step diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/StringAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/StringAttributeValue.java deleted file mode 100644 index a22a8476a..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/StringAttributeValue.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - - -/** - * - * A representation of the model object 'String Attribute Value'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.StringAttributeValue#getAttributeValue Attribute Value}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStringAttributeValue() - * @model - * @generated - */ -public interface StringAttributeValue extends GenericAttributeValue { - /** - * Returns the value of the 'Attribute Value' attribute. - * - *

- * If the meaning of the 'Attribute Value' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Attribute Value' attribute. - * @see #setAttributeValue(String) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStringAttributeValue_AttributeValue() - * @model - * @generated - */ - String getAttributeValue(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.StringAttributeValue#getAttributeValue Attribute Value}' attribute. - * - * - * @param value the new value of the 'Attribute Value' attribute. - * @see #getAttributeValue() - * @generated - */ - void setAttributeValue(String value); - -} // StringAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java deleted file mode 100644 index 19f219285..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Trace'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects Traced Objects}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getStates States}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace() - * @model abstract="true" - * @generated - */ -public interface Trace, TracedObjectSubtype extends TracedObject, StateSubType extends State> extends EObject { - /** - * Returns the value of the 'Root Step' containment reference. - * - *

- * If the meaning of the 'Root Step' containment reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Root Step' containment reference. - * @see #setRootStep(Step) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_RootStep() - * @model containment="true" required="true" - * @generated - */ - StepSubType getRootStep(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}' containment reference. - * - * - * @param value the new value of the 'Root Step' containment reference. - * @see #getRootStep() - * @generated - */ - void setRootStep(StepSubType value); - - /** - * Returns the value of the 'Traced Objects' containment reference list. - * - *

- * If the meaning of the 'Traced Objects' containment reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Traced Objects' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_TracedObjects() - * @model containment="true" transient="true" volatile="true" derived="true" - * @generated - */ - EList getTracedObjects(); - - /** - * Returns the value of the 'States' containment reference list. - * - *

- * If the meaning of the 'States' containment reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'States' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_States() - * @model containment="true" - * @generated - */ - EList getStates(); - - /** - * Returns the value of the 'Launchconfiguration' containment reference. - * - *

- * If the meaning of the 'Launchconfiguration' containment reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Launchconfiguration' containment reference. - * @see #setLaunchconfiguration(LaunchConfiguration) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_Launchconfiguration() - * @model containment="true" required="true" - * @generated - */ - LaunchConfiguration getLaunchconfiguration(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}' containment reference. - * - * - * @param value the new value of the 'Launchconfiguration' containment reference. - * @see #getLaunchconfiguration() - * @generated - */ - void setLaunchconfiguration(LaunchConfiguration value); - -} // Trace diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java deleted file mode 100644 index 818babf96..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java +++ /dev/null @@ -1,241 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.ecore.EFactory; -import org.eclipse.emf.ecore.EObject; - -/** - * - * The Factory for the model. - * It provides a create method for each non-abstract class of the model. - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage - * @generated - */ -public interface TraceFactory extends EFactory { - /** - * The singleton instance of the factory. - * - * - * @generated - */ - TraceFactory eINSTANCE = fr.inria.diverse.trace.commons.model.trace.impl.TraceFactoryImpl.init(); - - /** - * Returns a new object of class 'MSE Occurrence'. - * - * - * @return a new object of class 'MSE Occurrence'. - * @generated - */ - MSEOccurrence createMSEOccurrence(); - - /** - * Returns a new object of class 'MSE Model'. - * - * - * @return a new object of class 'MSE Model'. - * @generated - */ - MSEModel createMSEModel(); - - /** - * Returns a new object of class 'Generic MSE'. - * - * - * @return a new object of class 'Generic MSE'. - * @generated - */ - GenericMSE createGenericMSE(); - - /** - * Returns a new object of class 'Generic Sequential Step'. - * - * - * @return a new object of class 'Generic Sequential Step'. - * @generated - */ - GenericSequentialStep createGenericSequentialStep(); - - /** - * Returns a new object of class 'Generic Parallel Step'. - * - * - * @return a new object of class 'Generic Parallel Step'. - * @generated - */ - GenericParallelStep createGenericParallelStep(); - - /** - * Returns a new object of class 'Generic Small Step'. - * - * - * @return a new object of class 'Generic Small Step'. - * @generated - */ - GenericSmallStep createGenericSmallStep(); - - /** - * Returns a new object of class 'Generic Reference Value'. - * - * - * @return a new object of class 'Generic Reference Value'. - * @generated - */ - GenericReferenceValue createGenericReferenceValue(); - - /** - * Returns a new object of class 'Generic Dimension'. - * - * - * @return a new object of class 'Generic Dimension'. - * @generated - */ - GenericDimension createGenericDimension(); - - /** - * Returns a new object of class 'Generic Traced Object'. - * - * - * @return a new object of class 'Generic Traced Object'. - * @generated - */ - GenericTracedObject createGenericTracedObject(); - - /** - * Returns a new object of class 'Generic State'. - * - * - * @return a new object of class 'Generic State'. - * @generated - */ - GenericState createGenericState(); - - /** - * Returns a new object of class 'Generic Trace'. - * - * - * @return a new object of class 'Generic Trace'. - * @generated - */ - GenericTrace createGenericTrace(); - - /** - * Returns a new object of class 'Boolean Attribute Value'. - * - * - * @return a new object of class 'Boolean Attribute Value'. - * @generated - */ - BooleanAttributeValue createBooleanAttributeValue(); - - /** - * Returns a new object of class 'Integer Attributevalue'. - * - * - * @return a new object of class 'Integer Attributevalue'. - * @generated - */ - IntegerAttributevalue createIntegerAttributevalue(); - - /** - * Returns a new object of class 'String Attribute Value'. - * - * - * @return a new object of class 'String Attribute Value'. - * @generated - */ - StringAttributeValue createStringAttributeValue(); - - /** - * Returns a new object of class 'Launch Configuration'. - * - * - * @return a new object of class 'Launch Configuration'. - * @generated - */ - LaunchConfiguration createLaunchConfiguration(); - - /** - * Returns a new object of class 'Language Name Parameter'. - * - * - * @return a new object of class 'Language Name Parameter'. - * @generated - */ - LanguageNameParameter createLanguageNameParameter(); - - /** - * Returns a new object of class 'Addon Extension Parameter'. - * - * - * @return a new object of class 'Addon Extension Parameter'. - * @generated - */ - AddonExtensionParameter createAddonExtensionParameter(); - - /** - * Returns a new object of class 'Model URI Parameter'. - * - * - * @return a new object of class 'Model URI Parameter'. - * @generated - */ - ModelURIParameter createModelURIParameter(); - - /** - * Returns a new object of class 'Animator URI Parameter'. - * - * - * @return a new object of class 'Animator URI Parameter'. - * @generated - */ - AnimatorURIParameter createAnimatorURIParameter(); - - /** - * Returns a new object of class 'Entry Point Parameter'. - * - * - * @return a new object of class 'Entry Point Parameter'. - * @generated - */ - EntryPointParameter createEntryPointParameter(); - - /** - * Returns a new object of class 'Initialization Arguments Parameter'. - * - * - * @return a new object of class 'Initialization Arguments Parameter'. - * @generated - */ - InitializationArgumentsParameter createInitializationArgumentsParameter(); - - /** - * Returns a new object of class 'Model Root Parameter'. - * - * - * @return a new object of class 'Model Root Parameter'. - * @generated - */ - ModelRootParameter createModelRootParameter(); - - /** - * Returns a new object of class 'Initialization Method Parameter'. - * - * - * @return a new object of class 'Initialization Method Parameter'. - * @generated - */ - InitializationMethodParameter createInitializationMethodParameter(); - - /** - * Returns the package supported by this factory. - * - * - * @return the package supported by this factory. - * @generated - */ - TracePackage getTracePackage(); - -} //TraceFactory diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java deleted file mode 100644 index af8588330..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java +++ /dev/null @@ -1,3909 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EOperation; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; -import org.eclipse.emf.ecore.EcorePackage; - -/** - * - * The Package for the model. - * It contains accessors for the meta objects to represent - *
    - *
  • each class,
    • - *
  • each feature of each class,
    • - *
  • each operation of each class,
    • - *
  • each enum,
    • - *
  • and each data type
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TraceFactory - * @model kind="package" - * @generated - */ -public interface TracePackage extends EPackage { - /** - * The package name. - * - * - * @generated - */ - String eNAME = "trace"; - - /** - * The package namespace URI. - * - * - * @generated - */ - String eNS_URI = "http://www.gemoc.org/generic_trace"; - - /** - * The package namespace name. - * - * - * @generated - */ - String eNS_PREFIX = "trace"; - - /** - * The singleton instance of the package. - * - * - * @generated - */ - TracePackage eINSTANCE = fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl.init(); - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl MSE Occurrence}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEOccurrence() - * @generated - */ - int MSE_OCCURRENCE = 0; - - /** - * The feature id for the 'Mse' reference. - * - * - * @generated - * @ordered - */ - int MSE_OCCURRENCE__MSE = 0; - - /** - * The feature id for the 'Parameters' attribute list. - * - * - * @generated - * @ordered - */ - int MSE_OCCURRENCE__PARAMETERS = 1; - - /** - * The feature id for the 'Result' attribute list. - * - * - * @generated - * @ordered - */ - int MSE_OCCURRENCE__RESULT = 2; - - /** - * The number of structural features of the 'MSE Occurrence' class. - * - * - * @generated - * @ordered - */ - int MSE_OCCURRENCE_FEATURE_COUNT = 3; - - /** - * The number of operations of the 'MSE Occurrence' class. - * - * - * @generated - * @ordered - */ - int MSE_OCCURRENCE_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl MSE}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSE() - * @generated - */ - int MSE = 1; - - /** - * The feature id for the 'EAnnotations' containment reference list. - * - * - * @generated - * @ordered - */ - int MSE__EANNOTATIONS = EcorePackage.ENAMED_ELEMENT__EANNOTATIONS; - - /** - * The feature id for the 'Name' attribute. - * - * - * @generated - * @ordered - */ - int MSE__NAME = EcorePackage.ENAMED_ELEMENT__NAME; - - /** - * The number of structural features of the 'MSE' class. - * - * - * @generated - * @ordered - */ - int MSE_FEATURE_COUNT = EcorePackage.ENAMED_ELEMENT_FEATURE_COUNT + 0; - - /** - * The operation id for the 'Get EAnnotation' operation. - * - * - * @generated - * @ordered - */ - int MSE___GET_EANNOTATION__STRING = EcorePackage.ENAMED_ELEMENT___GET_EANNOTATION__STRING; - - /** - * The operation id for the 'Get Caller' operation. - * - * - * @generated - * @ordered - */ - int MSE___GET_CALLER = EcorePackage.ENAMED_ELEMENT_OPERATION_COUNT + 0; - - /** - * The operation id for the 'Get Action' operation. - * - * - * @generated - * @ordered - */ - int MSE___GET_ACTION = EcorePackage.ENAMED_ELEMENT_OPERATION_COUNT + 1; - - /** - * The number of operations of the 'MSE' class. - * - * - * @generated - * @ordered - */ - int MSE_OPERATION_COUNT = EcorePackage.ENAMED_ELEMENT_OPERATION_COUNT + 2; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl MSE Model}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEModel() - * @generated - */ - int MSE_MODEL = 2; - - /** - * The feature id for the 'Owned MS Es' containment reference list. - * - * - * @generated - * @ordered - */ - int MSE_MODEL__OWNED_MS_ES = 0; - - /** - * The number of structural features of the 'MSE Model' class. - * - * - * @generated - * @ordered - */ - int MSE_MODEL_FEATURE_COUNT = 1; - - /** - * The number of operations of the 'MSE Model' class. - * - * - * @generated - * @ordered - */ - int MSE_MODEL_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl Generic MSE}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericMSE() - * @generated - */ - int GENERIC_MSE = 3; - - /** - * The feature id for the 'EAnnotations' containment reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_MSE__EANNOTATIONS = MSE__EANNOTATIONS; - - /** - * The feature id for the 'Name' attribute. - * - * - * @generated - * @ordered - */ - int GENERIC_MSE__NAME = MSE__NAME; - - /** - * The feature id for the 'Caller Reference' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_MSE__CALLER_REFERENCE = MSE_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Action Reference' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_MSE__ACTION_REFERENCE = MSE_FEATURE_COUNT + 1; - - /** - * The number of structural features of the 'Generic MSE' class. - * - * - * @generated - * @ordered - */ - int GENERIC_MSE_FEATURE_COUNT = MSE_FEATURE_COUNT + 2; - - /** - * The operation id for the 'Get EAnnotation' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_MSE___GET_EANNOTATION__STRING = MSE___GET_EANNOTATION__STRING; - - /** - * The operation id for the 'Get Caller' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_MSE___GET_CALLER = MSE_OPERATION_COUNT + 0; - - /** - * The operation id for the 'Get Action' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_MSE___GET_ACTION = MSE_OPERATION_COUNT + 1; - - /** - * The number of operations of the 'Generic MSE' class. - * - * - * @generated - * @ordered - */ - int GENERIC_MSE_OPERATION_COUNT = MSE_OPERATION_COUNT + 2; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.StepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getStep() - * @generated - */ - int STEP = 4; - - /** - * The feature id for the 'Mseoccurrence' containment reference. - * - * - * @generated - * @ordered - */ - int STEP__MSEOCCURRENCE = 0; - - /** - * The feature id for the 'Starting State' reference. - * - * - * @generated - * @ordered - */ - int STEP__STARTING_STATE = 1; - - /** - * The feature id for the 'Ending State' reference. - * - * - * @generated - * @ordered - */ - int STEP__ENDING_STATE = 2; - - /** - * The number of structural features of the 'Step' class. - * - * - * @generated - * @ordered - */ - int STEP_FEATURE_COUNT = 3; - - /** - * The number of operations of the 'Step' class. - * - * - * @generated - * @ordered - */ - int STEP_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl Big Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getBigStep() - * @generated - */ - int BIG_STEP = 5; - - /** - * The feature id for the 'Mseoccurrence' containment reference. - * - * - * @generated - * @ordered - */ - int BIG_STEP__MSEOCCURRENCE = STEP__MSEOCCURRENCE; - - /** - * The feature id for the 'Starting State' reference. - * - * - * @generated - * @ordered - */ - int BIG_STEP__STARTING_STATE = STEP__STARTING_STATE; - - /** - * The feature id for the 'Ending State' reference. - * - * - * @generated - * @ordered - */ - int BIG_STEP__ENDING_STATE = STEP__ENDING_STATE; - - /** - * The feature id for the 'Sub Steps' containment reference list. - * - * - * @generated - * @ordered - */ - int BIG_STEP__SUB_STEPS = STEP_FEATURE_COUNT + 0; - - /** - * The number of structural features of the 'Big Step' class. - * - * - * @generated - * @ordered - */ - int BIG_STEP_FEATURE_COUNT = STEP_FEATURE_COUNT + 1; - - /** - * The number of operations of the 'Big Step' class. - * - * - * @generated - * @ordered - */ - int BIG_STEP_OPERATION_COUNT = STEP_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl Small Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSmallStep() - * @generated - */ - int SMALL_STEP = 6; - - /** - * The feature id for the 'Mseoccurrence' containment reference. - * - * - * @generated - * @ordered - */ - int SMALL_STEP__MSEOCCURRENCE = STEP__MSEOCCURRENCE; - - /** - * The feature id for the 'Starting State' reference. - * - * - * @generated - * @ordered - */ - int SMALL_STEP__STARTING_STATE = STEP__STARTING_STATE; - - /** - * The feature id for the 'Ending State' reference. - * - * - * @generated - * @ordered - */ - int SMALL_STEP__ENDING_STATE = STEP__ENDING_STATE; - - /** - * The number of structural features of the 'Small Step' class. - * - * - * @generated - * @ordered - */ - int SMALL_STEP_FEATURE_COUNT = STEP_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Small Step' class. - * - * - * @generated - * @ordered - */ - int SMALL_STEP_OPERATION_COUNT = STEP_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl Sequential Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSequentialStep() - * @generated - */ - int SEQUENTIAL_STEP = 7; - - /** - * The feature id for the 'Mseoccurrence' containment reference. - * - * - * @generated - * @ordered - */ - int SEQUENTIAL_STEP__MSEOCCURRENCE = BIG_STEP__MSEOCCURRENCE; - - /** - * The feature id for the 'Starting State' reference. - * - * - * @generated - * @ordered - */ - int SEQUENTIAL_STEP__STARTING_STATE = BIG_STEP__STARTING_STATE; - - /** - * The feature id for the 'Ending State' reference. - * - * - * @generated - * @ordered - */ - int SEQUENTIAL_STEP__ENDING_STATE = BIG_STEP__ENDING_STATE; - - /** - * The feature id for the 'Sub Steps' containment reference list. - * - * - * @generated - * @ordered - */ - int SEQUENTIAL_STEP__SUB_STEPS = BIG_STEP__SUB_STEPS; - - /** - * The number of structural features of the 'Sequential Step' class. - * - * - * @generated - * @ordered - */ - int SEQUENTIAL_STEP_FEATURE_COUNT = BIG_STEP_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Sequential Step' class. - * - * - * @generated - * @ordered - */ - int SEQUENTIAL_STEP_OPERATION_COUNT = BIG_STEP_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl Parallel Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getParallelStep() - * @generated - */ - int PARALLEL_STEP = 8; - - /** - * The feature id for the 'Mseoccurrence' containment reference. - * - * - * @generated - * @ordered - */ - int PARALLEL_STEP__MSEOCCURRENCE = BIG_STEP__MSEOCCURRENCE; - - /** - * The feature id for the 'Starting State' reference. - * - * - * @generated - * @ordered - */ - int PARALLEL_STEP__STARTING_STATE = BIG_STEP__STARTING_STATE; - - /** - * The feature id for the 'Ending State' reference. - * - * - * @generated - * @ordered - */ - int PARALLEL_STEP__ENDING_STATE = BIG_STEP__ENDING_STATE; - - /** - * The feature id for the 'Sub Steps' containment reference list. - * - * - * @generated - * @ordered - */ - int PARALLEL_STEP__SUB_STEPS = BIG_STEP__SUB_STEPS; - - /** - * The number of structural features of the 'Parallel Step' class. - * - * - * @generated - * @ordered - */ - int PARALLEL_STEP_FEATURE_COUNT = BIG_STEP_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Parallel Step' class. - * - * - * @generated - * @ordered - */ - int PARALLEL_STEP_OPERATION_COUNT = BIG_STEP_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSequentialStepImpl Generic Sequential Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericSequentialStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericSequentialStep() - * @generated - */ - int GENERIC_SEQUENTIAL_STEP = 9; - - /** - * The feature id for the 'Mseoccurrence' containment reference. - * - * - * @generated - * @ordered - */ - int GENERIC_SEQUENTIAL_STEP__MSEOCCURRENCE = SEQUENTIAL_STEP__MSEOCCURRENCE; - - /** - * The feature id for the 'Starting State' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_SEQUENTIAL_STEP__STARTING_STATE = SEQUENTIAL_STEP__STARTING_STATE; - - /** - * The feature id for the 'Ending State' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_SEQUENTIAL_STEP__ENDING_STATE = SEQUENTIAL_STEP__ENDING_STATE; - - /** - * The feature id for the 'Sub Steps' containment reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_SEQUENTIAL_STEP__SUB_STEPS = SEQUENTIAL_STEP__SUB_STEPS; - - /** - * The feature id for the 'Starting State Ref' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF = SEQUENTIAL_STEP_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Ending State Ref' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF = SEQUENTIAL_STEP_FEATURE_COUNT + 1; - - /** - * The number of structural features of the 'Generic Sequential Step' class. - * - * - * @generated - * @ordered - */ - int GENERIC_SEQUENTIAL_STEP_FEATURE_COUNT = SEQUENTIAL_STEP_FEATURE_COUNT + 2; - - /** - * The operation id for the 'Get Starting State' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_SEQUENTIAL_STEP___GET_STARTING_STATE = SEQUENTIAL_STEP_OPERATION_COUNT + 0; - - /** - * The operation id for the 'Get Ending State' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_SEQUENTIAL_STEP___GET_ENDING_STATE = SEQUENTIAL_STEP_OPERATION_COUNT + 1; - - /** - * The number of operations of the 'Generic Sequential Step' class. - * - * - * @generated - * @ordered - */ - int GENERIC_SEQUENTIAL_STEP_OPERATION_COUNT = SEQUENTIAL_STEP_OPERATION_COUNT + 2; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericParallelStepImpl Generic Parallel Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericParallelStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericParallelStep() - * @generated - */ - int GENERIC_PARALLEL_STEP = 10; - - /** - * The feature id for the 'Mseoccurrence' containment reference. - * - * - * @generated - * @ordered - */ - int GENERIC_PARALLEL_STEP__MSEOCCURRENCE = PARALLEL_STEP__MSEOCCURRENCE; - - /** - * The feature id for the 'Starting State' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_PARALLEL_STEP__STARTING_STATE = PARALLEL_STEP__STARTING_STATE; - - /** - * The feature id for the 'Ending State' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_PARALLEL_STEP__ENDING_STATE = PARALLEL_STEP__ENDING_STATE; - - /** - * The feature id for the 'Sub Steps' containment reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_PARALLEL_STEP__SUB_STEPS = PARALLEL_STEP__SUB_STEPS; - - /** - * The feature id for the 'Starting State Ref' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_PARALLEL_STEP__STARTING_STATE_REF = PARALLEL_STEP_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Ending State Ref' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_PARALLEL_STEP__ENDING_STATE_REF = PARALLEL_STEP_FEATURE_COUNT + 1; - - /** - * The number of structural features of the 'Generic Parallel Step' class. - * - * - * @generated - * @ordered - */ - int GENERIC_PARALLEL_STEP_FEATURE_COUNT = PARALLEL_STEP_FEATURE_COUNT + 2; - - /** - * The operation id for the 'Get Starting State' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_PARALLEL_STEP___GET_STARTING_STATE = PARALLEL_STEP_OPERATION_COUNT + 0; - - /** - * The operation id for the 'Get Ending State' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_PARALLEL_STEP___GET_ENDING_STATE = PARALLEL_STEP_OPERATION_COUNT + 1; - - /** - * The number of operations of the 'Generic Parallel Step' class. - * - * - * @generated - * @ordered - */ - int GENERIC_PARALLEL_STEP_OPERATION_COUNT = PARALLEL_STEP_OPERATION_COUNT + 2; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSmallStepImpl Generic Small Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericSmallStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericSmallStep() - * @generated - */ - int GENERIC_SMALL_STEP = 11; - - /** - * The feature id for the 'Mseoccurrence' containment reference. - * - * - * @generated - * @ordered - */ - int GENERIC_SMALL_STEP__MSEOCCURRENCE = SMALL_STEP__MSEOCCURRENCE; - - /** - * The feature id for the 'Starting State' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_SMALL_STEP__STARTING_STATE = SMALL_STEP__STARTING_STATE; - - /** - * The feature id for the 'Ending State' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_SMALL_STEP__ENDING_STATE = SMALL_STEP__ENDING_STATE; - - /** - * The feature id for the 'Starting State Ref' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_SMALL_STEP__STARTING_STATE_REF = SMALL_STEP_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Ending State Ref' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_SMALL_STEP__ENDING_STATE_REF = SMALL_STEP_FEATURE_COUNT + 1; - - /** - * The number of structural features of the 'Generic Small Step' class. - * - * - * @generated - * @ordered - */ - int GENERIC_SMALL_STEP_FEATURE_COUNT = SMALL_STEP_FEATURE_COUNT + 2; - - /** - * The operation id for the 'Get Starting State' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_SMALL_STEP___GET_STARTING_STATE = SMALL_STEP_OPERATION_COUNT + 0; - - /** - * The operation id for the 'Get Ending State' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_SMALL_STEP___GET_ENDING_STATE = SMALL_STEP_OPERATION_COUNT + 1; - - /** - * The number of operations of the 'Generic Small Step' class. - * - * - * @generated - * @ordered - */ - int GENERIC_SMALL_STEP_OPERATION_COUNT = SMALL_STEP_OPERATION_COUNT + 2; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl Trace}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTrace() - * @generated - */ - int TRACE = 12; - - /** - * The feature id for the 'Root Step' containment reference. - * - * - * @generated - * @ordered - */ - int TRACE__ROOT_STEP = 0; - - /** - * The feature id for the 'Traced Objects' containment reference list. - * - * - * @generated - * @ordered - */ - int TRACE__TRACED_OBJECTS = 1; - - /** - * The feature id for the 'States' containment reference list. - * - * - * @generated - * @ordered - */ - int TRACE__STATES = 2; - - /** - * The feature id for the 'Launchconfiguration' containment reference. - * - * - * @generated - * @ordered - */ - int TRACE__LAUNCHCONFIGURATION = 3; - - /** - * The number of structural features of the 'Trace' class. - * - * - * @generated - * @ordered - */ - int TRACE_FEATURE_COUNT = 4; - - /** - * The number of operations of the 'Trace' class. - * - * - * @generated - * @ordered - */ - int TRACE_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl Traced Object}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTracedObject() - * @generated - */ - int TRACED_OBJECT = 13; - - /** - * The feature id for the 'Dimensions' containment reference list. - * - * - * @generated - * @ordered - */ - int TRACED_OBJECT__DIMENSIONS = 0; - - /** - * The number of structural features of the 'Traced Object' class. - * - * - * @generated - * @ordered - */ - int TRACED_OBJECT_FEATURE_COUNT = 1; - - /** - * The operation id for the 'Get Dimensions Internal' operation. - * - * - * @generated - * @ordered - */ - int TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = 0; - - /** - * The number of operations of the 'Traced Object' class. - * - * - * @generated - * @ordered - */ - int TRACED_OBJECT_OPERATION_COUNT = 1; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getDimension() - * @generated - */ - int DIMENSION = 14; - - /** - * The feature id for the 'Values' containment reference list. - * - * - * @generated - * @ordered - */ - int DIMENSION__VALUES = 0; - - /** - * The number of structural features of the 'Dimension' class. - * - * - * @generated - * @ordered - */ - int DIMENSION_FEATURE_COUNT = 1; - - /** - * The number of operations of the 'Dimension' class. - * - * - * @generated - * @ordered - */ - int DIMENSION_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getValue() - * @generated - */ - int VALUE = 15; - - /** - * The feature id for the 'States' reference list. - * - * - * @generated - * @ordered - */ - int VALUE__STATES = 0; - - /** - * The number of structural features of the 'Value' class. - * - * - * @generated - * @ordered - */ - int VALUE_FEATURE_COUNT = 1; - - /** - * The number of operations of the 'Value' class. - * - * - * @generated - * @ordered - */ - int VALUE_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.StateImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getState() - * @generated - */ - int STATE = 16; - - /** - * The feature id for the 'Started Steps' reference list. - * - * - * @generated - * @ordered - */ - int STATE__STARTED_STEPS = 0; - - /** - * The feature id for the 'Ended Steps' reference list. - * - * - * @generated - * @ordered - */ - int STATE__ENDED_STEPS = 1; - - /** - * The feature id for the 'Values' reference list. - * - * - * @generated - * @ordered - */ - int STATE__VALUES = 2; - - /** - * The number of structural features of the 'State' class. - * - * - * @generated - * @ordered - */ - int STATE_FEATURE_COUNT = 3; - - /** - * The number of operations of the 'State' class. - * - * - * @generated - * @ordered - */ - int STATE_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl Generic Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericValue() - * @generated - */ - int GENERIC_VALUE = 37; - - /** - * The feature id for the 'States' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_VALUE__STATES = VALUE__STATES; - - /** - * The feature id for the 'States Ref' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_VALUE__STATES_REF = VALUE_FEATURE_COUNT + 0; - - /** - * The number of structural features of the 'Generic Value' class. - * - * - * @generated - * @ordered - */ - int GENERIC_VALUE_FEATURE_COUNT = VALUE_FEATURE_COUNT + 1; - - /** - * The operation id for the 'Get States' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_VALUE___GET_STATES = VALUE_OPERATION_COUNT + 0; - - /** - * The number of operations of the 'Generic Value' class. - * - * - * @generated - * @ordered - */ - int GENERIC_VALUE_OPERATION_COUNT = VALUE_OPERATION_COUNT + 1; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl Generic Reference Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericReferenceValue() - * @generated - */ - int GENERIC_REFERENCE_VALUE = 17; - - /** - * The feature id for the 'States' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_REFERENCE_VALUE__STATES = GENERIC_VALUE__STATES; - - /** - * The feature id for the 'States Ref' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_REFERENCE_VALUE__STATES_REF = GENERIC_VALUE__STATES_REF; - - /** - * The feature id for the 'Reference Value' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_REFERENCE_VALUE__REFERENCE_VALUE = GENERIC_VALUE_FEATURE_COUNT + 0; - - /** - * The number of structural features of the 'Generic Reference Value' class. - * - * - * @generated - * @ordered - */ - int GENERIC_REFERENCE_VALUE_FEATURE_COUNT = GENERIC_VALUE_FEATURE_COUNT + 1; - - /** - * The operation id for the 'Get States' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_REFERENCE_VALUE___GET_STATES = GENERIC_VALUE___GET_STATES; - - /** - * The number of operations of the 'Generic Reference Value' class. - * - * - * @generated - * @ordered - */ - int GENERIC_REFERENCE_VALUE_OPERATION_COUNT = GENERIC_VALUE_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl Generic Dimension}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericDimension() - * @generated - */ - int GENERIC_DIMENSION = 18; - - /** - * The feature id for the 'Values' containment reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_DIMENSION__VALUES = DIMENSION__VALUES; - - /** - * The feature id for the 'Dynamic Property' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_DIMENSION__DYNAMIC_PROPERTY = DIMENSION_FEATURE_COUNT + 0; - - /** - * The number of structural features of the 'Generic Dimension' class. - * - * - * @generated - * @ordered - */ - int GENERIC_DIMENSION_FEATURE_COUNT = DIMENSION_FEATURE_COUNT + 1; - - /** - * The number of operations of the 'Generic Dimension' class. - * - * - * @generated - * @ordered - */ - int GENERIC_DIMENSION_OPERATION_COUNT = DIMENSION_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTracedObjectImpl Generic Traced Object}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericTracedObjectImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericTracedObject() - * @generated - */ - int GENERIC_TRACED_OBJECT = 19; - - /** - * The feature id for the 'Dimensions' containment reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_TRACED_OBJECT__DIMENSIONS = TRACED_OBJECT__DIMENSIONS; - - /** - * The number of structural features of the 'Generic Traced Object' class. - * - * - * @generated - * @ordered - */ - int GENERIC_TRACED_OBJECT_FEATURE_COUNT = TRACED_OBJECT_FEATURE_COUNT + 0; - - /** - * The operation id for the 'Get Dimensions Internal' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = TRACED_OBJECT___GET_DIMENSIONS_INTERNAL; - - /** - * The number of operations of the 'Generic Traced Object' class. - * - * - * @generated - * @ordered - */ - int GENERIC_TRACED_OBJECT_OPERATION_COUNT = TRACED_OBJECT_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl Generic State}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericState() - * @generated - */ - int GENERIC_STATE = 20; - - /** - * The feature id for the 'Started Steps' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE__STARTED_STEPS = STATE__STARTED_STEPS; - - /** - * The feature id for the 'Ended Steps' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE__ENDED_STEPS = STATE__ENDED_STEPS; - - /** - * The feature id for the 'Values' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE__VALUES = STATE__VALUES; - - /** - * The feature id for the 'Values Ref' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE__VALUES_REF = STATE_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Started Steps Ref' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE__STARTED_STEPS_REF = STATE_FEATURE_COUNT + 1; - - /** - * The feature id for the 'Ended Steps Ref' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE__ENDED_STEPS_REF = STATE_FEATURE_COUNT + 2; - - /** - * The number of structural features of the 'Generic State' class. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE_FEATURE_COUNT = STATE_FEATURE_COUNT + 3; - - /** - * The operation id for the 'Get Values' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE___GET_VALUES = STATE_OPERATION_COUNT + 0; - - /** - * The operation id for the 'Get Started Steps' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE___GET_STARTED_STEPS = STATE_OPERATION_COUNT + 1; - - /** - * The operation id for the 'Get Ended Steps' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE___GET_ENDED_STEPS = STATE_OPERATION_COUNT + 2; - - /** - * The number of operations of the 'Generic State' class. - * - * - * @generated - * @ordered - */ - int GENERIC_STATE_OPERATION_COUNT = STATE_OPERATION_COUNT + 3; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl Generic Trace}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericTrace() - * @generated - */ - int GENERIC_TRACE = 21; - - /** - * The feature id for the 'Root Step' containment reference. - * - * - * @generated - * @ordered - */ - int GENERIC_TRACE__ROOT_STEP = TRACE__ROOT_STEP; - - /** - * The feature id for the 'Traced Objects' containment reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_TRACE__TRACED_OBJECTS = TRACE__TRACED_OBJECTS; - - /** - * The feature id for the 'States' containment reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_TRACE__STATES = TRACE__STATES; - - /** - * The feature id for the 'Launchconfiguration' containment reference. - * - * - * @generated - * @ordered - */ - int GENERIC_TRACE__LAUNCHCONFIGURATION = TRACE__LAUNCHCONFIGURATION; - - /** - * The number of structural features of the 'Generic Trace' class. - * - * - * @generated - * @ordered - */ - int GENERIC_TRACE_FEATURE_COUNT = TRACE_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Generic Trace' class. - * - * - * @generated - * @ordered - */ - int GENERIC_TRACE_OPERATION_COUNT = TRACE_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericAttributeValueImpl Generic Attribute Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericAttributeValue() - * @generated - */ - int GENERIC_ATTRIBUTE_VALUE = 22; - - /** - * The feature id for the 'States' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_ATTRIBUTE_VALUE__STATES = GENERIC_VALUE__STATES; - - /** - * The feature id for the 'States Ref' reference list. - * - * - * @generated - * @ordered - */ - int GENERIC_ATTRIBUTE_VALUE__STATES_REF = GENERIC_VALUE__STATES_REF; - - /** - * The number of structural features of the 'Generic Attribute Value' class. - * - * - * @generated - * @ordered - */ - int GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_VALUE_FEATURE_COUNT + 0; - - /** - * The operation id for the 'Get States' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_ATTRIBUTE_VALUE___GET_STATES = GENERIC_VALUE___GET_STATES; - - /** - * The number of operations of the 'Generic Attribute Value' class. - * - * - * @generated - * @ordered - */ - int GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_VALUE_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getBooleanAttributeValue() - * @generated - */ - int BOOLEAN_ATTRIBUTE_VALUE = 23; - - /** - * The feature id for the 'States' reference list. - * - * - * @generated - * @ordered - */ - int BOOLEAN_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; - - /** - * The feature id for the 'States Ref' reference list. - * - * - * @generated - * @ordered - */ - int BOOLEAN_ATTRIBUTE_VALUE__STATES_REF = GENERIC_ATTRIBUTE_VALUE__STATES_REF; - - /** - * The feature id for the 'Attribute Value' attribute. - * - * - * @generated - * @ordered - */ - int BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; - - /** - * The number of structural features of the 'Boolean Attribute Value' class. - * - * - * @generated - * @ordered - */ - int BOOLEAN_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; - - /** - * The operation id for the 'Get States' operation. - * - * - * @generated - * @ordered - */ - int BOOLEAN_ATTRIBUTE_VALUE___GET_STATES = GENERIC_ATTRIBUTE_VALUE___GET_STATES; - - /** - * The number of operations of the 'Boolean Attribute Value' class. - * - * - * @generated - * @ordered - */ - int BOOLEAN_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.IntegerAttributevalueImpl Integer Attributevalue}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.IntegerAttributevalueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getIntegerAttributevalue() - * @generated - */ - int INTEGER_ATTRIBUTEVALUE = 24; - - /** - * The feature id for the 'States' reference list. - * - * - * @generated - * @ordered - */ - int INTEGER_ATTRIBUTEVALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; - - /** - * The feature id for the 'States Ref' reference list. - * - * - * @generated - * @ordered - */ - int INTEGER_ATTRIBUTEVALUE__STATES_REF = GENERIC_ATTRIBUTE_VALUE__STATES_REF; - - /** - * The feature id for the 'Attribute Value' attribute. - * - * - * @generated - * @ordered - */ - int INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; - - /** - * The number of structural features of the 'Integer Attributevalue' class. - * - * - * @generated - * @ordered - */ - int INTEGER_ATTRIBUTEVALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; - - /** - * The operation id for the 'Get States' operation. - * - * - * @generated - * @ordered - */ - int INTEGER_ATTRIBUTEVALUE___GET_STATES = GENERIC_ATTRIBUTE_VALUE___GET_STATES; - - /** - * The number of operations of the 'Integer Attributevalue' class. - * - * - * @generated - * @ordered - */ - int INTEGER_ATTRIBUTEVALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StringAttributeValueImpl String Attribute Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.StringAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getStringAttributeValue() - * @generated - */ - int STRING_ATTRIBUTE_VALUE = 25; - - /** - * The feature id for the 'States' reference list. - * - * - * @generated - * @ordered - */ - int STRING_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; - - /** - * The feature id for the 'States Ref' reference list. - * - * - * @generated - * @ordered - */ - int STRING_ATTRIBUTE_VALUE__STATES_REF = GENERIC_ATTRIBUTE_VALUE__STATES_REF; - - /** - * The feature id for the 'Attribute Value' attribute. - * - * - * @generated - * @ordered - */ - int STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; - - /** - * The number of structural features of the 'String Attribute Value' class. - * - * - * @generated - * @ordered - */ - int STRING_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; - - /** - * The operation id for the 'Get States' operation. - * - * - * @generated - * @ordered - */ - int STRING_ATTRIBUTE_VALUE___GET_STATES = GENERIC_ATTRIBUTE_VALUE___GET_STATES; - - /** - * The number of operations of the 'String Attribute Value' class. - * - * - * @generated - * @ordered - */ - int STRING_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl Launch Configuration}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLaunchConfiguration() - * @generated - */ - int LAUNCH_CONFIGURATION = 26; - - /** - * The feature id for the 'Parameters' containment reference list. - * - * - * @generated - * @ordered - */ - int LAUNCH_CONFIGURATION__PARAMETERS = 0; - - /** - * The feature id for the 'Type' attribute. - * - * - * @generated - * @ordered - */ - int LAUNCH_CONFIGURATION__TYPE = 1; - - /** - * The number of structural features of the 'Launch Configuration' class. - * - * - * @generated - * @ordered - */ - int LAUNCH_CONFIGURATION_FEATURE_COUNT = 2; - - /** - * The number of operations of the 'Launch Configuration' class. - * - * - * @generated - * @ordered - */ - int LAUNCH_CONFIGURATION_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl Launch Configuration Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLaunchConfigurationParameter() - * @generated - */ - int LAUNCH_CONFIGURATION_PARAMETER = 27; - - /** - * The feature id for the 'Value' attribute. - * - * - * @generated - * @ordered - */ - int LAUNCH_CONFIGURATION_PARAMETER__VALUE = 0; - - /** - * The number of structural features of the 'Launch Configuration Parameter' class. - * - * - * @generated - * @ordered - */ - int LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT = 1; - - /** - * The number of operations of the 'Launch Configuration Parameter' class. - * - * - * @generated - * @ordered - */ - int LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl Language Name Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLanguageNameParameter() - * @generated - */ - int LANGUAGE_NAME_PARAMETER = 28; - - /** - * The feature id for the 'Value' attribute. - * - * - * @generated - * @ordered - */ - int LANGUAGE_NAME_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; - - /** - * The number of structural features of the 'Language Name Parameter' class. - * - * - * @generated - * @ordered - */ - int LANGUAGE_NAME_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Language Name Parameter' class. - * - * - * @generated - * @ordered - */ - int LANGUAGE_NAME_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getAddonExtensionParameter() - * @generated - */ - int ADDON_EXTENSION_PARAMETER = 29; - - /** - * The feature id for the 'Value' attribute. - * - * - * @generated - * @ordered - */ - int ADDON_EXTENSION_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; - - /** - * The number of structural features of the 'Addon Extension Parameter' class. - * - * - * @generated - * @ordered - */ - int ADDON_EXTENSION_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Addon Extension Parameter' class. - * - * - * @generated - * @ordered - */ - int ADDON_EXTENSION_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ModelURIParameterImpl Model URI Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ModelURIParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getModelURIParameter() - * @generated - */ - int MODEL_URI_PARAMETER = 30; - - /** - * The feature id for the 'Value' attribute. - * - * - * @generated - * @ordered - */ - int MODEL_URI_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; - - /** - * The number of structural features of the 'Model URI Parameter' class. - * - * - * @generated - * @ordered - */ - int MODEL_URI_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Model URI Parameter' class. - * - * - * @generated - * @ordered - */ - int MODEL_URI_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.AnimatorURIParameterImpl Animator URI Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.AnimatorURIParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getAnimatorURIParameter() - * @generated - */ - int ANIMATOR_URI_PARAMETER = 31; - - /** - * The feature id for the 'Value' attribute. - * - * - * @generated - * @ordered - */ - int ANIMATOR_URI_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; - - /** - * The number of structural features of the 'Animator URI Parameter' class. - * - * - * @generated - * @ordered - */ - int ANIMATOR_URI_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Animator URI Parameter' class. - * - * - * @generated - * @ordered - */ - int ANIMATOR_URI_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.EntryPointParameterImpl Entry Point Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.EntryPointParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getEntryPointParameter() - * @generated - */ - int ENTRY_POINT_PARAMETER = 32; - - /** - * The feature id for the 'Value' attribute. - * - * - * @generated - * @ordered - */ - int ENTRY_POINT_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; - - /** - * The number of structural features of the 'Entry Point Parameter' class. - * - * - * @generated - * @ordered - */ - int ENTRY_POINT_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Entry Point Parameter' class. - * - * - * @generated - * @ordered - */ - int ENTRY_POINT_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getInitializationArgumentsParameter() - * @generated - */ - int INITIALIZATION_ARGUMENTS_PARAMETER = 33; - - /** - * The feature id for the 'Value' attribute. - * - * - * @generated - * @ordered - */ - int INITIALIZATION_ARGUMENTS_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; - - /** - * The number of structural features of the 'Initialization Arguments Parameter' class. - * - * - * @generated - * @ordered - */ - int INITIALIZATION_ARGUMENTS_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Initialization Arguments Parameter' class. - * - * - * @generated - * @ordered - */ - int INITIALIZATION_ARGUMENTS_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ModelRootParameterImpl Model Root Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ModelRootParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getModelRootParameter() - * @generated - */ - int MODEL_ROOT_PARAMETER = 34; - - /** - * The feature id for the 'Value' attribute. - * - * - * @generated - * @ordered - */ - int MODEL_ROOT_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; - - /** - * The number of structural features of the 'Model Root Parameter' class. - * - * - * @generated - * @ordered - */ - int MODEL_ROOT_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Model Root Parameter' class. - * - * - * @generated - * @ordered - */ - int MODEL_ROOT_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.InitializationMethodParameterImpl Initialization Method Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.InitializationMethodParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getInitializationMethodParameter() - * @generated - */ - int INITIALIZATION_METHOD_PARAMETER = 35; - - /** - * The feature id for the 'Value' attribute. - * - * - * @generated - * @ordered - */ - int INITIALIZATION_METHOD_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; - - /** - * The number of structural features of the 'Initialization Method Parameter' class. - * - * - * @generated - * @ordered - */ - int INITIALIZATION_METHOD_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Initialization Method Parameter' class. - * - * - * @generated - * @ordered - */ - int INITIALIZATION_METHOD_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl Generic Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericStep() - * @generated - */ - int GENERIC_STEP = 36; - - /** - * The feature id for the 'Mseoccurrence' containment reference. - * - * - * @generated - * @ordered - */ - int GENERIC_STEP__MSEOCCURRENCE = STEP__MSEOCCURRENCE; - - /** - * The feature id for the 'Starting State' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_STEP__STARTING_STATE = STEP__STARTING_STATE; - - /** - * The feature id for the 'Ending State' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_STEP__ENDING_STATE = STEP__ENDING_STATE; - - /** - * The feature id for the 'Starting State Ref' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_STEP__STARTING_STATE_REF = STEP_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Ending State Ref' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_STEP__ENDING_STATE_REF = STEP_FEATURE_COUNT + 1; - - /** - * The number of structural features of the 'Generic Step' class. - * - * - * @generated - * @ordered - */ - int GENERIC_STEP_FEATURE_COUNT = STEP_FEATURE_COUNT + 2; - - /** - * The operation id for the 'Get Starting State' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_STEP___GET_STARTING_STATE = STEP_OPERATION_COUNT + 0; - - /** - * The operation id for the 'Get Ending State' operation. - * - * - * @generated - * @ordered - */ - int GENERIC_STEP___GET_ENDING_STATE = STEP_OPERATION_COUNT + 1; - - /** - * The number of operations of the 'Generic Step' class. - * - * - * @generated - * @ordered - */ - int GENERIC_STEP_OPERATION_COUNT = STEP_OPERATION_COUNT + 2; - - /** - * The meta object id for the 'ISerializable' data type. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() - * @generated - */ - int ISERIALIZABLE = 38; - - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence MSE Occurrence}'. - * - * - * @return the meta object for class 'MSE Occurrence'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence - * @generated - */ - EClass getMSEOccurrence(); - - /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}'. - * - * - * @return the meta object for the reference 'Mse'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse() - * @see #getMSEOccurrence() - * @generated - */ - EReference getMSEOccurrence_Mse(); - - /** - * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters Parameters}'. - * - * - * @return the meta object for the attribute list 'Parameters'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters() - * @see #getMSEOccurrence() - * @generated - */ - EAttribute getMSEOccurrence_Parameters(); - - /** - * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult Result}'. - * - * - * @return the meta object for the attribute list 'Result'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult() - * @see #getMSEOccurrence() - * @generated - */ - EAttribute getMSEOccurrence_Result(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSE MSE}'. - * - * - * @return the meta object for class 'MSE'. - * @see fr.inria.diverse.trace.commons.model.trace.MSE - * @generated - */ - EClass getMSE(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.MSE#getCaller() Get Caller}' operation. - * - * - * @return the meta object for the 'Get Caller' operation. - * @see fr.inria.diverse.trace.commons.model.trace.MSE#getCaller() - * @generated - */ - EOperation getMSE__GetCaller(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.MSE#getAction() Get Action}' operation. - * - * - * @return the meta object for the 'Get Action' operation. - * @see fr.inria.diverse.trace.commons.model.trace.MSE#getAction() - * @generated - */ - EOperation getMSE__GetAction(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel MSE Model}'. - * - * - * @return the meta object for class 'MSE Model'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEModel - * @generated - */ - EClass getMSEModel(); - - /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs Owned MS Es}'. - * - * - * @return the meta object for the containment reference list 'Owned MS Es'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs() - * @see #getMSEModel() - * @generated - */ - EReference getMSEModel_OwnedMSEs(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE Generic MSE}'. - * - * - * @return the meta object for class 'Generic MSE'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE - * @generated - */ - EClass getGenericMSE(); - - /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}'. - * - * - * @return the meta object for the reference 'Caller Reference'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference() - * @see #getGenericMSE() - * @generated - */ - EReference getGenericMSE_CallerReference(); - - /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}'. - * - * - * @return the meta object for the reference 'Action Reference'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference() - * @see #getGenericMSE() - * @generated - */ - EReference getGenericMSE_ActionReference(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCaller() Get Caller}' operation. - * - * - * @return the meta object for the 'Get Caller' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCaller() - * @generated - */ - EOperation getGenericMSE__GetCaller(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getAction() Get Action}' operation. - * - * - * @return the meta object for the 'Get Action' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getAction() - * @generated - */ - EOperation getGenericMSE__GetAction(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. - * - * - * @return the meta object for class 'Step'. - * @see fr.inria.diverse.trace.commons.model.trace.Step - * @generated - */ - EClass getStep(); - - /** - * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}'. - * - * - * @return the meta object for the containment reference 'Mseoccurrence'. - * @see fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence() - * @see #getStep() - * @generated - */ - EReference getStep_Mseoccurrence(); - - /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}'. - * - * - * @return the meta object for the reference 'Starting State'. - * @see fr.inria.diverse.trace.commons.model.trace.Step#getStartingState() - * @see #getStep() - * @generated - */ - EReference getStep_StartingState(); - - /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}'. - * - * - * @return the meta object for the reference 'Ending State'. - * @see fr.inria.diverse.trace.commons.model.trace.Step#getEndingState() - * @see #getStep() - * @generated - */ - EReference getStep_EndingState(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. - * - * - * @return the meta object for class 'Big Step'. - * @see fr.inria.diverse.trace.commons.model.trace.BigStep - * @generated - */ - EClass getBigStep(); - - /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps Sub Steps}'. - * - * - * @return the meta object for the containment reference list 'Sub Steps'. - * @see fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps() - * @see #getBigStep() - * @generated - */ - EReference getBigStep_SubSteps(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. - * - * - * @return the meta object for class 'Small Step'. - * @see fr.inria.diverse.trace.commons.model.trace.SmallStep - * @generated - */ - EClass getSmallStep(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. - * - * - * @return the meta object for class 'Sequential Step'. - * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep - * @generated - */ - EClass getSequentialStep(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.ParallelStep Parallel Step}'. - * - * - * @return the meta object for class 'Parallel Step'. - * @see fr.inria.diverse.trace.commons.model.trace.ParallelStep - * @generated - */ - EClass getParallelStep(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep Generic Sequential Step}'. - * - * - * @return the meta object for class 'Generic Sequential Step'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep - * @generated - */ - EClass getGenericSequentialStep(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericParallelStep Generic Parallel Step}'. - * - * - * @return the meta object for class 'Generic Parallel Step'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericParallelStep - * @generated - */ - EClass getGenericParallelStep(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericSmallStep Generic Small Step}'. - * - * - * @return the meta object for class 'Generic Small Step'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericSmallStep - * @generated - */ - EClass getGenericSmallStep(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. - * - * - * @return the meta object for class 'Trace'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace - * @generated - */ - EClass getTrace(); - - /** - * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}'. - * - * - * @return the meta object for the containment reference 'Root Step'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep() - * @see #getTrace() - * @generated - */ - EReference getTrace_RootStep(); - - /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects Traced Objects}'. - * - * - * @return the meta object for the containment reference list 'Traced Objects'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects() - * @see #getTrace() - * @generated - */ - EReference getTrace_TracedObjects(); - - /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getStates States}'. - * - * - * @return the meta object for the containment reference list 'States'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace#getStates() - * @see #getTrace() - * @generated - */ - EReference getTrace_States(); - - /** - * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}'. - * - * - * @return the meta object for the containment reference 'Launchconfiguration'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration() - * @see #getTrace() - * @generated - */ - EReference getTrace_Launchconfiguration(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. - * - * - * @return the meta object for class 'Traced Object'. - * @see fr.inria.diverse.trace.commons.model.trace.TracedObject - * @generated - */ - EClass getTracedObject(); - - /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions Dimensions}'. - * - * - * @return the meta object for the containment reference list 'Dimensions'. - * @see fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions() - * @see #getTracedObject() - * @generated - */ - EReference getTracedObject_Dimensions(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensionsInternal() Get Dimensions Internal}' operation. - * - * - * @return the meta object for the 'Get Dimensions Internal' operation. - * @see fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensionsInternal() - * @generated - */ - EOperation getTracedObject__GetDimensionsInternal(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. - * - * - * @return the meta object for class 'Dimension'. - * @see fr.inria.diverse.trace.commons.model.trace.Dimension - * @generated - */ - EClass getDimension(); - - /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Dimension#getValues Values}'. - * - * - * @return the meta object for the containment reference list 'Values'. - * @see fr.inria.diverse.trace.commons.model.trace.Dimension#getValues() - * @see #getDimension() - * @generated - */ - EReference getDimension_Values(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. - * - * - * @return the meta object for class 'Value'. - * @see fr.inria.diverse.trace.commons.model.trace.Value - * @generated - */ - EClass getValue(); - - /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.Value#getStates States}'. - * - * - * @return the meta object for the reference list 'States'. - * @see fr.inria.diverse.trace.commons.model.trace.Value#getStates() - * @see #getValue() - * @generated - */ - EReference getValue_States(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. - * - * - * @return the meta object for class 'State'. - * @see fr.inria.diverse.trace.commons.model.trace.State - * @generated - */ - EClass getState(); - - /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}'. - * - * - * @return the meta object for the reference list 'Started Steps'. - * @see fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps() - * @see #getState() - * @generated - */ - EReference getState_StartedSteps(); - - /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}'. - * - * - * @return the meta object for the reference list 'Ended Steps'. - * @see fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps() - * @see #getState() - * @generated - */ - EReference getState_EndedSteps(); - - /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getValues Values}'. - * - * - * @return the meta object for the reference list 'Values'. - * @see fr.inria.diverse.trace.commons.model.trace.State#getValues() - * @see #getState() - * @generated - */ - EReference getState_Values(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue Generic Reference Value}'. - * - * - * @return the meta object for class 'Generic Reference Value'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue - * @generated - */ - EClass getGenericReferenceValue(); - - /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue#getReferenceValue Reference Value}'. - * - * - * @return the meta object for the reference 'Reference Value'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue#getReferenceValue() - * @see #getGenericReferenceValue() - * @generated - */ - EReference getGenericReferenceValue_ReferenceValue(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericDimension Generic Dimension}'. - * - * - * @return the meta object for class 'Generic Dimension'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericDimension - * @generated - */ - EClass getGenericDimension(); - - /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericDimension#getDynamicProperty Dynamic Property}'. - * - * - * @return the meta object for the reference 'Dynamic Property'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericDimension#getDynamicProperty() - * @see #getGenericDimension() - * @generated - */ - EReference getGenericDimension_DynamicProperty(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericTracedObject Generic Traced Object}'. - * - * - * @return the meta object for class 'Generic Traced Object'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericTracedObject - * @generated - */ - EClass getGenericTracedObject(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericState Generic State}'. - * - * - * @return the meta object for class 'Generic State'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericState - * @generated - */ - EClass getGenericState(); - - /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesRef Values Ref}'. - * - * - * @return the meta object for the reference list 'Values Ref'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValuesRef() - * @see #getGenericState() - * @generated - */ - EReference getGenericState_ValuesRef(); - - /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef Started Steps Ref}'. - * - * - * @return the meta object for the reference list 'Started Steps Ref'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedStepsRef() - * @see #getGenericState() - * @generated - */ - EReference getGenericState_StartedStepsRef(); - - /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedStepsRef Ended Steps Ref}'. - * - * - * @return the meta object for the reference list 'Ended Steps Ref'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedStepsRef() - * @see #getGenericState() - * @generated - */ - EReference getGenericState_EndedStepsRef(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getValues() Get Values}' operation. - * - * - * @return the meta object for the 'Get Values' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getValues() - * @generated - */ - EOperation getGenericState__GetValues(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedSteps() Get Started Steps}' operation. - * - * - * @return the meta object for the 'Get Started Steps' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getStartedSteps() - * @generated - */ - EOperation getGenericState__GetStartedSteps(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedSteps() Get Ended Steps}' operation. - * - * - * @return the meta object for the 'Get Ended Steps' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericState#getEndedSteps() - * @generated - */ - EOperation getGenericState__GetEndedSteps(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericTrace Generic Trace}'. - * - * - * @return the meta object for class 'Generic Trace'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericTrace - * @generated - */ - EClass getGenericTrace(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue Generic Attribute Value}'. - * - * - * @return the meta object for class 'Generic Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue - * @generated - */ - EClass getGenericAttributeValue(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue Boolean Attribute Value}'. - * - * - * @return the meta object for class 'Boolean Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue - * @generated - */ - EClass getBooleanAttributeValue(); - - /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue#isAttributeValue Attribute Value}'. - * - * - * @return the meta object for the attribute 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue#isAttributeValue() - * @see #getBooleanAttributeValue() - * @generated - */ - EAttribute getBooleanAttributeValue_AttributeValue(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue Integer Attributevalue}'. - * - * - * @return the meta object for class 'Integer Attributevalue'. - * @see fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue - * @generated - */ - EClass getIntegerAttributevalue(); - - /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue#getAttributeValue Attribute Value}'. - * - * - * @return the meta object for the attribute 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue#getAttributeValue() - * @see #getIntegerAttributevalue() - * @generated - */ - EAttribute getIntegerAttributevalue_AttributeValue(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.StringAttributeValue String Attribute Value}'. - * - * - * @return the meta object for class 'String Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.trace.StringAttributeValue - * @generated - */ - EClass getStringAttributeValue(); - - /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.StringAttributeValue#getAttributeValue Attribute Value}'. - * - * - * @return the meta object for the attribute 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.trace.StringAttributeValue#getAttributeValue() - * @see #getStringAttributeValue() - * @generated - */ - EAttribute getStringAttributeValue_AttributeValue(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration Launch Configuration}'. - * - * - * @return the meta object for class 'Launch Configuration'. - * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration - * @generated - */ - EClass getLaunchConfiguration(); - - /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getParameters Parameters}'. - * - * - * @return the meta object for the containment reference list 'Parameters'. - * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getParameters() - * @see #getLaunchConfiguration() - * @generated - */ - EReference getLaunchConfiguration_Parameters(); - - /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getType Type}'. - * - * - * @return the meta object for the attribute 'Type'. - * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration#getType() - * @see #getLaunchConfiguration() - * @generated - */ - EAttribute getLaunchConfiguration_Type(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter Launch Configuration Parameter}'. - * - * - * @return the meta object for class 'Launch Configuration Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter - * @generated - */ - EClass getLaunchConfigurationParameter(); - - /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue Value}'. - * - * - * @return the meta object for the attribute 'Value'. - * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter#getValue() - * @see #getLaunchConfigurationParameter() - * @generated - */ - EAttribute getLaunchConfigurationParameter_Value(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter Language Name Parameter}'. - * - * - * @return the meta object for class 'Language Name Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter - * @generated - */ - EClass getLanguageNameParameter(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter Addon Extension Parameter}'. - * - * - * @return the meta object for class 'Addon Extension Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter - * @generated - */ - EClass getAddonExtensionParameter(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.ModelURIParameter Model URI Parameter}'. - * - * - * @return the meta object for class 'Model URI Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.ModelURIParameter - * @generated - */ - EClass getModelURIParameter(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter Animator URI Parameter}'. - * - * - * @return the meta object for class 'Animator URI Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter - * @generated - */ - EClass getAnimatorURIParameter(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.EntryPointParameter Entry Point Parameter}'. - * - * - * @return the meta object for class 'Entry Point Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.EntryPointParameter - * @generated - */ - EClass getEntryPointParameter(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter Initialization Arguments Parameter}'. - * - * - * @return the meta object for class 'Initialization Arguments Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter - * @generated - */ - EClass getInitializationArgumentsParameter(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.ModelRootParameter Model Root Parameter}'. - * - * - * @return the meta object for class 'Model Root Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.ModelRootParameter - * @generated - */ - EClass getModelRootParameter(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter Initialization Method Parameter}'. - * - * - * @return the meta object for class 'Initialization Method Parameter'. - * @see fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter - * @generated - */ - EClass getInitializationMethodParameter(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep Generic Step}'. - * - * - * @return the meta object for class 'Generic Step'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericStep - * @generated - */ - EClass getGenericStep(); - - /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef Starting State Ref}'. - * - * - * @return the meta object for the reference 'Starting State Ref'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingStateRef() - * @see #getGenericStep() - * @generated - */ - EReference getGenericStep_StartingStateRef(); - - /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef Ending State Ref}'. - * - * - * @return the meta object for the reference 'Ending State Ref'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingStateRef() - * @see #getGenericStep() - * @generated - */ - EReference getGenericStep_EndingStateRef(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingState() Get Starting State}' operation. - * - * - * @return the meta object for the 'Get Starting State' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getStartingState() - * @generated - */ - EOperation getGenericStep__GetStartingState(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingState() Get Ending State}' operation. - * - * - * @return the meta object for the 'Get Ending State' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericStep#getEndingState() - * @generated - */ - EOperation getGenericStep__GetEndingState(); - - /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue Generic Value}'. - * - * - * @return the meta object for class 'Generic Value'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericValue - * @generated - */ - EClass getGenericValue(); - - /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesRef States Ref}'. - * - * - * @return the meta object for the reference list 'States Ref'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStatesRef() - * @see #getGenericValue() - * @generated - */ - EReference getGenericValue_StatesRef(); - - /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates() Get States}' operation. - * - * - * @return the meta object for the 'Get States' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericValue#getStates() - * @generated - */ - EOperation getGenericValue__GetStates(); - - /** - * Returns the meta object for data type 'ISerializable'. - * - * - * @return the meta object for data type 'ISerializable'. - * @model instanceClass="byte[]" - * @generated - */ - EDataType getISerializable(); - - /** - * Returns the factory that creates the instances of the model. - * - * - * @return the factory that creates the instances of the model. - * @generated - */ - TraceFactory getTraceFactory(); - - /** - * - * Defines literals for the meta objects that represent - *
    - *
  • each class,
    • - *
  • each feature of each class,
    • - *
  • each operation of each class,
    • - *
  • each enum,
    • - *
  • and each data type
    • - *
- * - * @generated - */ - interface Literals { - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl MSE Occurrence}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEOccurrence() - * @generated - */ - EClass MSE_OCCURRENCE = eINSTANCE.getMSEOccurrence(); - - /** - * The meta object literal for the 'Mse' reference feature. - * - * - * @generated - */ - EReference MSE_OCCURRENCE__MSE = eINSTANCE.getMSEOccurrence_Mse(); - - /** - * The meta object literal for the 'Parameters' attribute list feature. - * - * - * @generated - */ - EAttribute MSE_OCCURRENCE__PARAMETERS = eINSTANCE.getMSEOccurrence_Parameters(); - - /** - * The meta object literal for the 'Result' attribute list feature. - * - * - * @generated - */ - EAttribute MSE_OCCURRENCE__RESULT = eINSTANCE.getMSEOccurrence_Result(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl MSE}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSE() - * @generated - */ - EClass MSE = eINSTANCE.getMSE(); - - /** - * The meta object literal for the 'Get Caller' operation. - * - * - * @generated - */ - EOperation MSE___GET_CALLER = eINSTANCE.getMSE__GetCaller(); - - /** - * The meta object literal for the 'Get Action' operation. - * - * - * @generated - */ - EOperation MSE___GET_ACTION = eINSTANCE.getMSE__GetAction(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl MSE Model}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEModel() - * @generated - */ - EClass MSE_MODEL = eINSTANCE.getMSEModel(); - - /** - * The meta object literal for the 'Owned MS Es' containment reference list feature. - * - * - * @generated - */ - EReference MSE_MODEL__OWNED_MS_ES = eINSTANCE.getMSEModel_OwnedMSEs(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl Generic MSE}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericMSE() - * @generated - */ - EClass GENERIC_MSE = eINSTANCE.getGenericMSE(); - - /** - * The meta object literal for the 'Caller Reference' reference feature. - * - * - * @generated - */ - EReference GENERIC_MSE__CALLER_REFERENCE = eINSTANCE.getGenericMSE_CallerReference(); - - /** - * The meta object literal for the 'Action Reference' reference feature. - * - * - * @generated - */ - EReference GENERIC_MSE__ACTION_REFERENCE = eINSTANCE.getGenericMSE_ActionReference(); - - /** - * The meta object literal for the 'Get Caller' operation. - * - * - * @generated - */ - EOperation GENERIC_MSE___GET_CALLER = eINSTANCE.getGenericMSE__GetCaller(); - - /** - * The meta object literal for the 'Get Action' operation. - * - * - * @generated - */ - EOperation GENERIC_MSE___GET_ACTION = eINSTANCE.getGenericMSE__GetAction(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.StepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getStep() - * @generated - */ - EClass STEP = eINSTANCE.getStep(); - - /** - * The meta object literal for the 'Mseoccurrence' containment reference feature. - * - * - * @generated - */ - EReference STEP__MSEOCCURRENCE = eINSTANCE.getStep_Mseoccurrence(); - - /** - * The meta object literal for the 'Starting State' reference feature. - * - * - * @generated - */ - EReference STEP__STARTING_STATE = eINSTANCE.getStep_StartingState(); - - /** - * The meta object literal for the 'Ending State' reference feature. - * - * - * @generated - */ - EReference STEP__ENDING_STATE = eINSTANCE.getStep_EndingState(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl Big Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getBigStep() - * @generated - */ - EClass BIG_STEP = eINSTANCE.getBigStep(); - - /** - * The meta object literal for the 'Sub Steps' containment reference list feature. - * - * - * @generated - */ - EReference BIG_STEP__SUB_STEPS = eINSTANCE.getBigStep_SubSteps(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl Small Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSmallStep() - * @generated - */ - EClass SMALL_STEP = eINSTANCE.getSmallStep(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl Sequential Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSequentialStep() - * @generated - */ - EClass SEQUENTIAL_STEP = eINSTANCE.getSequentialStep(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl Parallel Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getParallelStep() - * @generated - */ - EClass PARALLEL_STEP = eINSTANCE.getParallelStep(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSequentialStepImpl Generic Sequential Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericSequentialStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericSequentialStep() - * @generated - */ - EClass GENERIC_SEQUENTIAL_STEP = eINSTANCE.getGenericSequentialStep(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericParallelStepImpl Generic Parallel Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericParallelStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericParallelStep() - * @generated - */ - EClass GENERIC_PARALLEL_STEP = eINSTANCE.getGenericParallelStep(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSmallStepImpl Generic Small Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericSmallStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericSmallStep() - * @generated - */ - EClass GENERIC_SMALL_STEP = eINSTANCE.getGenericSmallStep(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl Trace}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTrace() - * @generated - */ - EClass TRACE = eINSTANCE.getTrace(); - - /** - * The meta object literal for the 'Root Step' containment reference feature. - * - * - * @generated - */ - EReference TRACE__ROOT_STEP = eINSTANCE.getTrace_RootStep(); - - /** - * The meta object literal for the 'Traced Objects' containment reference list feature. - * - * - * @generated - */ - EReference TRACE__TRACED_OBJECTS = eINSTANCE.getTrace_TracedObjects(); - - /** - * The meta object literal for the 'States' containment reference list feature. - * - * - * @generated - */ - EReference TRACE__STATES = eINSTANCE.getTrace_States(); - - /** - * The meta object literal for the 'Launchconfiguration' containment reference feature. - * - * - * @generated - */ - EReference TRACE__LAUNCHCONFIGURATION = eINSTANCE.getTrace_Launchconfiguration(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl Traced Object}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTracedObject() - * @generated - */ - EClass TRACED_OBJECT = eINSTANCE.getTracedObject(); - - /** - * The meta object literal for the 'Dimensions' containment reference list feature. - * - * - * @generated - */ - EReference TRACED_OBJECT__DIMENSIONS = eINSTANCE.getTracedObject_Dimensions(); - - /** - * The meta object literal for the 'Get Dimensions Internal' operation. - * - * - * @generated - */ - EOperation TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = eINSTANCE.getTracedObject__GetDimensionsInternal(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getDimension() - * @generated - */ - EClass DIMENSION = eINSTANCE.getDimension(); - - /** - * The meta object literal for the 'Values' containment reference list feature. - * - * - * @generated - */ - EReference DIMENSION__VALUES = eINSTANCE.getDimension_Values(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getValue() - * @generated - */ - EClass VALUE = eINSTANCE.getValue(); - - /** - * The meta object literal for the 'States' reference list feature. - * - * - * @generated - */ - EReference VALUE__STATES = eINSTANCE.getValue_States(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.StateImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getState() - * @generated - */ - EClass STATE = eINSTANCE.getState(); - - /** - * The meta object literal for the 'Started Steps' reference list feature. - * - * - * @generated - */ - EReference STATE__STARTED_STEPS = eINSTANCE.getState_StartedSteps(); - - /** - * The meta object literal for the 'Ended Steps' reference list feature. - * - * - * @generated - */ - EReference STATE__ENDED_STEPS = eINSTANCE.getState_EndedSteps(); - - /** - * The meta object literal for the 'Values' reference list feature. - * - * - * @generated - */ - EReference STATE__VALUES = eINSTANCE.getState_Values(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl Generic Reference Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericReferenceValue() - * @generated - */ - EClass GENERIC_REFERENCE_VALUE = eINSTANCE.getGenericReferenceValue(); - - /** - * The meta object literal for the 'Reference Value' reference feature. - * - * - * @generated - */ - EReference GENERIC_REFERENCE_VALUE__REFERENCE_VALUE = eINSTANCE.getGenericReferenceValue_ReferenceValue(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl Generic Dimension}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericDimension() - * @generated - */ - EClass GENERIC_DIMENSION = eINSTANCE.getGenericDimension(); - - /** - * The meta object literal for the 'Dynamic Property' reference feature. - * - * - * @generated - */ - EReference GENERIC_DIMENSION__DYNAMIC_PROPERTY = eINSTANCE.getGenericDimension_DynamicProperty(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTracedObjectImpl Generic Traced Object}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericTracedObjectImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericTracedObject() - * @generated - */ - EClass GENERIC_TRACED_OBJECT = eINSTANCE.getGenericTracedObject(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl Generic State}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericState() - * @generated - */ - EClass GENERIC_STATE = eINSTANCE.getGenericState(); - - /** - * The meta object literal for the 'Values Ref' reference list feature. - * - * - * @generated - */ - EReference GENERIC_STATE__VALUES_REF = eINSTANCE.getGenericState_ValuesRef(); - - /** - * The meta object literal for the 'Started Steps Ref' reference list feature. - * - * - * @generated - */ - EReference GENERIC_STATE__STARTED_STEPS_REF = eINSTANCE.getGenericState_StartedStepsRef(); - - /** - * The meta object literal for the 'Ended Steps Ref' reference list feature. - * - * - * @generated - */ - EReference GENERIC_STATE__ENDED_STEPS_REF = eINSTANCE.getGenericState_EndedStepsRef(); - - /** - * The meta object literal for the 'Get Values' operation. - * - * - * @generated - */ - EOperation GENERIC_STATE___GET_VALUES = eINSTANCE.getGenericState__GetValues(); - - /** - * The meta object literal for the 'Get Started Steps' operation. - * - * - * @generated - */ - EOperation GENERIC_STATE___GET_STARTED_STEPS = eINSTANCE.getGenericState__GetStartedSteps(); - - /** - * The meta object literal for the 'Get Ended Steps' operation. - * - * - * @generated - */ - EOperation GENERIC_STATE___GET_ENDED_STEPS = eINSTANCE.getGenericState__GetEndedSteps(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl Generic Trace}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericTraceImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericTrace() - * @generated - */ - EClass GENERIC_TRACE = eINSTANCE.getGenericTrace(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericAttributeValueImpl Generic Attribute Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericAttributeValue() - * @generated - */ - EClass GENERIC_ATTRIBUTE_VALUE = eINSTANCE.getGenericAttributeValue(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getBooleanAttributeValue() - * @generated - */ - EClass BOOLEAN_ATTRIBUTE_VALUE = eINSTANCE.getBooleanAttributeValue(); - - /** - * The meta object literal for the 'Attribute Value' attribute feature. - * - * - * @generated - */ - EAttribute BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getBooleanAttributeValue_AttributeValue(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.IntegerAttributevalueImpl Integer Attributevalue}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.IntegerAttributevalueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getIntegerAttributevalue() - * @generated - */ - EClass INTEGER_ATTRIBUTEVALUE = eINSTANCE.getIntegerAttributevalue(); - - /** - * The meta object literal for the 'Attribute Value' attribute feature. - * - * - * @generated - */ - EAttribute INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE = eINSTANCE.getIntegerAttributevalue_AttributeValue(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StringAttributeValueImpl String Attribute Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.StringAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getStringAttributeValue() - * @generated - */ - EClass STRING_ATTRIBUTE_VALUE = eINSTANCE.getStringAttributeValue(); - - /** - * The meta object literal for the 'Attribute Value' attribute feature. - * - * - * @generated - */ - EAttribute STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getStringAttributeValue_AttributeValue(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl Launch Configuration}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLaunchConfiguration() - * @generated - */ - EClass LAUNCH_CONFIGURATION = eINSTANCE.getLaunchConfiguration(); - - /** - * The meta object literal for the 'Parameters' containment reference list feature. - * - * - * @generated - */ - EReference LAUNCH_CONFIGURATION__PARAMETERS = eINSTANCE.getLaunchConfiguration_Parameters(); - - /** - * The meta object literal for the 'Type' attribute feature. - * - * - * @generated - */ - EAttribute LAUNCH_CONFIGURATION__TYPE = eINSTANCE.getLaunchConfiguration_Type(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl Launch Configuration Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLaunchConfigurationParameter() - * @generated - */ - EClass LAUNCH_CONFIGURATION_PARAMETER = eINSTANCE.getLaunchConfigurationParameter(); - - /** - * The meta object literal for the 'Value' attribute feature. - * - * - * @generated - */ - EAttribute LAUNCH_CONFIGURATION_PARAMETER__VALUE = eINSTANCE.getLaunchConfigurationParameter_Value(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl Language Name Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.LanguageNameParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getLanguageNameParameter() - * @generated - */ - EClass LANGUAGE_NAME_PARAMETER = eINSTANCE.getLanguageNameParameter(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.AddonExtensionParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getAddonExtensionParameter() - * @generated - */ - EClass ADDON_EXTENSION_PARAMETER = eINSTANCE.getAddonExtensionParameter(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ModelURIParameterImpl Model URI Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ModelURIParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getModelURIParameter() - * @generated - */ - EClass MODEL_URI_PARAMETER = eINSTANCE.getModelURIParameter(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.AnimatorURIParameterImpl Animator URI Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.AnimatorURIParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getAnimatorURIParameter() - * @generated - */ - EClass ANIMATOR_URI_PARAMETER = eINSTANCE.getAnimatorURIParameter(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.EntryPointParameterImpl Entry Point Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.EntryPointParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getEntryPointParameter() - * @generated - */ - EClass ENTRY_POINT_PARAMETER = eINSTANCE.getEntryPointParameter(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.InitializationArgumentsParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getInitializationArgumentsParameter() - * @generated - */ - EClass INITIALIZATION_ARGUMENTS_PARAMETER = eINSTANCE.getInitializationArgumentsParameter(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ModelRootParameterImpl Model Root Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ModelRootParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getModelRootParameter() - * @generated - */ - EClass MODEL_ROOT_PARAMETER = eINSTANCE.getModelRootParameter(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.InitializationMethodParameterImpl Initialization Method Parameter}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.InitializationMethodParameterImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getInitializationMethodParameter() - * @generated - */ - EClass INITIALIZATION_METHOD_PARAMETER = eINSTANCE.getInitializationMethodParameter(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl Generic Step}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericStep() - * @generated - */ - EClass GENERIC_STEP = eINSTANCE.getGenericStep(); - - /** - * The meta object literal for the 'Starting State Ref' reference feature. - * - * - * @generated - */ - EReference GENERIC_STEP__STARTING_STATE_REF = eINSTANCE.getGenericStep_StartingStateRef(); - - /** - * The meta object literal for the 'Ending State Ref' reference feature. - * - * - * @generated - */ - EReference GENERIC_STEP__ENDING_STATE_REF = eINSTANCE.getGenericStep_EndingStateRef(); - - /** - * The meta object literal for the 'Get Starting State' operation. - * - * - * @generated - */ - EOperation GENERIC_STEP___GET_STARTING_STATE = eINSTANCE.getGenericStep__GetStartingState(); - - /** - * The meta object literal for the 'Get Ending State' operation. - * - * - * @generated - */ - EOperation GENERIC_STEP___GET_ENDING_STATE = eINSTANCE.getGenericStep__GetEndingState(); - - /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl Generic Value}' class. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericValue() - * @generated - */ - EClass GENERIC_VALUE = eINSTANCE.getGenericValue(); - - /** - * The meta object literal for the 'States Ref' reference list feature. - * - * - * @generated - */ - EReference GENERIC_VALUE__STATES_REF = eINSTANCE.getGenericValue_StatesRef(); - - /** - * The meta object literal for the 'Get States' operation. - * - * - * @generated - */ - EOperation GENERIC_VALUE___GET_STATES = eINSTANCE.getGenericValue__GetStates(); - - /** - * The meta object literal for the 'ISerializable' data type. - * - * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() - * @generated - */ - EDataType ISERIALIZABLE = eINSTANCE.getISerializable(); - - } - -} //TracePackage diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java deleted file mode 100644 index df135786a..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Traced Object'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions Dimensions}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTracedObject() - * @model abstract="true" - * @generated - */ -public interface TracedObject> extends EObject { - /** - * Returns the value of the 'Dimensions' containment reference list. - * - *

- * If the meaning of the 'Dimensions' containment reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Dimensions' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTracedObject_Dimensions() - * @model containment="true" transient="true" volatile="true" derived="true" - * annotation="http://www.eclipse.org/emf/2002/GenModel get='return getDimensionsInternal();'" - * @generated - */ - EList getDimensions(); - - /** - * - * - * @model kind="operation" - * @generated - */ - EList getDimensionsInternal(); - -} // TracedObject diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java deleted file mode 100644 index 93cfbc56e..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Value'. - * - * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.Value#getStates States}
    • - *
- * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue() - * @model abstract="true" - * @generated - */ -public interface Value> extends EObject { - /** - * Returns the value of the 'States' reference list. - * - *

- * If the meaning of the 'States' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'States' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue_States() - * @model transient="true" volatile="true" derived="true" - * @generated - */ - EList getStates(); - -} // Value diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java deleted file mode 100644 index bc8fefaac..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AddonExtensionParameterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Addon Extension Parameter'. - * - * - * @generated - */ -public class AddonExtensionParameterImpl extends LaunchConfigurationParameterImpl implements AddonExtensionParameter { - /** - * - * - * @generated - */ - protected AddonExtensionParameterImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.ADDON_EXTENSION_PARAMETER; - } - -} //AddonExtensionParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java deleted file mode 100644 index aafd1ba2b..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/AnimatorURIParameterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Animator URI Parameter'. - * - * - * @generated - */ -public class AnimatorURIParameterImpl extends LaunchConfigurationParameterImpl implements AnimatorURIParameter { - /** - * - * - * @generated - */ - protected AnimatorURIParameterImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.ANIMATOR_URI_PARAMETER; - } - -} //AnimatorURIParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java deleted file mode 100644 index 8aaff64aa..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java +++ /dev/null @@ -1,149 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import java.util.Collection; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Big Step'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl#getSubSteps Sub Steps}
    • - *
- * - * @generated - */ -public abstract class BigStepImpl, StateSubType extends State> extends StepImpl implements BigStep { - /** - * The cached value of the '{@link #getSubSteps() Sub Steps}' containment reference list. - * - * - * @see #getSubSteps() - * @generated - * @ordered - */ - protected EList subSteps; - - /** - * - * - * @generated - */ - protected BigStepImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.BIG_STEP; - } - - /** - * - * - * @generated - */ - public EList getSubSteps() { - if (subSteps == null) { - subSteps = new EObjectContainmentEList(Step.class, this, TracePackage.BIG_STEP__SUB_STEPS); - } - return subSteps; - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.BIG_STEP__SUB_STEPS: - return ((InternalEList)getSubSteps()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.BIG_STEP__SUB_STEPS: - return getSubSteps(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.BIG_STEP__SUB_STEPS: - getSubSteps().clear(); - getSubSteps().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.BIG_STEP__SUB_STEPS: - getSubSteps().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.BIG_STEP__SUB_STEPS: - return subSteps != null && !subSteps.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //BigStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BooleanAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BooleanAttributeValueImpl.java deleted file mode 100644 index b7106ac59..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BooleanAttributeValueImpl.java +++ /dev/null @@ -1,162 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * - * An implementation of the model object 'Boolean Attribute Value'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.BooleanAttributeValueImpl#isAttributeValue Attribute Value}
    • - *
- * - * @generated - */ -public class BooleanAttributeValueImpl extends GenericAttributeValueImpl implements BooleanAttributeValue { - /** - * The default value of the '{@link #isAttributeValue() Attribute Value}' attribute. - * - * - * @see #isAttributeValue() - * @generated - * @ordered - */ - protected static final boolean ATTRIBUTE_VALUE_EDEFAULT = false; - - /** - * The cached value of the '{@link #isAttributeValue() Attribute Value}' attribute. - * - * - * @see #isAttributeValue() - * @generated - * @ordered - */ - protected boolean attributeValue = ATTRIBUTE_VALUE_EDEFAULT; - - /** - * - * - * @generated - */ - protected BooleanAttributeValueImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.BOOLEAN_ATTRIBUTE_VALUE; - } - - /** - * - * - * @generated - */ - public boolean isAttributeValue() { - return attributeValue; - } - - /** - * - * - * @generated - */ - public void setAttributeValue(boolean newAttributeValue) { - boolean oldAttributeValue = attributeValue; - attributeValue = newAttributeValue; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: - return isAttributeValue(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: - setAttributeValue((Boolean)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: - setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: - return attributeValue != ATTRIBUTE_VALUE_EDEFAULT; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (attributeValue: "); - result.append(attributeValue); - result.append(')'); - return result.toString(); - } - -} //BooleanAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java deleted file mode 100644 index 76aefb7b9..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java +++ /dev/null @@ -1,152 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.Value; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Dimension'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl#getValues Values}
    • - *
- * - * @generated - */ -public abstract class DimensionImpl> extends MinimalEObjectImpl.Container implements Dimension { - /** - * The cached value of the '{@link #getValues() Values}' containment reference list. - * - * - * @see #getValues() - * @generated - * @ordered - */ - protected EList values; - - /** - * - * - * @generated - */ - protected DimensionImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.DIMENSION; - } - - /** - * - * - * @generated - */ - public EList getValues() { - if (values == null) { - values = new EObjectContainmentEList(Value.class, this, TracePackage.DIMENSION__VALUES); - } - return values; - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.DIMENSION__VALUES: - return ((InternalEList)getValues()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.DIMENSION__VALUES: - return getValues(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.DIMENSION__VALUES: - getValues().clear(); - getValues().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.DIMENSION__VALUES: - getValues().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.DIMENSION__VALUES: - return values != null && !values.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //DimensionImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java deleted file mode 100644 index 190b3af5b..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/EntryPointParameterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.EntryPointParameter; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Entry Point Parameter'. - * - * - * @generated - */ -public class EntryPointParameterImpl extends LaunchConfigurationParameterImpl implements EntryPointParameter { - /** - * - * - * @generated - */ - protected EntryPointParameterImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.ENTRY_POINT_PARAMETER; - } - -} //EntryPointParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java deleted file mode 100644 index aefb2dc4b..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericAttributeValueImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Generic Attribute Value'. - * - * - * @generated - */ -public abstract class GenericAttributeValueImpl extends GenericValueImpl implements GenericAttributeValue { - /** - * - * - * @generated - */ - protected GenericAttributeValueImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_ATTRIBUTE_VALUE; - } - -} //GenericAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java deleted file mode 100644 index c1d3ae7b6..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericDimensionImpl.java +++ /dev/null @@ -1,175 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericDimension; -import fr.inria.diverse.trace.commons.model.trace.GenericValue; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; - -/** - * - * An implementation of the model object 'Generic Dimension'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericDimensionImpl#getDynamicProperty Dynamic Property}
    • - *
- * - * @generated - */ -public class GenericDimensionImpl extends DimensionImpl implements GenericDimension { - /** - * The cached value of the '{@link #getDynamicProperty() Dynamic Property}' reference. - * - * - * @see #getDynamicProperty() - * @generated - * @ordered - */ - protected EStructuralFeature dynamicProperty; - - /** - * - * - * @generated - */ - protected GenericDimensionImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_DIMENSION; - } - - /** - * - * - * This is specialized for the more specific element type known in this context. - * @generated - */ - @Override - public EList getValues() { - if (values == null) { - values = new EObjectContainmentEList(GenericValue.class, this, TracePackage.GENERIC_DIMENSION__VALUES); - } - return values; - } - - /** - * - * - * @generated - */ - public EStructuralFeature getDynamicProperty() { - if (dynamicProperty != null && dynamicProperty.eIsProxy()) { - InternalEObject oldDynamicProperty = (InternalEObject)dynamicProperty; - dynamicProperty = (EStructuralFeature)eResolveProxy(oldDynamicProperty); - if (dynamicProperty != oldDynamicProperty) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY, oldDynamicProperty, dynamicProperty)); - } - } - return dynamicProperty; - } - - /** - * - * - * @generated - */ - public EStructuralFeature basicGetDynamicProperty() { - return dynamicProperty; - } - - /** - * - * - * @generated - */ - public void setDynamicProperty(EStructuralFeature newDynamicProperty) { - EStructuralFeature oldDynamicProperty = dynamicProperty; - dynamicProperty = newDynamicProperty; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY, oldDynamicProperty, dynamicProperty)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: - if (resolve) return getDynamicProperty(); - return basicGetDynamicProperty(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: - setDynamicProperty((EStructuralFeature)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: - setDynamicProperty((EStructuralFeature)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: - return dynamicProperty != null; - } - return super.eIsSet(featureID); - } - -} //GenericDimensionImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java deleted file mode 100644 index b6555ea3e..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java +++ /dev/null @@ -1,255 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericMSE; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EOperation; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * - * An implementation of the model object 'Generic MSE'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl#getCallerReference Caller Reference}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl#getActionReference Action Reference}
    • - *
- * - * @generated - */ -public class GenericMSEImpl extends MSEImpl implements GenericMSE { - /** - * The cached value of the '{@link #getCallerReference() Caller Reference}' reference. - * - * - * @see #getCallerReference() - * @generated - * @ordered - */ - protected EObject callerReference; - - /** - * The cached value of the '{@link #getActionReference() Action Reference}' reference. - * - * - * @see #getActionReference() - * @generated - * @ordered - */ - protected EOperation actionReference; - - /** - * - * - * @generated - */ - protected GenericMSEImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_MSE; - } - - /** - * - * - * @generated - */ - public EObject getCallerReference() { - if (callerReference != null && callerReference.eIsProxy()) { - InternalEObject oldCallerReference = (InternalEObject)callerReference; - callerReference = eResolveProxy(oldCallerReference); - if (callerReference != oldCallerReference) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_MSE__CALLER_REFERENCE, oldCallerReference, callerReference)); - } - } - return callerReference; - } - - /** - * - * - * @generated - */ - public EObject basicGetCallerReference() { - return callerReference; - } - - /** - * - * - * @generated - */ - public void setCallerReference(EObject newCallerReference) { - EObject oldCallerReference = callerReference; - callerReference = newCallerReference; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_MSE__CALLER_REFERENCE, oldCallerReference, callerReference)); - } - - /** - * - * - * @generated - */ - public EOperation getActionReference() { - if (actionReference != null && actionReference.eIsProxy()) { - InternalEObject oldActionReference = (InternalEObject)actionReference; - actionReference = (EOperation)eResolveProxy(oldActionReference); - if (actionReference != oldActionReference) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_MSE__ACTION_REFERENCE, oldActionReference, actionReference)); - } - } - return actionReference; - } - - /** - * - * - * @generated - */ - public EOperation basicGetActionReference() { - return actionReference; - } - - /** - * - * - * @generated - */ - public void setActionReference(EOperation newActionReference) { - EOperation oldActionReference = actionReference; - actionReference = newActionReference; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_MSE__ACTION_REFERENCE, oldActionReference, actionReference)); - } - - /** - * - * - * @generated - */ - public EObject getCaller() { - return callerReference; - } - - /** - * - * - * @generated - */ - public EOperation getAction() { - return actionReference; - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.GENERIC_MSE__CALLER_REFERENCE: - if (resolve) return getCallerReference(); - return basicGetCallerReference(); - case TracePackage.GENERIC_MSE__ACTION_REFERENCE: - if (resolve) return getActionReference(); - return basicGetActionReference(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.GENERIC_MSE__CALLER_REFERENCE: - setCallerReference((EObject)newValue); - return; - case TracePackage.GENERIC_MSE__ACTION_REFERENCE: - setActionReference((EOperation)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_MSE__CALLER_REFERENCE: - setCallerReference((EObject)null); - return; - case TracePackage.GENERIC_MSE__ACTION_REFERENCE: - setActionReference((EOperation)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_MSE__CALLER_REFERENCE: - return callerReference != null; - case TracePackage.GENERIC_MSE__ACTION_REFERENCE: - return actionReference != null; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case TracePackage.GENERIC_MSE___GET_CALLER: - return getCaller(); - case TracePackage.GENERIC_MSE___GET_ACTION: - return getAction(); - } - return super.eInvoke(operationID, arguments); - } - -} //GenericMSEImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java deleted file mode 100644 index ec1ea18d0..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericParallelStepImpl.java +++ /dev/null @@ -1,332 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericParallelStep; -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericStep; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * - * An implementation of the model object 'Generic Parallel Step'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericParallelStepImpl#getStartingStateRef Starting State Ref}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericParallelStepImpl#getEndingStateRef Ending State Ref}
    • - *
- * - * @generated - */ -public class GenericParallelStepImpl extends ParallelStepImpl implements GenericParallelStep { - /** - * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. - * - * - * @see #getStartingStateRef() - * @generated - * @ordered - */ - protected GenericState startingStateRef; - - /** - * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. - * - * - * @see #getEndingStateRef() - * @generated - * @ordered - */ - protected GenericState endingStateRef; - - /** - * - * - * @generated - */ - protected GenericParallelStepImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_PARALLEL_STEP; - } - - /** - * - * - * @generated - */ - public GenericState getStartingStateRef() { - if (startingStateRef != null && startingStateRef.eIsProxy()) { - InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; - startingStateRef = (GenericState)eResolveProxy(oldStartingStateRef); - if (startingStateRef != oldStartingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); - } - } - return startingStateRef; - } - - /** - * - * - * @generated - */ - public GenericState basicGetStartingStateRef() { - return startingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetStartingStateRef(GenericState newStartingStateRef, NotificationChain msgs) { - GenericState oldStartingStateRef = startingStateRef; - startingStateRef = newStartingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setStartingStateRef(GenericState newStartingStateRef) { - if (newStartingStateRef != startingStateRef) { - NotificationChain msgs = null; - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - if (newStartingStateRef != null) - msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - msgs = basicSetStartingStateRef(newStartingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); - } - - /** - * - * - * @generated - */ - public GenericState getEndingStateRef() { - if (endingStateRef != null && endingStateRef.eIsProxy()) { - InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; - endingStateRef = (GenericState)eResolveProxy(oldEndingStateRef); - if (endingStateRef != oldEndingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); - } - } - return endingStateRef; - } - - /** - * - * - * @generated - */ - public GenericState basicGetEndingStateRef() { - return endingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetEndingStateRef(GenericState newEndingStateRef, NotificationChain msgs) { - GenericState oldEndingStateRef = endingStateRef; - endingStateRef = newEndingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setEndingStateRef(GenericState newEndingStateRef) { - if (newEndingStateRef != endingStateRef) { - NotificationChain msgs = null; - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - if (newEndingStateRef != null) - msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - msgs = basicSetEndingStateRef(newEndingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - return basicSetStartingStateRef((GenericState)otherEnd, msgs); - case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - return basicSetEndingStateRef((GenericState)otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: - return basicSetStartingStateRef(null, msgs); - case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: - return basicSetEndingStateRef(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: - if (resolve) return getStartingStateRef(); - return basicGetStartingStateRef(); - case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: - if (resolve) return getEndingStateRef(); - return basicGetEndingStateRef(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: - setStartingStateRef((GenericState)newValue); - return; - case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: - setEndingStateRef((GenericState)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: - setStartingStateRef((GenericState)null); - return; - case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: - setEndingStateRef((GenericState)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: - return startingStateRef != null; - case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: - return endingStateRef != null; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { - if (baseClass == GenericStep.class) { - switch (derivedFeatureID) { - case TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_STEP__STARTING_STATE_REF; - case TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_STEP__ENDING_STATE_REF; - default: return -1; - } - } - return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); - } - - /** - * - * - * @generated - */ - @Override - public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { - if (baseClass == GenericStep.class) { - switch (baseFeatureID) { - case TracePackage.GENERIC_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_PARALLEL_STEP__STARTING_STATE_REF; - case TracePackage.GENERIC_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_PARALLEL_STEP__ENDING_STATE_REF; - default: return -1; - } - } - return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); - } - -} //GenericParallelStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java deleted file mode 100644 index 4ac389fe0..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericReferenceValueImpl.java +++ /dev/null @@ -1,156 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * - * An implementation of the model object 'Generic Reference Value'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericReferenceValueImpl#getReferenceValue Reference Value}
    • - *
- * - * @generated - */ -public class GenericReferenceValueImpl extends GenericValueImpl implements GenericReferenceValue { - /** - * The cached value of the '{@link #getReferenceValue() Reference Value}' reference. - * - * - * @see #getReferenceValue() - * @generated - * @ordered - */ - protected EObject referenceValue; - - /** - * - * - * @generated - */ - protected GenericReferenceValueImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_REFERENCE_VALUE; - } - - /** - * - * - * @generated - */ - public EObject getReferenceValue() { - if (referenceValue != null && referenceValue.eIsProxy()) { - InternalEObject oldReferenceValue = (InternalEObject)referenceValue; - referenceValue = eResolveProxy(oldReferenceValue); - if (referenceValue != oldReferenceValue) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); - } - } - return referenceValue; - } - - /** - * - * - * @generated - */ - public EObject basicGetReferenceValue() { - return referenceValue; - } - - /** - * - * - * @generated - */ - public void setReferenceValue(EObject newReferenceValue) { - EObject oldReferenceValue = referenceValue; - referenceValue = newReferenceValue; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: - if (resolve) return getReferenceValue(); - return basicGetReferenceValue(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: - setReferenceValue((EObject)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: - setReferenceValue((EObject)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: - return referenceValue != null; - } - return super.eIsSet(featureID); - } - -} //GenericReferenceValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java deleted file mode 100644 index a328096e8..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSequentialStepImpl.java +++ /dev/null @@ -1,331 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericStep; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * - * An implementation of the model object 'Generic Sequential Step'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSequentialStepImpl#getStartingStateRef Starting State Ref}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSequentialStepImpl#getEndingStateRef Ending State Ref}
    • - *
- * - * @generated - */ -public class GenericSequentialStepImpl extends SequentialStepImpl implements GenericSequentialStep { - /** - * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. - * - * - * @see #getStartingStateRef() - * @generated - * @ordered - */ - protected GenericState startingStateRef; - - /** - * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. - * - * - * @see #getEndingStateRef() - * @generated - * @ordered - */ - protected GenericState endingStateRef; - - /** - * - * - * @generated - */ - protected GenericSequentialStepImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_SEQUENTIAL_STEP; - } - - /** - * - * - * @generated - */ - public GenericState getStartingStateRef() { - if (startingStateRef != null && startingStateRef.eIsProxy()) { - InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; - startingStateRef = (GenericState)eResolveProxy(oldStartingStateRef); - if (startingStateRef != oldStartingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); - } - } - return startingStateRef; - } - - /** - * - * - * @generated - */ - public GenericState basicGetStartingStateRef() { - return startingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetStartingStateRef(GenericState newStartingStateRef, NotificationChain msgs) { - GenericState oldStartingStateRef = startingStateRef; - startingStateRef = newStartingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setStartingStateRef(GenericState newStartingStateRef) { - if (newStartingStateRef != startingStateRef) { - NotificationChain msgs = null; - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - if (newStartingStateRef != null) - msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - msgs = basicSetStartingStateRef(newStartingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); - } - - /** - * - * - * @generated - */ - public GenericState getEndingStateRef() { - if (endingStateRef != null && endingStateRef.eIsProxy()) { - InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; - endingStateRef = (GenericState)eResolveProxy(oldEndingStateRef); - if (endingStateRef != oldEndingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); - } - } - return endingStateRef; - } - - /** - * - * - * @generated - */ - public GenericState basicGetEndingStateRef() { - return endingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetEndingStateRef(GenericState newEndingStateRef, NotificationChain msgs) { - GenericState oldEndingStateRef = endingStateRef; - endingStateRef = newEndingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setEndingStateRef(GenericState newEndingStateRef) { - if (newEndingStateRef != endingStateRef) { - NotificationChain msgs = null; - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - if (newEndingStateRef != null) - msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - msgs = basicSetEndingStateRef(newEndingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - return basicSetStartingStateRef((GenericState)otherEnd, msgs); - case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - return basicSetEndingStateRef((GenericState)otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: - return basicSetStartingStateRef(null, msgs); - case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: - return basicSetEndingStateRef(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: - if (resolve) return getStartingStateRef(); - return basicGetStartingStateRef(); - case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: - if (resolve) return getEndingStateRef(); - return basicGetEndingStateRef(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: - setStartingStateRef((GenericState)newValue); - return; - case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: - setEndingStateRef((GenericState)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: - setStartingStateRef((GenericState)null); - return; - case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: - setEndingStateRef((GenericState)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: - return startingStateRef != null; - case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: - return endingStateRef != null; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { - if (baseClass == GenericStep.class) { - switch (derivedFeatureID) { - case TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_STEP__STARTING_STATE_REF; - case TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_STEP__ENDING_STATE_REF; - default: return -1; - } - } - return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); - } - - /** - * - * - * @generated - */ - @Override - public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { - if (baseClass == GenericStep.class) { - switch (baseFeatureID) { - case TracePackage.GENERIC_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_SEQUENTIAL_STEP__STARTING_STATE_REF; - case TracePackage.GENERIC_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_SEQUENTIAL_STEP__ENDING_STATE_REF; - default: return -1; - } - } - return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); - } - -} //GenericSequentialStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java deleted file mode 100644 index ec8f4cde3..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericSmallStepImpl.java +++ /dev/null @@ -1,332 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericSmallStep; -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericStep; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * - * An implementation of the model object 'Generic Small Step'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSmallStepImpl#getStartingStateRef Starting State Ref}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericSmallStepImpl#getEndingStateRef Ending State Ref}
    • - *
- * - * @generated - */ -public class GenericSmallStepImpl extends SmallStepImpl implements GenericSmallStep { - /** - * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. - * - * - * @see #getStartingStateRef() - * @generated - * @ordered - */ - protected GenericState startingStateRef; - - /** - * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. - * - * - * @see #getEndingStateRef() - * @generated - * @ordered - */ - protected GenericState endingStateRef; - - /** - * - * - * @generated - */ - protected GenericSmallStepImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_SMALL_STEP; - } - - /** - * - * - * @generated - */ - public GenericState getStartingStateRef() { - if (startingStateRef != null && startingStateRef.eIsProxy()) { - InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; - startingStateRef = (GenericState)eResolveProxy(oldStartingStateRef); - if (startingStateRef != oldStartingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); - } - } - return startingStateRef; - } - - /** - * - * - * @generated - */ - public GenericState basicGetStartingStateRef() { - return startingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetStartingStateRef(GenericState newStartingStateRef, NotificationChain msgs) { - GenericState oldStartingStateRef = startingStateRef; - startingStateRef = newStartingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setStartingStateRef(GenericState newStartingStateRef) { - if (newStartingStateRef != startingStateRef) { - NotificationChain msgs = null; - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - if (newStartingStateRef != null) - msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - msgs = basicSetStartingStateRef(newStartingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); - } - - /** - * - * - * @generated - */ - public GenericState getEndingStateRef() { - if (endingStateRef != null && endingStateRef.eIsProxy()) { - InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; - endingStateRef = (GenericState)eResolveProxy(oldEndingStateRef); - if (endingStateRef != oldEndingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); - } - } - return endingStateRef; - } - - /** - * - * - * @generated - */ - public GenericState basicGetEndingStateRef() { - return endingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetEndingStateRef(GenericState newEndingStateRef, NotificationChain msgs) { - GenericState oldEndingStateRef = endingStateRef; - endingStateRef = newEndingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setEndingStateRef(GenericState newEndingStateRef) { - if (newEndingStateRef != endingStateRef) { - NotificationChain msgs = null; - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - if (newEndingStateRef != null) - msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - msgs = basicSetEndingStateRef(newEndingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - return basicSetStartingStateRef((GenericState)otherEnd, msgs); - case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - return basicSetEndingStateRef((GenericState)otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: - return basicSetStartingStateRef(null, msgs); - case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: - return basicSetEndingStateRef(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: - if (resolve) return getStartingStateRef(); - return basicGetStartingStateRef(); - case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: - if (resolve) return getEndingStateRef(); - return basicGetEndingStateRef(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: - setStartingStateRef((GenericState)newValue); - return; - case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: - setEndingStateRef((GenericState)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: - setStartingStateRef((GenericState)null); - return; - case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: - setEndingStateRef((GenericState)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: - return startingStateRef != null; - case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: - return endingStateRef != null; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { - if (baseClass == GenericStep.class) { - switch (derivedFeatureID) { - case TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_STEP__STARTING_STATE_REF; - case TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_STEP__ENDING_STATE_REF; - default: return -1; - } - } - return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); - } - - /** - * - * - * @generated - */ - @Override - public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { - if (baseClass == GenericStep.class) { - switch (baseFeatureID) { - case TracePackage.GENERIC_STEP__STARTING_STATE_REF: return TracePackage.GENERIC_SMALL_STEP__STARTING_STATE_REF; - case TracePackage.GENERIC_STEP__ENDING_STATE_REF: return TracePackage.GENERIC_SMALL_STEP__ENDING_STATE_REF; - default: return -1; - } - } - return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); - } - -} //GenericSmallStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java deleted file mode 100644 index c5edb0542..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStateImpl.java +++ /dev/null @@ -1,318 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericStep; -import fr.inria.diverse.trace.commons.model.trace.GenericValue; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import java.lang.reflect.InvocationTargetException; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Generic State'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl#getValuesRef Values Ref}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl#getStartedStepsRef Started Steps Ref}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStateImpl#getEndedStepsRef Ended Steps Ref}
    • - *
- * - * @generated - */ -public class GenericStateImpl extends StateImpl implements GenericState { - /** - * The cached value of the '{@link #getValuesRef() Values Ref}' reference list. - * - * - * @see #getValuesRef() - * @generated - * @ordered - */ - protected EList valuesRef; - - /** - * The cached value of the '{@link #getStartedStepsRef() Started Steps Ref}' reference list. - * - * - * @see #getStartedStepsRef() - * @generated - * @ordered - */ - protected EList startedStepsRef; - - /** - * The cached value of the '{@link #getEndedStepsRef() Ended Steps Ref}' reference list. - * - * - * @see #getEndedStepsRef() - * @generated - * @ordered - */ - protected EList endedStepsRef; - - /** - * - * - * @generated - */ - protected GenericStateImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_STATE; - } - - /** - * - * - * This is specialized for the more specific element type known in this context. - * @generated - */ - @Override - public EList getStartedSteps() { - if (startedSteps == null) { - startedSteps = new EObjectWithInverseResolvingEList(GenericStep.class, this, TracePackage.GENERIC_STATE__STARTED_STEPS, TracePackage.STEP__STARTING_STATE) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return Step.class; } }; - } - return startedSteps; - } - - /** - * - * - * This is specialized for the more specific element type known in this context. - * @generated - */ - @Override - public EList getEndedSteps() { - if (endedSteps == null) { - endedSteps = new EObjectWithInverseResolvingEList(GenericStep.class, this, TracePackage.GENERIC_STATE__ENDED_STEPS, TracePackage.STEP__ENDING_STATE) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return Step.class; } }; - } - return endedSteps; - } - - /** - * - * - * @generated - */ - public EList getValuesRef() { - if (valuesRef == null) { - valuesRef = new EObjectWithInverseResolvingEList.ManyInverse(GenericValue.class, this, TracePackage.GENERIC_STATE__VALUES_REF, TracePackage.GENERIC_VALUE__STATES_REF); - } - return valuesRef; - } - - /** - * - * - * @generated - */ - public EList getStartedStepsRef() { - if (startedStepsRef == null) { - startedStepsRef = new EObjectWithInverseResolvingEList(GenericStep.class, this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, TracePackage.GENERIC_STEP__STARTING_STATE_REF); - } - return startedStepsRef; - } - - /** - * - * - * @generated - */ - public EList getEndedStepsRef() { - if (endedStepsRef == null) { - endedStepsRef = new EObjectWithInverseResolvingEList(GenericStep.class, this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, TracePackage.GENERIC_STEP__ENDING_STATE_REF); - } - return endedStepsRef; - } - - /** - * - * - * @generated - */ - public EList getValues() { - return getValuesRef(); - } - - /** - * - * - * @generated - */ - public EList getStartedSteps() { - return getStartedStepsRef(); - } - - /** - * - * - * @generated - */ - public EList getEndedSteps() { - return getEndedStepsRef(); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES_REF: - return ((InternalEList)(InternalEList)getValuesRef()).basicAdd(otherEnd, msgs); - case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: - return ((InternalEList)(InternalEList)getStartedStepsRef()).basicAdd(otherEnd, msgs); - case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: - return ((InternalEList)(InternalEList)getEndedStepsRef()).basicAdd(otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES_REF: - return ((InternalEList)getValuesRef()).basicRemove(otherEnd, msgs); - case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: - return ((InternalEList)getStartedStepsRef()).basicRemove(otherEnd, msgs); - case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: - return ((InternalEList)getEndedStepsRef()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES_REF: - return getValuesRef(); - case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: - return getStartedStepsRef(); - case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: - return getEndedStepsRef(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES_REF: - getValuesRef().clear(); - getValuesRef().addAll((Collection)newValue); - return; - case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: - getStartedStepsRef().clear(); - getStartedStepsRef().addAll((Collection)newValue); - return; - case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: - getEndedStepsRef().clear(); - getEndedStepsRef().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES_REF: - getValuesRef().clear(); - return; - case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: - getStartedStepsRef().clear(); - return; - case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: - getEndedStepsRef().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_STATE__VALUES_REF: - return valuesRef != null && !valuesRef.isEmpty(); - case TracePackage.GENERIC_STATE__STARTED_STEPS_REF: - return startedStepsRef != null && !startedStepsRef.isEmpty(); - case TracePackage.GENERIC_STATE__ENDED_STEPS_REF: - return endedStepsRef != null && !endedStepsRef.isEmpty(); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case TracePackage.GENERIC_STATE___GET_VALUES: - return getValues(); - case TracePackage.GENERIC_STATE___GET_STARTED_STEPS: - return getStartedSteps(); - case TracePackage.GENERIC_STATE___GET_ENDED_STEPS: - return getEndedSteps(); - } - return super.eInvoke(operationID, arguments); - } - -} //GenericStateImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java deleted file mode 100644 index b09d5d534..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericStepImpl.java +++ /dev/null @@ -1,319 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericStep; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * - * An implementation of the model object 'Generic Step'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl#getStartingStateRef Starting State Ref}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericStepImpl#getEndingStateRef Ending State Ref}
    • - *
- * - * @generated - */ -public abstract class GenericStepImpl extends StepImpl implements GenericStep { - /** - * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. - * - * - * @see #getStartingStateRef() - * @generated - * @ordered - */ - protected GenericState startingStateRef; - - /** - * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. - * - * - * @see #getEndingStateRef() - * @generated - * @ordered - */ - protected GenericState endingStateRef; - - /** - * - * - * @generated - */ - protected GenericStepImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_STEP; - } - - /** - * - * - * This is specialized for the more specific type known in this context. - * @generated - */ - @Override - public NotificationChain basicSetStartingState(GenericState newStartingState, NotificationChain msgs) { - return super.basicSetStartingState(newStartingState, msgs); - } - - /** - * - * - * This is specialized for the more specific type known in this context. - * @generated - */ - @Override - public NotificationChain basicSetEndingState(GenericState newEndingState, NotificationChain msgs) { - return super.basicSetEndingState(newEndingState, msgs); - } - - /** - * - * - * @generated - */ - public GenericState getStartingStateRef() { - if (startingStateRef != null && startingStateRef.eIsProxy()) { - InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; - startingStateRef = (GenericState)eResolveProxy(oldStartingStateRef); - if (startingStateRef != oldStartingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); - } - } - return startingStateRef; - } - - /** - * - * - * @generated - */ - public GenericState basicGetStartingStateRef() { - return startingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetStartingStateRef(GenericState newStartingStateRef, NotificationChain msgs) { - GenericState oldStartingStateRef = startingStateRef; - startingStateRef = newStartingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setStartingStateRef(GenericState newStartingStateRef) { - if (newStartingStateRef != startingStateRef) { - NotificationChain msgs = null; - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - if (newStartingStateRef != null) - msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - msgs = basicSetStartingStateRef(newStartingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); - } - - /** - * - * - * @generated - */ - public GenericState getEndingStateRef() { - if (endingStateRef != null && endingStateRef.eIsProxy()) { - InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; - endingStateRef = (GenericState)eResolveProxy(oldEndingStateRef); - if (endingStateRef != oldEndingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); - } - } - return endingStateRef; - } - - /** - * - * - * @generated - */ - public GenericState basicGetEndingStateRef() { - return endingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetEndingStateRef(GenericState newEndingStateRef, NotificationChain msgs) { - GenericState oldEndingStateRef = endingStateRef; - endingStateRef = newEndingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setEndingStateRef(GenericState newEndingStateRef) { - if (newEndingStateRef != endingStateRef) { - NotificationChain msgs = null; - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - if (newEndingStateRef != null) - msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - msgs = basicSetEndingStateRef(newEndingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_STEP__STARTING_STATE_REF: - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__STARTED_STEPS_REF, GenericState.class, msgs); - return basicSetStartingStateRef((GenericState)otherEnd, msgs); - case TracePackage.GENERIC_STEP__ENDING_STATE_REF: - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, TracePackage.GENERIC_STATE__ENDED_STEPS_REF, GenericState.class, msgs); - return basicSetEndingStateRef((GenericState)otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_STEP__STARTING_STATE_REF: - return basicSetStartingStateRef(null, msgs); - case TracePackage.GENERIC_STEP__ENDING_STATE_REF: - return basicSetEndingStateRef(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.GENERIC_STEP__STARTING_STATE_REF: - if (resolve) return getStartingStateRef(); - return basicGetStartingStateRef(); - case TracePackage.GENERIC_STEP__ENDING_STATE_REF: - if (resolve) return getEndingStateRef(); - return basicGetEndingStateRef(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.GENERIC_STEP__STARTING_STATE_REF: - setStartingStateRef((GenericState)newValue); - return; - case TracePackage.GENERIC_STEP__ENDING_STATE_REF: - setEndingStateRef((GenericState)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_STEP__STARTING_STATE_REF: - setStartingStateRef((GenericState)null); - return; - case TracePackage.GENERIC_STEP__ENDING_STATE_REF: - setEndingStateRef((GenericState)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_STEP__STARTING_STATE_REF: - return startingStateRef != null; - case TracePackage.GENERIC_STEP__ENDING_STATE_REF: - return endingStateRef != null; - } - return super.eIsSet(featureID); - } - -} //GenericStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java deleted file mode 100644 index 15c9e89bd..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTraceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericStep; -import fr.inria.diverse.trace.commons.model.trace.GenericTrace; -import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; - -/** - * - * An implementation of the model object 'Generic Trace'. - * - * - * @generated - */ -public class GenericTraceImpl extends TraceImpl, GenericState> implements GenericTrace { - /** - * - * - * @generated - */ - protected GenericTraceImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_TRACE; - } - - /** - * - * - * This is specialized for the more specific type known in this context. - * @generated - */ - @Override - public NotificationChain basicSetRootStep(StepSubType newRootStep, NotificationChain msgs) { - return super.basicSetRootStep(newRootStep, msgs); - } - - /** - * - * - * This is specialized for the more specific element type known in this context. - * @generated - */ - @Override - public EList getStates() { - if (states == null) { - states = new EObjectContainmentEList(GenericState.class, this, TracePackage.GENERIC_TRACE__STATES); - } - return states; - } - -} //GenericTraceImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java deleted file mode 100644 index d449e923b..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericTracedObjectImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericDimension; -import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; - -/** - * - * An implementation of the model object 'Generic Traced Object'. - * - * - * @generated - */ -public class GenericTracedObjectImpl extends TracedObjectImpl implements GenericTracedObject { - /** - * - * - * @generated - */ - protected GenericTracedObjectImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_TRACED_OBJECT; - } - -} //GenericTracedObjectImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java deleted file mode 100644 index ab1bc6470..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericValueImpl.java +++ /dev/null @@ -1,190 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericValue; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import java.lang.reflect.InvocationTargetException; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Generic Value'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericValueImpl#getStatesRef States Ref}
    • - *
- * - * @generated - */ -public abstract class GenericValueImpl extends ValueImpl implements GenericValue { - /** - * The cached value of the '{@link #getStatesRef() States Ref}' reference list. - * - * - * @see #getStatesRef() - * @generated - * @ordered - */ - protected EList statesRef; - - /** - * - * - * @generated - */ - protected GenericValueImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.GENERIC_VALUE; - } - - /** - * - * - * @generated - */ - public EList getStatesRef() { - if (statesRef == null) { - statesRef = new EObjectWithInverseResolvingEList.ManyInverse(GenericState.class, this, TracePackage.GENERIC_VALUE__STATES_REF, TracePackage.GENERIC_STATE__VALUES_REF); - } - return statesRef; - } - - /** - * - * - * @generated - */ - public EList getStates() { - return getStatesRef(); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES_REF: - return ((InternalEList)(InternalEList)getStatesRef()).basicAdd(otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES_REF: - return ((InternalEList)getStatesRef()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES_REF: - return getStatesRef(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES_REF: - getStatesRef().clear(); - getStatesRef().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES_REF: - getStatesRef().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.GENERIC_VALUE__STATES_REF: - return statesRef != null && !statesRef.isEmpty(); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case TracePackage.GENERIC_VALUE___GET_STATES: - return getStates(); - } - return super.eInvoke(operationID, arguments); - } - -} //GenericValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java deleted file mode 100644 index c16cf5f04..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationArgumentsParameterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Initialization Arguments Parameter'. - * - * - * @generated - */ -public class InitializationArgumentsParameterImpl extends LaunchConfigurationParameterImpl implements InitializationArgumentsParameter { - /** - * - * - * @generated - */ - protected InitializationArgumentsParameterImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.INITIALIZATION_ARGUMENTS_PARAMETER; - } - -} //InitializationArgumentsParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java deleted file mode 100644 index 31b9949e0..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/InitializationMethodParameterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Initialization Method Parameter'. - * - * - * @generated - */ -public class InitializationMethodParameterImpl extends LaunchConfigurationParameterImpl implements InitializationMethodParameter { - /** - * - * - * @generated - */ - protected InitializationMethodParameterImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.INITIALIZATION_METHOD_PARAMETER; - } - -} //InitializationMethodParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/IntegerAttributevalueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/IntegerAttributevalueImpl.java deleted file mode 100644 index 8a539fb26..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/IntegerAttributevalueImpl.java +++ /dev/null @@ -1,162 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * - * An implementation of the model object 'Integer Attributevalue'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.IntegerAttributevalueImpl#getAttributeValue Attribute Value}
    • - *
- * - * @generated - */ -public class IntegerAttributevalueImpl extends GenericAttributeValueImpl implements IntegerAttributevalue { - /** - * The default value of the '{@link #getAttributeValue() Attribute Value}' attribute. - * - * - * @see #getAttributeValue() - * @generated - * @ordered - */ - protected static final int ATTRIBUTE_VALUE_EDEFAULT = 0; - - /** - * The cached value of the '{@link #getAttributeValue() Attribute Value}' attribute. - * - * - * @see #getAttributeValue() - * @generated - * @ordered - */ - protected int attributeValue = ATTRIBUTE_VALUE_EDEFAULT; - - /** - * - * - * @generated - */ - protected IntegerAttributevalueImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.INTEGER_ATTRIBUTEVALUE; - } - - /** - * - * - * @generated - */ - public int getAttributeValue() { - return attributeValue; - } - - /** - * - * - * @generated - */ - public void setAttributeValue(int newAttributeValue) { - int oldAttributeValue = attributeValue; - attributeValue = newAttributeValue; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: - return getAttributeValue(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: - setAttributeValue((Integer)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: - setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: - return attributeValue != ATTRIBUTE_VALUE_EDEFAULT; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (attributeValue: "); - result.append(attributeValue); - result.append(')'); - return result.toString(); - } - -} //IntegerAttributevalueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java deleted file mode 100644 index 8edf99348..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LanguageNameParameterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Language Name Parameter'. - * - * - * @generated - */ -public class LanguageNameParameterImpl extends LaunchConfigurationParameterImpl implements LanguageNameParameter { - /** - * - * - * @generated - */ - protected LanguageNameParameterImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.LANGUAGE_NAME_PARAMETER; - } - -} //LanguageNameParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java deleted file mode 100644 index 45c151c3e..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Launch Configuration'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl#getParameters Parameters}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationImpl#getType Type}
    • - *
- * - * @generated - */ -public class LaunchConfigurationImpl extends MinimalEObjectImpl.Container implements LaunchConfiguration { - /** - * The cached value of the '{@link #getParameters() Parameters}' containment reference list. - * - * - * @see #getParameters() - * @generated - * @ordered - */ - protected EList parameters; - - /** - * The default value of the '{@link #getType() Type}' attribute. - * - * - * @see #getType() - * @generated - * @ordered - */ - protected static final String TYPE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getType() Type}' attribute. - * - * - * @see #getType() - * @generated - * @ordered - */ - protected String type = TYPE_EDEFAULT; - - /** - * - * - * @generated - */ - protected LaunchConfigurationImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.LAUNCH_CONFIGURATION; - } - - /** - * - * - * @generated - */ - public EList getParameters() { - if (parameters == null) { - parameters = new EObjectContainmentEList(LaunchConfigurationParameter.class, this, TracePackage.LAUNCH_CONFIGURATION__PARAMETERS); - } - return parameters; - } - - /** - * - * - * @generated - */ - public String getType() { - return type; - } - - /** - * - * - * @generated - */ - public void setType(String newType) { - String oldType = type; - type = newType; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.LAUNCH_CONFIGURATION__TYPE, oldType, type)); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: - return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: - return getParameters(); - case TracePackage.LAUNCH_CONFIGURATION__TYPE: - return getType(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: - getParameters().clear(); - getParameters().addAll((Collection)newValue); - return; - case TracePackage.LAUNCH_CONFIGURATION__TYPE: - setType((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: - getParameters().clear(); - return; - case TracePackage.LAUNCH_CONFIGURATION__TYPE: - setType(TYPE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION__PARAMETERS: - return parameters != null && !parameters.isEmpty(); - case TracePackage.LAUNCH_CONFIGURATION__TYPE: - return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (type: "); - result.append(type); - result.append(')'); - return result.toString(); - } - -} //LaunchConfigurationImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java deleted file mode 100644 index aa4fba810..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/LaunchConfigurationParameterImpl.java +++ /dev/null @@ -1,163 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -/** - * - * An implementation of the model object 'Launch Configuration Parameter'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.LaunchConfigurationParameterImpl#getValue Value}
    • - *
- * - * @generated - */ -public abstract class LaunchConfigurationParameterImpl extends MinimalEObjectImpl.Container implements LaunchConfigurationParameter { - /** - * The default value of the '{@link #getValue() Value}' attribute. - * - * - * @see #getValue() - * @generated - * @ordered - */ - protected static final String VALUE_EDEFAULT = ""; - - /** - * The cached value of the '{@link #getValue() Value}' attribute. - * - * - * @see #getValue() - * @generated - * @ordered - */ - protected String value = VALUE_EDEFAULT; - - /** - * - * - * @generated - */ - protected LaunchConfigurationParameterImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.LAUNCH_CONFIGURATION_PARAMETER; - } - - /** - * - * - * @generated - */ - public String getValue() { - return value; - } - - /** - * - * - * @generated - */ - public void setValue(String newValue) { - String oldValue = value; - value = newValue; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE, oldValue, value)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: - return getValue(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: - setValue((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: - setValue(VALUE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: - return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (value: "); - result.append(value); - result.append(')'); - return result.toString(); - } - -} //LaunchConfigurationParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java deleted file mode 100644 index 7be75fa67..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EOperation; - -import org.eclipse.emf.ecore.impl.ENamedElementImpl; - -/** - * - * An implementation of the model object 'MSE'. - * - * - * @generated - */ -public abstract class MSEImpl extends ENamedElementImpl implements MSE { - /** - * - * - * @generated - */ - protected MSEImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.MSE; - } - - /** - * - * - * @generated - */ - public EObject getCaller() { - // TODO: implement this method - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); - } - - /** - * - * - * @generated - */ - public EOperation getAction() { - // TODO: implement this method - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); - } - - /** - * - * - * @generated - */ - @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case TracePackage.MSE___GET_CALLER: - return getCaller(); - case TracePackage.MSE___GET_ACTION: - return getAction(); - } - return super.eInvoke(operationID, arguments); - } - -} //MSEImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java deleted file mode 100644 index 4b5ca8752..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java +++ /dev/null @@ -1,152 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.MSEModel; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'MSE Model'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl#getOwnedMSEs Owned MS Es}
    • - *
- * - * @generated - */ -public class MSEModelImpl extends MinimalEObjectImpl.Container implements MSEModel { - /** - * The cached value of the '{@link #getOwnedMSEs() Owned MS Es}' containment reference list. - * - * - * @see #getOwnedMSEs() - * @generated - * @ordered - */ - protected EList ownedMSEs; - - /** - * - * - * @generated - */ - protected MSEModelImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.MSE_MODEL; - } - - /** - * - * - * @generated - */ - public EList getOwnedMSEs() { - if (ownedMSEs == null) { - ownedMSEs = new EObjectContainmentEList(MSE.class, this, TracePackage.MSE_MODEL__OWNED_MS_ES); - } - return ownedMSEs; - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.MSE_MODEL__OWNED_MS_ES: - return ((InternalEList)getOwnedMSEs()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.MSE_MODEL__OWNED_MS_ES: - return getOwnedMSEs(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.MSE_MODEL__OWNED_MS_ES: - getOwnedMSEs().clear(); - getOwnedMSEs().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.MSE_MODEL__OWNED_MS_ES: - getOwnedMSEs().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.MSE_MODEL__OWNED_MS_ES: - return ownedMSEs != null && !ownedMSEs.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //MSEModelImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java deleted file mode 100644 index 11e20adba..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java +++ /dev/null @@ -1,250 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; - -/** - * - * An implementation of the model object 'MSE Occurrence'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl#getMse Mse}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl#getParameters Parameters}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl#getResult Result}
    • - *
- * - * @generated - */ -public class MSEOccurrenceImpl extends MinimalEObjectImpl.Container implements MSEOccurrence { - /** - * The cached value of the '{@link #getMse() Mse}' reference. - * - * - * @see #getMse() - * @generated - * @ordered - */ - protected MSE mse; - - /** - * The cached value of the '{@link #getParameters() Parameters}' attribute list. - * - * - * @see #getParameters() - * @generated - * @ordered - */ - protected EList parameters; - - /** - * The cached value of the '{@link #getResult() Result}' attribute list. - * - * - * @see #getResult() - * @generated - * @ordered - */ - protected EList result; - - /** - * - * - * @generated - */ - protected MSEOccurrenceImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.MSE_OCCURRENCE; - } - - /** - * - * - * @generated - */ - public MSE getMse() { - if (mse != null && mse.eIsProxy()) { - InternalEObject oldMse = (InternalEObject)mse; - mse = (MSE)eResolveProxy(oldMse); - if (mse != oldMse) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.MSE_OCCURRENCE__MSE, oldMse, mse)); - } - } - return mse; - } - - /** - * - * - * @generated - */ - public MSE basicGetMse() { - return mse; - } - - /** - * - * - * @generated - */ - public void setMse(MSE newMse) { - MSE oldMse = mse; - mse = newMse; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.MSE_OCCURRENCE__MSE, oldMse, mse)); - } - - /** - * - * - * @generated - */ - public EList getParameters() { - if (parameters == null) { - parameters = new EDataTypeUniqueEList(Object.class, this, TracePackage.MSE_OCCURRENCE__PARAMETERS); - } - return parameters; - } - - /** - * - * - * @generated - */ - public EList getResult() { - if (result == null) { - result = new EDataTypeUniqueEList(Object.class, this, TracePackage.MSE_OCCURRENCE__RESULT); - } - return result; - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.MSE_OCCURRENCE__MSE: - if (resolve) return getMse(); - return basicGetMse(); - case TracePackage.MSE_OCCURRENCE__PARAMETERS: - return getParameters(); - case TracePackage.MSE_OCCURRENCE__RESULT: - return getResult(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.MSE_OCCURRENCE__MSE: - setMse((MSE)newValue); - return; - case TracePackage.MSE_OCCURRENCE__PARAMETERS: - getParameters().clear(); - getParameters().addAll((Collection)newValue); - return; - case TracePackage.MSE_OCCURRENCE__RESULT: - getResult().clear(); - getResult().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.MSE_OCCURRENCE__MSE: - setMse((MSE)null); - return; - case TracePackage.MSE_OCCURRENCE__PARAMETERS: - getParameters().clear(); - return; - case TracePackage.MSE_OCCURRENCE__RESULT: - getResult().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.MSE_OCCURRENCE__MSE: - return mse != null; - case TracePackage.MSE_OCCURRENCE__PARAMETERS: - return parameters != null && !parameters.isEmpty(); - case TracePackage.MSE_OCCURRENCE__RESULT: - return result != null && !result.isEmpty(); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (parameters: "); - result.append(parameters); - result.append(", result: "); - result.append(result); - result.append(')'); - return result.toString(); - } - -} //MSEOccurrenceImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java deleted file mode 100644 index c0a1c7711..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelRootParameterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.ModelRootParameter; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Model Root Parameter'. - * - * - * @generated - */ -public class ModelRootParameterImpl extends LaunchConfigurationParameterImpl implements ModelRootParameter { - /** - * - * - * @generated - */ - protected ModelRootParameterImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.MODEL_ROOT_PARAMETER; - } - -} //ModelRootParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java deleted file mode 100644 index 7a9f09403..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ModelURIParameterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.ModelURIParameter; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Model URI Parameter'. - * - * - * @generated - */ -public class ModelURIParameterImpl extends LaunchConfigurationParameterImpl implements ModelURIParameter { - /** - * - * - * @generated - */ - protected ModelURIParameterImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.MODEL_URI_PARAMETER; - } - -} //ModelURIParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java deleted file mode 100644 index 937c9f2b7..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Parallel Step'. - * - * - * @generated - */ -public abstract class ParallelStepImpl, StateSubType extends State> extends BigStepImpl implements ParallelStep { - /** - * - * - * @generated - */ - protected ParallelStepImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.PARALLEL_STEP; - } - -} //ParallelStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java deleted file mode 100644 index 73100df30..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Sequential Step'. - * - * - * @generated - */ -public abstract class SequentialStepImpl, StateSubType extends State> extends BigStepImpl implements SequentialStep { - /** - * - * - * @generated - */ - protected SequentialStepImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.SEQUENTIAL_STEP; - } - -} //SequentialStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java deleted file mode 100644 index 0fe1ac27a..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.SmallStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Small Step'. - * - * - * @generated - */ -public abstract class SmallStepImpl> extends StepImpl implements SmallStep { - /** - * - * - * @generated - */ - protected SmallStepImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.SMALL_STEP; - } - -} //SmallStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java deleted file mode 100644 index fa7bfd408..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java +++ /dev/null @@ -1,228 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.Value; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'State'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getStartedSteps Started Steps}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getEndedSteps Ended Steps}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getValues Values}
    • - *
- * - * @generated - */ -public abstract class StateImpl, ValueSubType extends Value> extends MinimalEObjectImpl.Container implements State { - /** - * The cached value of the '{@link #getStartedSteps() Started Steps}' reference list. - * - * - * @see #getStartedSteps() - * @generated - * @ordered - */ - protected EList startedSteps; - /** - * The cached value of the '{@link #getEndedSteps() Ended Steps}' reference list. - * - * - * @see #getEndedSteps() - * @generated - * @ordered - */ - protected EList endedSteps; - - /** - * - * - * @generated - */ - protected StateImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.STATE; - } - - /** - * - * - * @generated - */ - public EList getStartedSteps() { - if (startedSteps == null) { - startedSteps = new EObjectWithInverseResolvingEList(Step.class, this, TracePackage.STATE__STARTED_STEPS, TracePackage.STEP__STARTING_STATE); - } - return startedSteps; - } - - /** - * - * - * @generated - */ - public EList getEndedSteps() { - if (endedSteps == null) { - endedSteps = new EObjectWithInverseResolvingEList(Step.class, this, TracePackage.STATE__ENDED_STEPS, TracePackage.STEP__ENDING_STATE); - } - return endedSteps; - } - - /** - * - * - * @generated - */ - public EList getValues() { - // TODO: implement this method to return the 'Values' reference list - // Ensure that you remove @generated or mark it @generated NOT - // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting - // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. - throw new UnsupportedOperationException(); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.STATE__STARTED_STEPS: - return ((InternalEList)(InternalEList)getStartedSteps()).basicAdd(otherEnd, msgs); - case TracePackage.STATE__ENDED_STEPS: - return ((InternalEList)(InternalEList)getEndedSteps()).basicAdd(otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.STATE__STARTED_STEPS: - return ((InternalEList)getStartedSteps()).basicRemove(otherEnd, msgs); - case TracePackage.STATE__ENDED_STEPS: - return ((InternalEList)getEndedSteps()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.STATE__STARTED_STEPS: - return getStartedSteps(); - case TracePackage.STATE__ENDED_STEPS: - return getEndedSteps(); - case TracePackage.STATE__VALUES: - return getValues(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.STATE__STARTED_STEPS: - getStartedSteps().clear(); - getStartedSteps().addAll((Collection)newValue); - return; - case TracePackage.STATE__ENDED_STEPS: - getEndedSteps().clear(); - getEndedSteps().addAll((Collection)newValue); - return; - case TracePackage.STATE__VALUES: - getValues().clear(); - getValues().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.STATE__STARTED_STEPS: - getStartedSteps().clear(); - return; - case TracePackage.STATE__ENDED_STEPS: - getEndedSteps().clear(); - return; - case TracePackage.STATE__VALUES: - getValues().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.STATE__STARTED_STEPS: - return startedSteps != null && !startedSteps.isEmpty(); - case TracePackage.STATE__ENDED_STEPS: - return endedSteps != null && !endedSteps.isEmpty(); - case TracePackage.STATE__VALUES: - return !getValues().isEmpty(); - } - return super.eIsSet(featureID); - } - -} //StateImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java deleted file mode 100644 index c926a50ee..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java +++ /dev/null @@ -1,366 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -/** - * - * An implementation of the model object 'Step'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getMseoccurrence Mseoccurrence}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getStartingState Starting State}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getEndingState Ending State}
    • - *
- * - * @generated - */ -public abstract class StepImpl> extends MinimalEObjectImpl.Container implements Step { - /** - * The cached value of the '{@link #getMseoccurrence() Mseoccurrence}' containment reference. - * - * - * @see #getMseoccurrence() - * @generated - * @ordered - */ - protected MSEOccurrence mseoccurrence; - - /** - * The cached value of the '{@link #getStartingState() Starting State}' reference. - * - * - * @see #getStartingState() - * @generated - * @ordered - */ - protected StateSubType startingState; - /** - * The cached value of the '{@link #getEndingState() Ending State}' reference. - * - * - * @see #getEndingState() - * @generated - * @ordered - */ - protected StateSubType endingState; - - /** - * - * - * @generated - */ - protected StepImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.STEP; - } - - /** - * - * - * @generated - */ - public MSEOccurrence getMseoccurrence() { - return mseoccurrence; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetMseoccurrence(MSEOccurrence newMseoccurrence, NotificationChain msgs) { - MSEOccurrence oldMseoccurrence = mseoccurrence; - mseoccurrence = newMseoccurrence; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.STEP__MSEOCCURRENCE, oldMseoccurrence, newMseoccurrence); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setMseoccurrence(MSEOccurrence newMseoccurrence) { - if (newMseoccurrence != mseoccurrence) { - NotificationChain msgs = null; - if (mseoccurrence != null) - msgs = ((InternalEObject)mseoccurrence).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TracePackage.STEP__MSEOCCURRENCE, null, msgs); - if (newMseoccurrence != null) - msgs = ((InternalEObject)newMseoccurrence).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TracePackage.STEP__MSEOCCURRENCE, null, msgs); - msgs = basicSetMseoccurrence(newMseoccurrence, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STEP__MSEOCCURRENCE, newMseoccurrence, newMseoccurrence)); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - public StateSubType getStartingState() { - if (startingState != null && startingState.eIsProxy()) { - InternalEObject oldStartingState = (InternalEObject)startingState; - startingState = (StateSubType)eResolveProxy(oldStartingState); - if (startingState != oldStartingState) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.STEP__STARTING_STATE, oldStartingState, startingState)); - } - } - return startingState; - } - - /** - * - * - * @generated - */ - public StateSubType basicGetStartingState() { - return startingState; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetStartingState(StateSubType newStartingState, NotificationChain msgs) { - StateSubType oldStartingState = startingState; - startingState = newStartingState; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.STEP__STARTING_STATE, oldStartingState, newStartingState); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setStartingState(StateSubType newStartingState) { - if (newStartingState != startingState) { - NotificationChain msgs = null; - if (startingState != null) - msgs = ((InternalEObject)startingState).eInverseRemove(this, TracePackage.STATE__STARTED_STEPS, State.class, msgs); - if (newStartingState != null) - msgs = ((InternalEObject)newStartingState).eInverseAdd(this, TracePackage.STATE__STARTED_STEPS, State.class, msgs); - msgs = basicSetStartingState(newStartingState, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STEP__STARTING_STATE, newStartingState, newStartingState)); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - public StateSubType getEndingState() { - if (endingState != null && endingState.eIsProxy()) { - InternalEObject oldEndingState = (InternalEObject)endingState; - endingState = (StateSubType)eResolveProxy(oldEndingState); - if (endingState != oldEndingState) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.STEP__ENDING_STATE, oldEndingState, endingState)); - } - } - return endingState; - } - - /** - * - * - * @generated - */ - public StateSubType basicGetEndingState() { - return endingState; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetEndingState(StateSubType newEndingState, NotificationChain msgs) { - StateSubType oldEndingState = endingState; - endingState = newEndingState; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.STEP__ENDING_STATE, oldEndingState, newEndingState); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setEndingState(StateSubType newEndingState) { - if (newEndingState != endingState) { - NotificationChain msgs = null; - if (endingState != null) - msgs = ((InternalEObject)endingState).eInverseRemove(this, TracePackage.STATE__ENDED_STEPS, State.class, msgs); - if (newEndingState != null) - msgs = ((InternalEObject)newEndingState).eInverseAdd(this, TracePackage.STATE__ENDED_STEPS, State.class, msgs); - msgs = basicSetEndingState(newEndingState, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STEP__ENDING_STATE, newEndingState, newEndingState)); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.STEP__STARTING_STATE: - if (startingState != null) - msgs = ((InternalEObject)startingState).eInverseRemove(this, TracePackage.STATE__STARTED_STEPS, State.class, msgs); - return basicSetStartingState((StateSubType)otherEnd, msgs); - case TracePackage.STEP__ENDING_STATE: - if (endingState != null) - msgs = ((InternalEObject)endingState).eInverseRemove(this, TracePackage.STATE__ENDED_STEPS, State.class, msgs); - return basicSetEndingState((StateSubType)otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.STEP__MSEOCCURRENCE: - return basicSetMseoccurrence(null, msgs); - case TracePackage.STEP__STARTING_STATE: - return basicSetStartingState(null, msgs); - case TracePackage.STEP__ENDING_STATE: - return basicSetEndingState(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.STEP__MSEOCCURRENCE: - return getMseoccurrence(); - case TracePackage.STEP__STARTING_STATE: - if (resolve) return getStartingState(); - return basicGetStartingState(); - case TracePackage.STEP__ENDING_STATE: - if (resolve) return getEndingState(); - return basicGetEndingState(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.STEP__MSEOCCURRENCE: - setMseoccurrence((MSEOccurrence)newValue); - return; - case TracePackage.STEP__STARTING_STATE: - setStartingState((StateSubType)newValue); - return; - case TracePackage.STEP__ENDING_STATE: - setEndingState((StateSubType)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.STEP__MSEOCCURRENCE: - setMseoccurrence((MSEOccurrence)null); - return; - case TracePackage.STEP__STARTING_STATE: - setStartingState((StateSubType)null); - return; - case TracePackage.STEP__ENDING_STATE: - setEndingState((StateSubType)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.STEP__MSEOCCURRENCE: - return mseoccurrence != null; - case TracePackage.STEP__STARTING_STATE: - return startingState != null; - case TracePackage.STEP__ENDING_STATE: - return endingState != null; - } - return super.eIsSet(featureID); - } - -} //StepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StringAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StringAttributeValueImpl.java deleted file mode 100644 index be6e6065e..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StringAttributeValueImpl.java +++ /dev/null @@ -1,162 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.StringAttributeValue; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * - * An implementation of the model object 'String Attribute Value'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StringAttributeValueImpl#getAttributeValue Attribute Value}
    • - *
- * - * @generated - */ -public class StringAttributeValueImpl extends GenericAttributeValueImpl implements StringAttributeValue { - /** - * The default value of the '{@link #getAttributeValue() Attribute Value}' attribute. - * - * - * @see #getAttributeValue() - * @generated - * @ordered - */ - protected static final String ATTRIBUTE_VALUE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getAttributeValue() Attribute Value}' attribute. - * - * - * @see #getAttributeValue() - * @generated - * @ordered - */ - protected String attributeValue = ATTRIBUTE_VALUE_EDEFAULT; - - /** - * - * - * @generated - */ - protected StringAttributeValueImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.STRING_ATTRIBUTE_VALUE; - } - - /** - * - * - * @generated - */ - public String getAttributeValue() { - return attributeValue; - } - - /** - * - * - * @generated - */ - public void setAttributeValue(String newAttributeValue) { - String oldAttributeValue = attributeValue; - attributeValue = newAttributeValue; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: - return getAttributeValue(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: - setAttributeValue((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: - setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: - return ATTRIBUTE_VALUE_EDEFAULT == null ? attributeValue != null : !ATTRIBUTE_VALUE_EDEFAULT.equals(attributeValue); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (attributeValue: "); - result.append(attributeValue); - result.append(')'); - return result.toString(); - } - -} //StringAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java deleted file mode 100644 index b4bed0568..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java +++ /dev/null @@ -1,386 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.*; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.impl.EFactoryImpl; - -import org.eclipse.emf.ecore.plugin.EcorePlugin; - -/** - * - * An implementation of the model Factory. - * - * @generated - */ -public class TraceFactoryImpl extends EFactoryImpl implements TraceFactory { - /** - * Creates the default factory implementation. - * - * - * @generated - */ - public static TraceFactory init() { - try { - TraceFactory theTraceFactory = (TraceFactory)EPackage.Registry.INSTANCE.getEFactory(TracePackage.eNS_URI); - if (theTraceFactory != null) { - return theTraceFactory; - } - } - catch (Exception exception) { - EcorePlugin.INSTANCE.log(exception); - } - return new TraceFactoryImpl(); - } - - /** - * Creates an instance of the factory. - * - * - * @generated - */ - public TraceFactoryImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - public EObject create(EClass eClass) { - switch (eClass.getClassifierID()) { - case TracePackage.MSE_OCCURRENCE: return createMSEOccurrence(); - case TracePackage.MSE_MODEL: return createMSEModel(); - case TracePackage.GENERIC_MSE: return createGenericMSE(); - case TracePackage.GENERIC_SEQUENTIAL_STEP: return createGenericSequentialStep(); - case TracePackage.GENERIC_PARALLEL_STEP: return createGenericParallelStep(); - case TracePackage.GENERIC_SMALL_STEP: return createGenericSmallStep(); - case TracePackage.GENERIC_REFERENCE_VALUE: return createGenericReferenceValue(); - case TracePackage.GENERIC_DIMENSION: return createGenericDimension(); - case TracePackage.GENERIC_TRACED_OBJECT: return createGenericTracedObject(); - case TracePackage.GENERIC_STATE: return createGenericState(); - case TracePackage.GENERIC_TRACE: return createGenericTrace(); - case TracePackage.BOOLEAN_ATTRIBUTE_VALUE: return createBooleanAttributeValue(); - case TracePackage.INTEGER_ATTRIBUTEVALUE: return createIntegerAttributevalue(); - case TracePackage.STRING_ATTRIBUTE_VALUE: return createStringAttributeValue(); - case TracePackage.LAUNCH_CONFIGURATION: return createLaunchConfiguration(); - case TracePackage.LANGUAGE_NAME_PARAMETER: return createLanguageNameParameter(); - case TracePackage.ADDON_EXTENSION_PARAMETER: return createAddonExtensionParameter(); - case TracePackage.MODEL_URI_PARAMETER: return createModelURIParameter(); - case TracePackage.ANIMATOR_URI_PARAMETER: return createAnimatorURIParameter(); - case TracePackage.ENTRY_POINT_PARAMETER: return createEntryPointParameter(); - case TracePackage.INITIALIZATION_ARGUMENTS_PARAMETER: return createInitializationArgumentsParameter(); - case TracePackage.MODEL_ROOT_PARAMETER: return createModelRootParameter(); - case TracePackage.INITIALIZATION_METHOD_PARAMETER: return createInitializationMethodParameter(); - default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); - } - } - - /** - * - * - * @generated - */ - @Override - public Object createFromString(EDataType eDataType, String initialValue) { - switch (eDataType.getClassifierID()) { - case TracePackage.ISERIALIZABLE: - return createISerializableFromString(eDataType, initialValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); - } - } - - /** - * - * - * @generated - */ - @Override - public String convertToString(EDataType eDataType, Object instanceValue) { - switch (eDataType.getClassifierID()) { - case TracePackage.ISERIALIZABLE: - return convertISerializableToString(eDataType, instanceValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); - } - } - - /** - * - * - * @generated - */ - public MSEOccurrence createMSEOccurrence() { - MSEOccurrenceImpl mseOccurrence = new MSEOccurrenceImpl(); - return mseOccurrence; - } - - /** - * - * - * @generated - */ - public MSEModel createMSEModel() { - MSEModelImpl mseModel = new MSEModelImpl(); - return mseModel; - } - - /** - * - * - * @generated - */ - public GenericMSE createGenericMSE() { - GenericMSEImpl genericMSE = new GenericMSEImpl(); - return genericMSE; - } - - /** - * - * - * @generated - */ - public GenericSequentialStep createGenericSequentialStep() { - GenericSequentialStepImpl genericSequentialStep = new GenericSequentialStepImpl(); - return genericSequentialStep; - } - - /** - * - * - * @generated - */ - public GenericParallelStep createGenericParallelStep() { - GenericParallelStepImpl genericParallelStep = new GenericParallelStepImpl(); - return genericParallelStep; - } - - /** - * - * - * @generated - */ - public GenericSmallStep createGenericSmallStep() { - GenericSmallStepImpl genericSmallStep = new GenericSmallStepImpl(); - return genericSmallStep; - } - - /** - * - * - * @generated - */ - public GenericReferenceValue createGenericReferenceValue() { - GenericReferenceValueImpl genericReferenceValue = new GenericReferenceValueImpl(); - return genericReferenceValue; - } - - /** - * - * - * @generated - */ - public GenericDimension createGenericDimension() { - GenericDimensionImpl genericDimension = new GenericDimensionImpl(); - return genericDimension; - } - - /** - * - * - * @generated - */ - public GenericTracedObject createGenericTracedObject() { - GenericTracedObjectImpl genericTracedObject = new GenericTracedObjectImpl(); - return genericTracedObject; - } - - /** - * - * - * @generated - */ - public GenericState createGenericState() { - GenericStateImpl genericState = new GenericStateImpl(); - return genericState; - } - - /** - * - * - * @generated - */ - public GenericTrace createGenericTrace() { - GenericTraceImpl genericTrace = new GenericTraceImpl(); - return genericTrace; - } - - /** - * - * - * @generated - */ - public BooleanAttributeValue createBooleanAttributeValue() { - BooleanAttributeValueImpl booleanAttributeValue = new BooleanAttributeValueImpl(); - return booleanAttributeValue; - } - - /** - * - * - * @generated - */ - public IntegerAttributevalue createIntegerAttributevalue() { - IntegerAttributevalueImpl integerAttributevalue = new IntegerAttributevalueImpl(); - return integerAttributevalue; - } - - /** - * - * - * @generated - */ - public StringAttributeValue createStringAttributeValue() { - StringAttributeValueImpl stringAttributeValue = new StringAttributeValueImpl(); - return stringAttributeValue; - } - - /** - * - * - * @generated - */ - public LaunchConfiguration createLaunchConfiguration() { - LaunchConfigurationImpl launchConfiguration = new LaunchConfigurationImpl(); - return launchConfiguration; - } - - /** - * - * - * @generated - */ - public LanguageNameParameter createLanguageNameParameter() { - LanguageNameParameterImpl languageNameParameter = new LanguageNameParameterImpl(); - return languageNameParameter; - } - - /** - * - * - * @generated - */ - public AddonExtensionParameter createAddonExtensionParameter() { - AddonExtensionParameterImpl addonExtensionParameter = new AddonExtensionParameterImpl(); - return addonExtensionParameter; - } - - /** - * - * - * @generated - */ - public ModelURIParameter createModelURIParameter() { - ModelURIParameterImpl modelURIParameter = new ModelURIParameterImpl(); - return modelURIParameter; - } - - /** - * - * - * @generated - */ - public AnimatorURIParameter createAnimatorURIParameter() { - AnimatorURIParameterImpl animatorURIParameter = new AnimatorURIParameterImpl(); - return animatorURIParameter; - } - - /** - * - * - * @generated - */ - public EntryPointParameter createEntryPointParameter() { - EntryPointParameterImpl entryPointParameter = new EntryPointParameterImpl(); - return entryPointParameter; - } - - /** - * - * - * @generated - */ - public InitializationArgumentsParameter createInitializationArgumentsParameter() { - InitializationArgumentsParameterImpl initializationArgumentsParameter = new InitializationArgumentsParameterImpl(); - return initializationArgumentsParameter; - } - - /** - * - * - * @generated - */ - public ModelRootParameter createModelRootParameter() { - ModelRootParameterImpl modelRootParameter = new ModelRootParameterImpl(); - return modelRootParameter; - } - - /** - * - * - * @generated - */ - public InitializationMethodParameter createInitializationMethodParameter() { - InitializationMethodParameterImpl initializationMethodParameter = new InitializationMethodParameterImpl(); - return initializationMethodParameter; - } - - /** - * - * - * @generated - */ - public byte[] createISerializableFromString(EDataType eDataType, String initialValue) { - return (byte[])super.createFromString(initialValue); - } - - /** - * - * - * @generated - */ - public String convertISerializableToString(EDataType eDataType, Object instanceValue) { - return super.convertToString(instanceValue); - } - - /** - * - * - * @generated - */ - public TracePackage getTracePackage() { - return (TracePackage)getEPackage(); - } - - /** - * - * - * @deprecated - * @generated - */ - @Deprecated - public static TracePackage getPackage() { - return TracePackage.eINSTANCE; - } - -} //TraceFactoryImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java deleted file mode 100644 index 3fc274be6..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java +++ /dev/null @@ -1,316 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Trace'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getRootStep Root Step}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getTracedObjects Traced Objects}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getStates States}
    • - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getLaunchconfiguration Launchconfiguration}
    • - *
- * - * @generated - */ -public abstract class TraceImpl, TracedObjectSubtype extends TracedObject, StateSubType extends State> extends MinimalEObjectImpl.Container implements Trace { - /** - * The cached value of the '{@link #getRootStep() Root Step}' containment reference. - * - * - * @see #getRootStep() - * @generated - * @ordered - */ - protected StepSubType rootStep; - - /** - * The cached value of the '{@link #getStates() States}' containment reference list. - * - * - * @see #getStates() - * @generated - * @ordered - */ - protected EList states; - - /** - * The cached value of the '{@link #getLaunchconfiguration() Launchconfiguration}' containment reference. - * - * - * @see #getLaunchconfiguration() - * @generated - * @ordered - */ - protected LaunchConfiguration launchconfiguration; - - /** - * - * - * @generated - */ - protected TraceImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.TRACE; - } - - /** - * - * - * @generated - */ - public StepSubType getRootStep() { - return rootStep; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetRootStep(StepSubType newRootStep, NotificationChain msgs) { - StepSubType oldRootStep = rootStep; - rootStep = newRootStep; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.TRACE__ROOT_STEP, oldRootStep, newRootStep); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setRootStep(StepSubType newRootStep) { - if (newRootStep != rootStep) { - NotificationChain msgs = null; - if (rootStep != null) - msgs = ((InternalEObject)rootStep).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TracePackage.TRACE__ROOT_STEP, null, msgs); - if (newRootStep != null) - msgs = ((InternalEObject)newRootStep).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TracePackage.TRACE__ROOT_STEP, null, msgs); - msgs = basicSetRootStep(newRootStep, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.TRACE__ROOT_STEP, newRootStep, newRootStep)); - } - - /** - * - * - * @generated - */ - public EList getTracedObjects() { - // TODO: implement this method to return the 'Traced Objects' containment reference list - // Ensure that you remove @generated or mark it @generated NOT - // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting - // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. - throw new UnsupportedOperationException(); - } - - /** - * - * - * @generated - */ - public EList getStates() { - if (states == null) { - states = new EObjectContainmentEList(State.class, this, TracePackage.TRACE__STATES); - } - return states; - } - - /** - * - * - * @generated - */ - public LaunchConfiguration getLaunchconfiguration() { - return launchconfiguration; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetLaunchconfiguration(LaunchConfiguration newLaunchconfiguration, NotificationChain msgs) { - LaunchConfiguration oldLaunchconfiguration = launchconfiguration; - launchconfiguration = newLaunchconfiguration; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.TRACE__LAUNCHCONFIGURATION, oldLaunchconfiguration, newLaunchconfiguration); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setLaunchconfiguration(LaunchConfiguration newLaunchconfiguration) { - if (newLaunchconfiguration != launchconfiguration) { - NotificationChain msgs = null; - if (launchconfiguration != null) - msgs = ((InternalEObject)launchconfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TracePackage.TRACE__LAUNCHCONFIGURATION, null, msgs); - if (newLaunchconfiguration != null) - msgs = ((InternalEObject)newLaunchconfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TracePackage.TRACE__LAUNCHCONFIGURATION, null, msgs); - msgs = basicSetLaunchconfiguration(newLaunchconfiguration, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.TRACE__LAUNCHCONFIGURATION, newLaunchconfiguration, newLaunchconfiguration)); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.TRACE__ROOT_STEP: - return basicSetRootStep(null, msgs); - case TracePackage.TRACE__TRACED_OBJECTS: - return ((InternalEList)getTracedObjects()).basicRemove(otherEnd, msgs); - case TracePackage.TRACE__STATES: - return ((InternalEList)getStates()).basicRemove(otherEnd, msgs); - case TracePackage.TRACE__LAUNCHCONFIGURATION: - return basicSetLaunchconfiguration(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.TRACE__ROOT_STEP: - return getRootStep(); - case TracePackage.TRACE__TRACED_OBJECTS: - return getTracedObjects(); - case TracePackage.TRACE__STATES: - return getStates(); - case TracePackage.TRACE__LAUNCHCONFIGURATION: - return getLaunchconfiguration(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.TRACE__ROOT_STEP: - setRootStep((StepSubType)newValue); - return; - case TracePackage.TRACE__TRACED_OBJECTS: - getTracedObjects().clear(); - getTracedObjects().addAll((Collection)newValue); - return; - case TracePackage.TRACE__STATES: - getStates().clear(); - getStates().addAll((Collection)newValue); - return; - case TracePackage.TRACE__LAUNCHCONFIGURATION: - setLaunchconfiguration((LaunchConfiguration)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.TRACE__ROOT_STEP: - setRootStep((StepSubType)null); - return; - case TracePackage.TRACE__TRACED_OBJECTS: - getTracedObjects().clear(); - return; - case TracePackage.TRACE__STATES: - getStates().clear(); - return; - case TracePackage.TRACE__LAUNCHCONFIGURATION: - setLaunchconfiguration((LaunchConfiguration)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.TRACE__ROOT_STEP: - return rootStep != null; - case TracePackage.TRACE__TRACED_OBJECTS: - return !getTracedObjects().isEmpty(); - case TracePackage.TRACE__STATES: - return states != null && !states.isEmpty(); - case TracePackage.TRACE__LAUNCHCONFIGURATION: - return launchconfiguration != null; - } - return super.eIsSet(featureID); - } - -} //TraceImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java deleted file mode 100644 index 7f0e6f8bc..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java +++ /dev/null @@ -1,1685 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter; -import fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.EntryPointParameter; -import fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue; -import fr.inria.diverse.trace.commons.model.trace.GenericDimension; -import fr.inria.diverse.trace.commons.model.trace.GenericMSE; -import fr.inria.diverse.trace.commons.model.trace.GenericParallelStep; -import fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue; -import fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep; -import fr.inria.diverse.trace.commons.model.trace.GenericSmallStep; -import fr.inria.diverse.trace.commons.model.trace.GenericState; -import fr.inria.diverse.trace.commons.model.trace.GenericStep; -import fr.inria.diverse.trace.commons.model.trace.GenericTrace; -import fr.inria.diverse.trace.commons.model.trace.GenericTracedObject; -import fr.inria.diverse.trace.commons.model.trace.GenericValue; -import fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter; -import fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter; -import fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue; -import fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter; -import fr.inria.diverse.trace.commons.model.trace.MSEModel; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.ModelRootParameter; -import fr.inria.diverse.trace.commons.model.trace.ModelURIParameter; -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.SmallStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.StringAttributeValue; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TraceFactory; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EGenericType; -import org.eclipse.emf.ecore.EOperation; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; -import org.eclipse.emf.ecore.ETypeParameter; -import org.eclipse.emf.ecore.EcorePackage; - -import org.eclipse.emf.ecore.impl.EPackageImpl; - -/** - * - * An implementation of the model Package. - * - * @generated - */ -public class TracePackageImpl extends EPackageImpl implements TracePackage { - /** - * - * - * @generated - */ - private EClass mseOccurrenceEClass = null; - - /** - * - * - * @generated - */ - private EClass mseEClass = null; - - /** - * - * - * @generated - */ - private EClass mseModelEClass = null; - - /** - * - * - * @generated - */ - private EClass genericMSEEClass = null; - - /** - * - * - * @generated - */ - private EClass stepEClass = null; - - /** - * - * - * @generated - */ - private EClass bigStepEClass = null; - - /** - * - * - * @generated - */ - private EClass smallStepEClass = null; - - /** - * - * - * @generated - */ - private EClass sequentialStepEClass = null; - - /** - * - * - * @generated - */ - private EClass parallelStepEClass = null; - - /** - * - * - * @generated - */ - private EClass genericSequentialStepEClass = null; - - /** - * - * - * @generated - */ - private EClass genericParallelStepEClass = null; - - /** - * - * - * @generated - */ - private EClass genericSmallStepEClass = null; - - /** - * - * - * @generated - */ - private EClass traceEClass = null; - - /** - * - * - * @generated - */ - private EClass tracedObjectEClass = null; - - /** - * - * - * @generated - */ - private EClass dimensionEClass = null; - - /** - * - * - * @generated - */ - private EClass valueEClass = null; - - /** - * - * - * @generated - */ - private EClass stateEClass = null; - - /** - * - * - * @generated - */ - private EClass genericReferenceValueEClass = null; - - /** - * - * - * @generated - */ - private EClass genericDimensionEClass = null; - - /** - * - * - * @generated - */ - private EClass genericTracedObjectEClass = null; - - /** - * - * - * @generated - */ - private EClass genericStateEClass = null; - - /** - * - * - * @generated - */ - private EClass genericTraceEClass = null; - - /** - * - * - * @generated - */ - private EClass genericAttributeValueEClass = null; - - /** - * - * - * @generated - */ - private EClass booleanAttributeValueEClass = null; - - /** - * - * - * @generated - */ - private EClass integerAttributevalueEClass = null; - - /** - * - * - * @generated - */ - private EClass stringAttributeValueEClass = null; - - /** - * - * - * @generated - */ - private EClass launchConfigurationEClass = null; - - /** - * - * - * @generated - */ - private EClass launchConfigurationParameterEClass = null; - - /** - * - * - * @generated - */ - private EClass languageNameParameterEClass = null; - - /** - * - * - * @generated - */ - private EClass addonExtensionParameterEClass = null; - - /** - * - * - * @generated - */ - private EClass modelURIParameterEClass = null; - - /** - * - * - * @generated - */ - private EClass animatorURIParameterEClass = null; - - /** - * - * - * @generated - */ - private EClass entryPointParameterEClass = null; - - /** - * - * - * @generated - */ - private EClass initializationArgumentsParameterEClass = null; - - /** - * - * - * @generated - */ - private EClass modelRootParameterEClass = null; - - /** - * - * - * @generated - */ - private EClass initializationMethodParameterEClass = null; - - /** - * - * - * @generated - */ - private EClass genericStepEClass = null; - - /** - * - * - * @generated - */ - private EClass genericValueEClass = null; - - /** - * - * - * @generated - */ - private EDataType iSerializableEDataType = null; - - /** - * Creates an instance of the model Package, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package - * package URI value. - *

Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * - * - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#eNS_URI - * @see #init() - * @generated - */ - private TracePackageImpl() { - super(eNS_URI, TraceFactory.eINSTANCE); - } - - /** - * - * - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * - *

This method is used to initialize {@link TracePackage#eINSTANCE} when that field is accessed. - * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. - * - * - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static TracePackage init() { - if (isInited) return (TracePackage)EPackage.Registry.INSTANCE.getEPackage(TracePackage.eNS_URI); - - // Obtain or create and register package - TracePackageImpl theTracePackage = (TracePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TracePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TracePackageImpl()); - - isInited = true; - - // Initialize simple dependencies - EcorePackage.eINSTANCE.eClass(); - - // Create package meta-data objects - theTracePackage.createPackageContents(); - - // Initialize created meta-data - theTracePackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theTracePackage.freeze(); - - - // Update the registry and return the package - EPackage.Registry.INSTANCE.put(TracePackage.eNS_URI, theTracePackage); - return theTracePackage; - } - - /** - * - * - * @generated - */ - public EClass getMSEOccurrence() { - return mseOccurrenceEClass; - } - - /** - * - * - * @generated - */ - public EReference getMSEOccurrence_Mse() { - return (EReference)mseOccurrenceEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EAttribute getMSEOccurrence_Parameters() { - return (EAttribute)mseOccurrenceEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EAttribute getMSEOccurrence_Result() { - return (EAttribute)mseOccurrenceEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EClass getMSE() { - return mseEClass; - } - - /** - * - * - * @generated - */ - public EOperation getMSE__GetCaller() { - return mseEClass.getEOperations().get(0); - } - - /** - * - * - * @generated - */ - public EOperation getMSE__GetAction() { - return mseEClass.getEOperations().get(1); - } - - /** - * - * - * @generated - */ - public EClass getMSEModel() { - return mseModelEClass; - } - - /** - * - * - * @generated - */ - public EReference getMSEModel_OwnedMSEs() { - return (EReference)mseModelEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getGenericMSE() { - return genericMSEEClass; - } - - /** - * - * - * @generated - */ - public EReference getGenericMSE_CallerReference() { - return (EReference)genericMSEEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getGenericMSE_ActionReference() { - return (EReference)genericMSEEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EOperation getGenericMSE__GetCaller() { - return genericMSEEClass.getEOperations().get(0); - } - - /** - * - * - * @generated - */ - public EOperation getGenericMSE__GetAction() { - return genericMSEEClass.getEOperations().get(1); - } - - /** - * - * - * @generated - */ - public EClass getStep() { - return stepEClass; - } - - /** - * - * - * @generated - */ - public EReference getStep_Mseoccurrence() { - return (EReference)stepEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getStep_StartingState() { - return (EReference)stepEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getStep_EndingState() { - return (EReference)stepEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EClass getBigStep() { - return bigStepEClass; - } - - /** - * - * - * @generated - */ - public EReference getBigStep_SubSteps() { - return (EReference)bigStepEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getSmallStep() { - return smallStepEClass; - } - - /** - * - * - * @generated - */ - public EClass getSequentialStep() { - return sequentialStepEClass; - } - - /** - * - * - * @generated - */ - public EClass getParallelStep() { - return parallelStepEClass; - } - - /** - * - * - * @generated - */ - public EClass getGenericSequentialStep() { - return genericSequentialStepEClass; - } - - /** - * - * - * @generated - */ - public EClass getGenericParallelStep() { - return genericParallelStepEClass; - } - - /** - * - * - * @generated - */ - public EClass getGenericSmallStep() { - return genericSmallStepEClass; - } - - /** - * - * - * @generated - */ - public EClass getTrace() { - return traceEClass; - } - - /** - * - * - * @generated - */ - public EReference getTrace_RootStep() { - return (EReference)traceEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getTrace_TracedObjects() { - return (EReference)traceEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getTrace_States() { - return (EReference)traceEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EReference getTrace_Launchconfiguration() { - return (EReference)traceEClass.getEStructuralFeatures().get(3); - } - - /** - * - * - * @generated - */ - public EClass getTracedObject() { - return tracedObjectEClass; - } - - /** - * - * - * @generated - */ - public EReference getTracedObject_Dimensions() { - return (EReference)tracedObjectEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EOperation getTracedObject__GetDimensionsInternal() { - return tracedObjectEClass.getEOperations().get(0); - } - - /** - * - * - * @generated - */ - public EClass getDimension() { - return dimensionEClass; - } - - /** - * - * - * @generated - */ - public EReference getDimension_Values() { - return (EReference)dimensionEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getValue() { - return valueEClass; - } - - /** - * - * - * @generated - */ - public EReference getValue_States() { - return (EReference)valueEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getState() { - return stateEClass; - } - - /** - * - * - * @generated - */ - public EReference getState_StartedSteps() { - return (EReference)stateEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getState_EndedSteps() { - return (EReference)stateEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getState_Values() { - return (EReference)stateEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EClass getGenericReferenceValue() { - return genericReferenceValueEClass; - } - - /** - * - * - * @generated - */ - public EReference getGenericReferenceValue_ReferenceValue() { - return (EReference)genericReferenceValueEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getGenericDimension() { - return genericDimensionEClass; - } - - /** - * - * - * @generated - */ - public EReference getGenericDimension_DynamicProperty() { - return (EReference)genericDimensionEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getGenericTracedObject() { - return genericTracedObjectEClass; - } - - /** - * - * - * @generated - */ - public EClass getGenericState() { - return genericStateEClass; - } - - /** - * - * - * @generated - */ - public EReference getGenericState_ValuesRef() { - return (EReference)genericStateEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getGenericState_StartedStepsRef() { - return (EReference)genericStateEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getGenericState_EndedStepsRef() { - return (EReference)genericStateEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EOperation getGenericState__GetValues() { - return genericStateEClass.getEOperations().get(0); - } - - /** - * - * - * @generated - */ - public EOperation getGenericState__GetStartedSteps() { - return genericStateEClass.getEOperations().get(1); - } - - /** - * - * - * @generated - */ - public EOperation getGenericState__GetEndedSteps() { - return genericStateEClass.getEOperations().get(2); - } - - /** - * - * - * @generated - */ - public EClass getGenericTrace() { - return genericTraceEClass; - } - - /** - * - * - * @generated - */ - public EClass getGenericAttributeValue() { - return genericAttributeValueEClass; - } - - /** - * - * - * @generated - */ - public EClass getBooleanAttributeValue() { - return booleanAttributeValueEClass; - } - - /** - * - * - * @generated - */ - public EAttribute getBooleanAttributeValue_AttributeValue() { - return (EAttribute)booleanAttributeValueEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getIntegerAttributevalue() { - return integerAttributevalueEClass; - } - - /** - * - * - * @generated - */ - public EAttribute getIntegerAttributevalue_AttributeValue() { - return (EAttribute)integerAttributevalueEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getStringAttributeValue() { - return stringAttributeValueEClass; - } - - /** - * - * - * @generated - */ - public EAttribute getStringAttributeValue_AttributeValue() { - return (EAttribute)stringAttributeValueEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getLaunchConfiguration() { - return launchConfigurationEClass; - } - - /** - * - * - * @generated - */ - public EReference getLaunchConfiguration_Parameters() { - return (EReference)launchConfigurationEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EAttribute getLaunchConfiguration_Type() { - return (EAttribute)launchConfigurationEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EClass getLaunchConfigurationParameter() { - return launchConfigurationParameterEClass; - } - - /** - * - * - * @generated - */ - public EAttribute getLaunchConfigurationParameter_Value() { - return (EAttribute)launchConfigurationParameterEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getLanguageNameParameter() { - return languageNameParameterEClass; - } - - /** - * - * - * @generated - */ - public EClass getAddonExtensionParameter() { - return addonExtensionParameterEClass; - } - - /** - * - * - * @generated - */ - public EClass getModelURIParameter() { - return modelURIParameterEClass; - } - - /** - * - * - * @generated - */ - public EClass getAnimatorURIParameter() { - return animatorURIParameterEClass; - } - - /** - * - * - * @generated - */ - public EClass getEntryPointParameter() { - return entryPointParameterEClass; - } - - /** - * - * - * @generated - */ - public EClass getInitializationArgumentsParameter() { - return initializationArgumentsParameterEClass; - } - - /** - * - * - * @generated - */ - public EClass getModelRootParameter() { - return modelRootParameterEClass; - } - - /** - * - * - * @generated - */ - public EClass getInitializationMethodParameter() { - return initializationMethodParameterEClass; - } - - /** - * - * - * @generated - */ - public EClass getGenericStep() { - return genericStepEClass; - } - - /** - * - * - * @generated - */ - public EReference getGenericStep_StartingStateRef() { - return (EReference)genericStepEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getGenericStep_EndingStateRef() { - return (EReference)genericStepEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EOperation getGenericStep__GetStartingState() { - return genericStepEClass.getEOperations().get(0); - } - - /** - * - * - * @generated - */ - public EOperation getGenericStep__GetEndingState() { - return genericStepEClass.getEOperations().get(1); - } - - /** - * - * - * @generated - */ - public EClass getGenericValue() { - return genericValueEClass; - } - - /** - * - * - * @generated - */ - public EReference getGenericValue_StatesRef() { - return (EReference)genericValueEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EOperation getGenericValue__GetStates() { - return genericValueEClass.getEOperations().get(0); - } - - /** - * - * - * @generated - */ - public EDataType getISerializable() { - return iSerializableEDataType; - } - - /** - * - * - * @generated - */ - public TraceFactory getTraceFactory() { - return (TraceFactory)getEFactoryInstance(); - } - - /** - * - * - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void createPackageContents() { - if (isCreated) return; - isCreated = true; - - // Create classes and their features - mseOccurrenceEClass = createEClass(MSE_OCCURRENCE); - createEReference(mseOccurrenceEClass, MSE_OCCURRENCE__MSE); - createEAttribute(mseOccurrenceEClass, MSE_OCCURRENCE__PARAMETERS); - createEAttribute(mseOccurrenceEClass, MSE_OCCURRENCE__RESULT); - - mseEClass = createEClass(MSE); - createEOperation(mseEClass, MSE___GET_CALLER); - createEOperation(mseEClass, MSE___GET_ACTION); - - mseModelEClass = createEClass(MSE_MODEL); - createEReference(mseModelEClass, MSE_MODEL__OWNED_MS_ES); - - genericMSEEClass = createEClass(GENERIC_MSE); - createEReference(genericMSEEClass, GENERIC_MSE__CALLER_REFERENCE); - createEReference(genericMSEEClass, GENERIC_MSE__ACTION_REFERENCE); - createEOperation(genericMSEEClass, GENERIC_MSE___GET_CALLER); - createEOperation(genericMSEEClass, GENERIC_MSE___GET_ACTION); - - stepEClass = createEClass(STEP); - createEReference(stepEClass, STEP__MSEOCCURRENCE); - createEReference(stepEClass, STEP__STARTING_STATE); - createEReference(stepEClass, STEP__ENDING_STATE); - - bigStepEClass = createEClass(BIG_STEP); - createEReference(bigStepEClass, BIG_STEP__SUB_STEPS); - - smallStepEClass = createEClass(SMALL_STEP); - - sequentialStepEClass = createEClass(SEQUENTIAL_STEP); - - parallelStepEClass = createEClass(PARALLEL_STEP); - - genericSequentialStepEClass = createEClass(GENERIC_SEQUENTIAL_STEP); - - genericParallelStepEClass = createEClass(GENERIC_PARALLEL_STEP); - - genericSmallStepEClass = createEClass(GENERIC_SMALL_STEP); - - traceEClass = createEClass(TRACE); - createEReference(traceEClass, TRACE__ROOT_STEP); - createEReference(traceEClass, TRACE__TRACED_OBJECTS); - createEReference(traceEClass, TRACE__STATES); - createEReference(traceEClass, TRACE__LAUNCHCONFIGURATION); - - tracedObjectEClass = createEClass(TRACED_OBJECT); - createEReference(tracedObjectEClass, TRACED_OBJECT__DIMENSIONS); - createEOperation(tracedObjectEClass, TRACED_OBJECT___GET_DIMENSIONS_INTERNAL); - - dimensionEClass = createEClass(DIMENSION); - createEReference(dimensionEClass, DIMENSION__VALUES); - - valueEClass = createEClass(VALUE); - createEReference(valueEClass, VALUE__STATES); - - stateEClass = createEClass(STATE); - createEReference(stateEClass, STATE__STARTED_STEPS); - createEReference(stateEClass, STATE__ENDED_STEPS); - createEReference(stateEClass, STATE__VALUES); - - genericReferenceValueEClass = createEClass(GENERIC_REFERENCE_VALUE); - createEReference(genericReferenceValueEClass, GENERIC_REFERENCE_VALUE__REFERENCE_VALUE); - - genericDimensionEClass = createEClass(GENERIC_DIMENSION); - createEReference(genericDimensionEClass, GENERIC_DIMENSION__DYNAMIC_PROPERTY); - - genericTracedObjectEClass = createEClass(GENERIC_TRACED_OBJECT); - - genericStateEClass = createEClass(GENERIC_STATE); - createEReference(genericStateEClass, GENERIC_STATE__VALUES_REF); - createEReference(genericStateEClass, GENERIC_STATE__STARTED_STEPS_REF); - createEReference(genericStateEClass, GENERIC_STATE__ENDED_STEPS_REF); - createEOperation(genericStateEClass, GENERIC_STATE___GET_VALUES); - createEOperation(genericStateEClass, GENERIC_STATE___GET_STARTED_STEPS); - createEOperation(genericStateEClass, GENERIC_STATE___GET_ENDED_STEPS); - - genericTraceEClass = createEClass(GENERIC_TRACE); - - genericAttributeValueEClass = createEClass(GENERIC_ATTRIBUTE_VALUE); - - booleanAttributeValueEClass = createEClass(BOOLEAN_ATTRIBUTE_VALUE); - createEAttribute(booleanAttributeValueEClass, BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); - - integerAttributevalueEClass = createEClass(INTEGER_ATTRIBUTEVALUE); - createEAttribute(integerAttributevalueEClass, INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE); - - stringAttributeValueEClass = createEClass(STRING_ATTRIBUTE_VALUE); - createEAttribute(stringAttributeValueEClass, STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); - - launchConfigurationEClass = createEClass(LAUNCH_CONFIGURATION); - createEReference(launchConfigurationEClass, LAUNCH_CONFIGURATION__PARAMETERS); - createEAttribute(launchConfigurationEClass, LAUNCH_CONFIGURATION__TYPE); - - launchConfigurationParameterEClass = createEClass(LAUNCH_CONFIGURATION_PARAMETER); - createEAttribute(launchConfigurationParameterEClass, LAUNCH_CONFIGURATION_PARAMETER__VALUE); - - languageNameParameterEClass = createEClass(LANGUAGE_NAME_PARAMETER); - - addonExtensionParameterEClass = createEClass(ADDON_EXTENSION_PARAMETER); - - modelURIParameterEClass = createEClass(MODEL_URI_PARAMETER); - - animatorURIParameterEClass = createEClass(ANIMATOR_URI_PARAMETER); - - entryPointParameterEClass = createEClass(ENTRY_POINT_PARAMETER); - - initializationArgumentsParameterEClass = createEClass(INITIALIZATION_ARGUMENTS_PARAMETER); - - modelRootParameterEClass = createEClass(MODEL_ROOT_PARAMETER); - - initializationMethodParameterEClass = createEClass(INITIALIZATION_METHOD_PARAMETER); - - genericStepEClass = createEClass(GENERIC_STEP); - createEReference(genericStepEClass, GENERIC_STEP__STARTING_STATE_REF); - createEReference(genericStepEClass, GENERIC_STEP__ENDING_STATE_REF); - createEOperation(genericStepEClass, GENERIC_STEP___GET_STARTING_STATE); - createEOperation(genericStepEClass, GENERIC_STEP___GET_ENDING_STATE); - - genericValueEClass = createEClass(GENERIC_VALUE); - createEReference(genericValueEClass, GENERIC_VALUE__STATES_REF); - createEOperation(genericValueEClass, GENERIC_VALUE___GET_STATES); - - // Create data types - iSerializableEDataType = createEDataType(ISERIALIZABLE); - } - - /** - * - * - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void initializePackageContents() { - if (isInitialized) return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Obtain other dependent packages - EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); - - // Create type parameters - ETypeParameter stepEClass_StateSubType = addETypeParameter(stepEClass, "StateSubType"); - ETypeParameter bigStepEClass_StepSubtype = addETypeParameter(bigStepEClass, "StepSubtype"); - ETypeParameter bigStepEClass_StateSubType = addETypeParameter(bigStepEClass, "StateSubType"); - ETypeParameter smallStepEClass_StateSubType = addETypeParameter(smallStepEClass, "StateSubType"); - ETypeParameter sequentialStepEClass_StepSubtype = addETypeParameter(sequentialStepEClass, "StepSubtype"); - ETypeParameter sequentialStepEClass_StateSubType = addETypeParameter(sequentialStepEClass, "StateSubType"); - ETypeParameter parallelStepEClass_StepSubtype = addETypeParameter(parallelStepEClass, "StepSubtype"); - ETypeParameter parallelStepEClass_StateSubType = addETypeParameter(parallelStepEClass, "StateSubType"); - ETypeParameter traceEClass_StepSubType = addETypeParameter(traceEClass, "StepSubType"); - ETypeParameter traceEClass_TracedObjectSubtype = addETypeParameter(traceEClass, "TracedObjectSubtype"); - ETypeParameter traceEClass_StateSubType = addETypeParameter(traceEClass, "StateSubType"); - ETypeParameter tracedObjectEClass_DimensionSubType = addETypeParameter(tracedObjectEClass, "DimensionSubType"); - ETypeParameter dimensionEClass_ValueSubType = addETypeParameter(dimensionEClass, "ValueSubType"); - ETypeParameter valueEClass_StateSubType = addETypeParameter(valueEClass, "StateSubType"); - ETypeParameter stateEClass_StepSubType = addETypeParameter(stateEClass, "StepSubType"); - ETypeParameter stateEClass_ValueSubType = addETypeParameter(stateEClass, "ValueSubType"); - ETypeParameter genericTracedObjectEClass_T = addETypeParameter(genericTracedObjectEClass, "T"); - ETypeParameter genericTraceEClass_StepSubType = addETypeParameter(genericTraceEClass, "StepSubType"); - - // Set bounds for type parameters - EGenericType g1 = createEGenericType(this.getState()); - EGenericType g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - stepEClass_StateSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getStep()); - g2 = createEGenericType(bigStepEClass_StateSubType); - g1.getETypeArguments().add(g2); - bigStepEClass_StepSubtype.getEBounds().add(g1); - g1 = createEGenericType(this.getState()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - bigStepEClass_StateSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getState()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - smallStepEClass_StateSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getStep()); - g2 = createEGenericType(sequentialStepEClass_StateSubType); - g1.getETypeArguments().add(g2); - sequentialStepEClass_StepSubtype.getEBounds().add(g1); - g1 = createEGenericType(this.getState()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - sequentialStepEClass_StateSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getStep()); - g2 = createEGenericType(parallelStepEClass_StateSubType); - g1.getETypeArguments().add(g2); - parallelStepEClass_StepSubtype.getEBounds().add(g1); - g1 = createEGenericType(this.getState()); - g2 = createEGenericType(parallelStepEClass_StepSubtype); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - parallelStepEClass_StateSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getStep()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - traceEClass_StepSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getTracedObject()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - traceEClass_TracedObjectSubtype.getEBounds().add(g1); - g1 = createEGenericType(this.getState()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - traceEClass_StateSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getDimension()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - tracedObjectEClass_DimensionSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getValue()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - dimensionEClass_ValueSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getState()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - valueEClass_StateSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getStep()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - stateEClass_StepSubType.getEBounds().add(g1); - g1 = createEGenericType(this.getValue()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - stateEClass_ValueSubType.getEBounds().add(g1); - g1 = createEGenericType(ecorePackage.getEObject()); - genericTracedObjectEClass_T.getEBounds().add(g1); - g1 = createEGenericType(this.getGenericStep()); - genericTraceEClass_StepSubType.getEBounds().add(g1); - - // Add supertypes to classes - mseEClass.getESuperTypes().add(theEcorePackage.getENamedElement()); - genericMSEEClass.getESuperTypes().add(this.getMSE()); - g1 = createEGenericType(this.getStep()); - g2 = createEGenericType(bigStepEClass_StateSubType); - g1.getETypeArguments().add(g2); - bigStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getStep()); - g2 = createEGenericType(smallStepEClass_StateSubType); - g1.getETypeArguments().add(g2); - smallStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getBigStep()); - g2 = createEGenericType(sequentialStepEClass_StepSubtype); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(sequentialStepEClass_StateSubType); - g1.getETypeArguments().add(g2); - sequentialStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getBigStep()); - g2 = createEGenericType(parallelStepEClass_StepSubtype); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(parallelStepEClass_StateSubType); - g1.getETypeArguments().add(g2); - parallelStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getSequentialStep()); - g2 = createEGenericType(this.getGenericStep()); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(this.getGenericState()); - g1.getETypeArguments().add(g2); - genericSequentialStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getGenericStep()); - genericSequentialStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getParallelStep()); - g2 = createEGenericType(this.getGenericStep()); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(this.getGenericState()); - g1.getETypeArguments().add(g2); - genericParallelStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getGenericStep()); - genericParallelStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getSmallStep()); - g2 = createEGenericType(this.getGenericState()); - g1.getETypeArguments().add(g2); - genericSmallStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getGenericStep()); - genericSmallStepEClass.getEGenericSuperTypes().add(g1); - genericReferenceValueEClass.getESuperTypes().add(this.getGenericValue()); - g1 = createEGenericType(this.getDimension()); - g2 = createEGenericType(this.getGenericValue()); - g1.getETypeArguments().add(g2); - genericDimensionEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getTracedObject()); - g2 = createEGenericType(this.getGenericDimension()); - g1.getETypeArguments().add(g2); - genericTracedObjectEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getState()); - g2 = createEGenericType(this.getGenericStep()); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(this.getGenericValue()); - g1.getETypeArguments().add(g2); - genericStateEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getTrace()); - g2 = createEGenericType(genericTraceEClass_StepSubType); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(this.getGenericTracedObject()); - g1.getETypeArguments().add(g2); - EGenericType g3 = createEGenericType(); - g2.getETypeArguments().add(g3); - g2 = createEGenericType(this.getGenericState()); - g1.getETypeArguments().add(g2); - genericTraceEClass.getEGenericSuperTypes().add(g1); - genericAttributeValueEClass.getESuperTypes().add(this.getGenericValue()); - booleanAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); - integerAttributevalueEClass.getESuperTypes().add(this.getGenericAttributeValue()); - stringAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); - languageNameParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - addonExtensionParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - modelURIParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - animatorURIParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - entryPointParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - initializationArgumentsParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - modelRootParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - initializationMethodParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); - g1 = createEGenericType(this.getStep()); - g2 = createEGenericType(this.getGenericState()); - g1.getETypeArguments().add(g2); - genericStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(this.getValue()); - g2 = createEGenericType(this.getGenericState()); - g1.getETypeArguments().add(g2); - genericValueEClass.getEGenericSuperTypes().add(g1); - - // Initialize classes, features, and operations; add parameters - initEClass(mseOccurrenceEClass, MSEOccurrence.class, "MSEOccurrence", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getMSEOccurrence_Mse(), this.getMSE(), null, "mse", null, 1, 1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMSEOccurrence_Parameters(), ecorePackage.getEJavaObject(), "parameters", null, 0, -1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMSEOccurrence_Result(), ecorePackage.getEJavaObject(), "result", null, 0, -1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(mseEClass, fr.inria.diverse.trace.commons.model.trace.MSE.class, "MSE", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEOperation(getMSE__GetCaller(), theEcorePackage.getEObject(), "getCaller", 0, 1, IS_UNIQUE, IS_ORDERED); - - initEOperation(getMSE__GetAction(), theEcorePackage.getEOperation(), "getAction", 0, 1, IS_UNIQUE, IS_ORDERED); - - initEClass(mseModelEClass, MSEModel.class, "MSEModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getMSEModel_OwnedMSEs(), this.getMSE(), null, "ownedMSEs", null, 0, -1, MSEModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(genericMSEEClass, GenericMSE.class, "GenericMSE", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenericMSE_CallerReference(), theEcorePackage.getEObject(), null, "callerReference", null, 0, 1, GenericMSE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getGenericMSE_ActionReference(), theEcorePackage.getEOperation(), null, "actionReference", null, 0, 1, GenericMSE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEOperation(getGenericMSE__GetCaller(), theEcorePackage.getEObject(), "getCaller", 0, 1, IS_UNIQUE, IS_ORDERED); - - initEOperation(getGenericMSE__GetAction(), theEcorePackage.getEOperation(), "getAction", 0, 1, IS_UNIQUE, IS_ORDERED); - - initEClass(stepEClass, Step.class, "Step", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getStep_Mseoccurrence(), this.getMSEOccurrence(), null, "mseoccurrence", null, 0, 1, Step.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - g1 = createEGenericType(stepEClass_StateSubType); - initEReference(getStep_StartingState(), g1, this.getState_StartedSteps(), "startingState", null, 1, 1, Step.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - g1 = createEGenericType(stepEClass_StateSubType); - initEReference(getStep_EndingState(), g1, this.getState_EndedSteps(), "endingState", null, 0, 1, Step.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(bigStepEClass, BigStep.class, "BigStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - g1 = createEGenericType(bigStepEClass_StepSubtype); - initEReference(getBigStep_SubSteps(), g1, null, "subSteps", null, 0, -1, BigStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(smallStepEClass, SmallStep.class, "SmallStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(sequentialStepEClass, SequentialStep.class, "SequentialStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(parallelStepEClass, ParallelStep.class, "ParallelStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(genericSequentialStepEClass, GenericSequentialStep.class, "GenericSequentialStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(genericParallelStepEClass, GenericParallelStep.class, "GenericParallelStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(genericSmallStepEClass, GenericSmallStep.class, "GenericSmallStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(traceEClass, Trace.class, "Trace", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - g1 = createEGenericType(traceEClass_StepSubType); - initEReference(getTrace_RootStep(), g1, null, "rootStep", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - g1 = createEGenericType(traceEClass_TracedObjectSubtype); - initEReference(getTrace_TracedObjects(), g1, null, "tracedObjects", null, 0, -1, Trace.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - g1 = createEGenericType(traceEClass_StateSubType); - initEReference(getTrace_States(), g1, null, "states", null, 0, -1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTrace_Launchconfiguration(), this.getLaunchConfiguration(), null, "launchconfiguration", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(tracedObjectEClass, TracedObject.class, "TracedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - g1 = createEGenericType(tracedObjectEClass_DimensionSubType); - initEReference(getTracedObject_Dimensions(), g1, null, "dimensions", null, 0, -1, TracedObject.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - - EOperation op = initEOperation(getTracedObject__GetDimensionsInternal(), null, "getDimensionsInternal", 0, -1, IS_UNIQUE, IS_ORDERED); - g1 = createEGenericType(tracedObjectEClass_DimensionSubType); - initEOperation(op, g1); - - initEClass(dimensionEClass, Dimension.class, "Dimension", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - g1 = createEGenericType(dimensionEClass_ValueSubType); - initEReference(getDimension_Values(), g1, null, "values", null, 0, -1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(valueEClass, Value.class, "Value", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - g1 = createEGenericType(valueEClass_StateSubType); - initEReference(getValue_States(), g1, null, "states", null, 0, -1, Value.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - - initEClass(stateEClass, State.class, "State", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - g1 = createEGenericType(stateEClass_StepSubType); - initEReference(getState_StartedSteps(), g1, this.getStep_StartingState(), "startedSteps", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - g1 = createEGenericType(stateEClass_StepSubType); - initEReference(getState_EndedSteps(), g1, this.getStep_EndingState(), "endedSteps", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - g1 = createEGenericType(stateEClass_ValueSubType); - initEReference(getState_Values(), g1, null, "values", null, 0, -1, State.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - - initEClass(genericReferenceValueEClass, GenericReferenceValue.class, "GenericReferenceValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenericReferenceValue_ReferenceValue(), ecorePackage.getEObject(), null, "referenceValue", null, 0, 1, GenericReferenceValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(genericDimensionEClass, GenericDimension.class, "GenericDimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenericDimension_DynamicProperty(), theEcorePackage.getEStructuralFeature(), null, "dynamicProperty", null, 0, 1, GenericDimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(genericTracedObjectEClass, GenericTracedObject.class, "GenericTracedObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(genericStateEClass, GenericState.class, "GenericState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenericState_ValuesRef(), this.getGenericValue(), this.getGenericValue_StatesRef(), "valuesRef", null, 0, -1, GenericState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getGenericState_StartedStepsRef(), this.getGenericStep(), this.getGenericStep_StartingStateRef(), "startedStepsRef", null, 0, -1, GenericState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getGenericState_EndedStepsRef(), this.getGenericStep(), this.getGenericStep_EndingStateRef(), "endedStepsRef", null, 0, -1, GenericState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEOperation(getGenericState__GetValues(), this.getGenericValue(), "getValues", 0, -1, IS_UNIQUE, IS_ORDERED); - - initEOperation(getGenericState__GetStartedSteps(), this.getGenericStep(), "getStartedSteps", 0, -1, IS_UNIQUE, IS_ORDERED); - - initEOperation(getGenericState__GetEndedSteps(), this.getGenericStep(), "getEndedSteps", 0, -1, IS_UNIQUE, IS_ORDERED); - - initEClass(genericTraceEClass, GenericTrace.class, "GenericTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(genericAttributeValueEClass, GenericAttributeValue.class, "GenericAttributeValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(booleanAttributeValueEClass, BooleanAttributeValue.class, "BooleanAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getBooleanAttributeValue_AttributeValue(), ecorePackage.getEBoolean(), "attributeValue", "false", 0, 1, BooleanAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(integerAttributevalueEClass, IntegerAttributevalue.class, "IntegerAttributevalue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIntegerAttributevalue_AttributeValue(), ecorePackage.getEInt(), "attributeValue", null, 0, 1, IntegerAttributevalue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(stringAttributeValueEClass, StringAttributeValue.class, "StringAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getStringAttributeValue_AttributeValue(), ecorePackage.getEString(), "attributeValue", null, 0, 1, StringAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(launchConfigurationEClass, LaunchConfiguration.class, "LaunchConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getLaunchConfiguration_Parameters(), this.getLaunchConfigurationParameter(), null, "parameters", null, 0, -1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getLaunchConfiguration_Type(), ecorePackage.getEString(), "type", null, 1, 1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(launchConfigurationParameterEClass, LaunchConfigurationParameter.class, "LaunchConfigurationParameter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getLaunchConfigurationParameter_Value(), ecorePackage.getEString(), "value", "", 0, 1, LaunchConfigurationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(languageNameParameterEClass, LanguageNameParameter.class, "LanguageNameParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(addonExtensionParameterEClass, AddonExtensionParameter.class, "AddonExtensionParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(modelURIParameterEClass, ModelURIParameter.class, "ModelURIParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(animatorURIParameterEClass, AnimatorURIParameter.class, "AnimatorURIParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(entryPointParameterEClass, EntryPointParameter.class, "EntryPointParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(initializationArgumentsParameterEClass, InitializationArgumentsParameter.class, "InitializationArgumentsParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(modelRootParameterEClass, ModelRootParameter.class, "ModelRootParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(initializationMethodParameterEClass, InitializationMethodParameter.class, "InitializationMethodParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(genericStepEClass, GenericStep.class, "GenericStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenericStep_StartingStateRef(), this.getGenericState(), this.getGenericState_StartedStepsRef(), "startingStateRef", null, 1, 1, GenericStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getGenericStep_EndingStateRef(), this.getGenericState(), this.getGenericState_EndedStepsRef(), "endingStateRef", null, 0, 1, GenericStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEOperation(getGenericStep__GetStartingState(), this.getGenericState(), "getStartingState", 1, 1, IS_UNIQUE, IS_ORDERED); - - initEOperation(getGenericStep__GetEndingState(), this.getGenericState(), "getEndingState", 0, 1, IS_UNIQUE, IS_ORDERED); - - initEClass(genericValueEClass, GenericValue.class, "GenericValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenericValue_StatesRef(), this.getGenericState(), this.getGenericState_ValuesRef(), "statesRef", null, 0, -1, GenericValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEOperation(getGenericValue__GetStates(), this.getGenericState(), "getStates", 1, -1, IS_UNIQUE, IS_ORDERED); - - // Initialize data types - initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - - // Create resource - createResource(eNS_URI); - } - -} //TracePackageImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java deleted file mode 100644 index 00d11a0b2..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java +++ /dev/null @@ -1,163 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; - -import java.lang.reflect.InvocationTargetException; -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Traced Object'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl#getDimensions Dimensions}
    • - *
- * - * @generated - */ -public abstract class TracedObjectImpl> extends MinimalEObjectImpl.Container implements TracedObject { - /** - * - * - * @generated - */ - protected TracedObjectImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.TRACED_OBJECT; - } - - /** - * - * - * @generated - */ - public EList getDimensions() { - return getDimensionsInternal(); - } - - /** - * - * - * @generated - */ - public EList getDimensionsInternal() { - // TODO: implement this method - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TracePackage.TRACED_OBJECT__DIMENSIONS: - return ((InternalEList)getDimensions()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.TRACED_OBJECT__DIMENSIONS: - return getDimensions(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.TRACED_OBJECT__DIMENSIONS: - getDimensions().clear(); - getDimensions().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.TRACED_OBJECT__DIMENSIONS: - getDimensions().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.TRACED_OBJECT__DIMENSIONS: - return !getDimensions().isEmpty(); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case TracePackage.TRACED_OBJECT___GET_DIMENSIONS_INTERNAL: - return getDimensionsInternal(); - } - return super.eInvoke(operationID, arguments); - } - -} //TracedObjectImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java deleted file mode 100644 index 34ef40cad..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.Value; - -import java.util.Collection; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -/** - * - * An implementation of the model object 'Value'. - * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl#getStates States}
    • - *
- * - * @generated - */ -public abstract class ValueImpl> extends MinimalEObjectImpl.Container implements Value { - /** - * - * - * @generated - */ - protected ValueImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return TracePackage.Literals.VALUE; - } - - /** - * - * - * @generated - */ - public EList getStates() { - // TODO: implement this method to return the 'States' reference list - // Ensure that you remove @generated or mark it @generated NOT - // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting - // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. - throw new UnsupportedOperationException(); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TracePackage.VALUE__STATES: - return getStates(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TracePackage.VALUE__STATES: - getStates().clear(); - getStates().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TracePackage.VALUE__STATES: - getStates().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TracePackage.VALUE__STATES: - return !getStates().isEmpty(); - } - return super.eIsSet(featureID); - } - -} //ValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java deleted file mode 100644 index 79c674ddf..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java +++ /dev/null @@ -1,824 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.util; - -import fr.inria.diverse.trace.commons.model.trace.*; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notifier; - -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - -import org.eclipse.emf.ecore.EModelElement; -import org.eclipse.emf.ecore.ENamedElement; -import org.eclipse.emf.ecore.EObject; - -/** - * - * The Adapter Factory for the model. - * It provides an adapter createXXX method for each class of the model. - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage - * @generated - */ -public class TraceAdapterFactory extends AdapterFactoryImpl { - /** - * The cached model package. - * - * - * @generated - */ - protected static TracePackage modelPackage; - - /** - * Creates an instance of the adapter factory. - * - * - * @generated - */ - public TraceAdapterFactory() { - if (modelPackage == null) { - modelPackage = TracePackage.eINSTANCE; - } - } - - /** - * Returns whether this factory is applicable for the type of the object. - * - * This implementation returns true if the object is either the model's package or is an instance object of the model. - * - * @return whether this factory is applicable for the type of the object. - * @generated - */ - @Override - public boolean isFactoryForType(Object object) { - if (object == modelPackage) { - return true; - } - if (object instanceof EObject) { - return ((EObject)object).eClass().getEPackage() == modelPackage; - } - return false; - } - - /** - * The switch that delegates to the createXXX methods. - * - * - * @generated - */ - protected TraceSwitch modelSwitch = - new TraceSwitch() { - @Override - public Adapter caseMSEOccurrence(MSEOccurrence object) { - return createMSEOccurrenceAdapter(); - } - @Override - public Adapter caseMSE(MSE object) { - return createMSEAdapter(); - } - @Override - public Adapter caseMSEModel(MSEModel object) { - return createMSEModelAdapter(); - } - @Override - public Adapter caseGenericMSE(GenericMSE object) { - return createGenericMSEAdapter(); - } - @Override - public > Adapter caseStep(Step object) { - return createStepAdapter(); - } - @Override - public , StateSubType extends State> Adapter caseBigStep(BigStep object) { - return createBigStepAdapter(); - } - @Override - public > Adapter caseSmallStep(SmallStep object) { - return createSmallStepAdapter(); - } - @Override - public , StateSubType extends State> Adapter caseSequentialStep(SequentialStep object) { - return createSequentialStepAdapter(); - } - @Override - public , StateSubType extends State> Adapter caseParallelStep(ParallelStep object) { - return createParallelStepAdapter(); - } - @Override - public Adapter caseGenericSequentialStep(GenericSequentialStep object) { - return createGenericSequentialStepAdapter(); - } - @Override - public Adapter caseGenericParallelStep(GenericParallelStep object) { - return createGenericParallelStepAdapter(); - } - @Override - public Adapter caseGenericSmallStep(GenericSmallStep object) { - return createGenericSmallStepAdapter(); - } - @Override - public , TracedObjectSubtype extends TracedObject, StateSubType extends State> Adapter caseTrace(Trace object) { - return createTraceAdapter(); - } - @Override - public > Adapter caseTracedObject(TracedObject object) { - return createTracedObjectAdapter(); - } - @Override - public > Adapter caseDimension(Dimension object) { - return createDimensionAdapter(); - } - @Override - public > Adapter caseValue(Value object) { - return createValueAdapter(); - } - @Override - public , ValueSubType extends Value> Adapter caseState(State object) { - return createStateAdapter(); - } - @Override - public Adapter caseGenericReferenceValue(GenericReferenceValue object) { - return createGenericReferenceValueAdapter(); - } - @Override - public Adapter caseGenericDimension(GenericDimension object) { - return createGenericDimensionAdapter(); - } - @Override - public Adapter caseGenericTracedObject(GenericTracedObject object) { - return createGenericTracedObjectAdapter(); - } - @Override - public Adapter caseGenericState(GenericState object) { - return createGenericStateAdapter(); - } - @Override - public Adapter caseGenericTrace(GenericTrace object) { - return createGenericTraceAdapter(); - } - @Override - public Adapter caseGenericAttributeValue(GenericAttributeValue object) { - return createGenericAttributeValueAdapter(); - } - @Override - public Adapter caseBooleanAttributeValue(BooleanAttributeValue object) { - return createBooleanAttributeValueAdapter(); - } - @Override - public Adapter caseIntegerAttributevalue(IntegerAttributevalue object) { - return createIntegerAttributevalueAdapter(); - } - @Override - public Adapter caseStringAttributeValue(StringAttributeValue object) { - return createStringAttributeValueAdapter(); - } - @Override - public Adapter caseLaunchConfiguration(LaunchConfiguration object) { - return createLaunchConfigurationAdapter(); - } - @Override - public Adapter caseLaunchConfigurationParameter(LaunchConfigurationParameter object) { - return createLaunchConfigurationParameterAdapter(); - } - @Override - public Adapter caseLanguageNameParameter(LanguageNameParameter object) { - return createLanguageNameParameterAdapter(); - } - @Override - public Adapter caseAddonExtensionParameter(AddonExtensionParameter object) { - return createAddonExtensionParameterAdapter(); - } - @Override - public Adapter caseModelURIParameter(ModelURIParameter object) { - return createModelURIParameterAdapter(); - } - @Override - public Adapter caseAnimatorURIParameter(AnimatorURIParameter object) { - return createAnimatorURIParameterAdapter(); - } - @Override - public Adapter caseEntryPointParameter(EntryPointParameter object) { - return createEntryPointParameterAdapter(); - } - @Override - public Adapter caseInitializationArgumentsParameter(InitializationArgumentsParameter object) { - return createInitializationArgumentsParameterAdapter(); - } - @Override - public Adapter caseModelRootParameter(ModelRootParameter object) { - return createModelRootParameterAdapter(); - } - @Override - public Adapter caseInitializationMethodParameter(InitializationMethodParameter object) { - return createInitializationMethodParameterAdapter(); - } - @Override - public Adapter caseGenericStep(GenericStep object) { - return createGenericStepAdapter(); - } - @Override - public Adapter caseGenericValue(GenericValue object) { - return createGenericValueAdapter(); - } - @Override - public Adapter caseEModelElement(EModelElement object) { - return createEModelElementAdapter(); - } - @Override - public Adapter caseENamedElement(ENamedElement object) { - return createENamedElementAdapter(); - } - @Override - public Adapter defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; - - /** - * Creates an adapter for the target. - * - * - * @param target the object to adapt. - * @return the adapter for the target. - * @generated - */ - @Override - public Adapter createAdapter(Notifier target) { - return modelSwitch.doSwitch((EObject)target); - } - - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence MSE Occurrence}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence - * @generated - */ - public Adapter createMSEOccurrenceAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.MSE MSE}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.MSE - * @generated - */ - public Adapter createMSEAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel MSE Model}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.MSEModel - * @generated - */ - public Adapter createMSEModelAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE Generic MSE}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE - * @generated - */ - public Adapter createGenericMSEAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Step - * @generated - */ - public Adapter createStepAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.BigStep - * @generated - */ - public Adapter createBigStepAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.SmallStep - * @generated - */ - public Adapter createSmallStepAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep - * @generated - */ - public Adapter createSequentialStepAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ParallelStep Parallel Step}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.ParallelStep - * @generated - */ - public Adapter createParallelStepAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep Generic Sequential Step}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericSequentialStep - * @generated - */ - public Adapter createGenericSequentialStepAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericParallelStep Generic Parallel Step}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericParallelStep - * @generated - */ - public Adapter createGenericParallelStepAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericSmallStep Generic Small Step}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericSmallStep - * @generated - */ - public Adapter createGenericSmallStepAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Trace - * @generated - */ - public Adapter createTraceAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.TracedObject - * @generated - */ - public Adapter createTracedObjectAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Dimension - * @generated - */ - public Adapter createDimensionAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Value - * @generated - */ - public Adapter createValueAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.State - * @generated - */ - public Adapter createStateAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue Generic Reference Value}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericReferenceValue - * @generated - */ - public Adapter createGenericReferenceValueAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericDimension Generic Dimension}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericDimension - * @generated - */ - public Adapter createGenericDimensionAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericTracedObject Generic Traced Object}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericTracedObject - * @generated - */ - public Adapter createGenericTracedObjectAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericState Generic State}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericState - * @generated - */ - public Adapter createGenericStateAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericTrace Generic Trace}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericTrace - * @generated - */ - public Adapter createGenericTraceAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue Generic Attribute Value}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericAttributeValue - * @generated - */ - public Adapter createGenericAttributeValueAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue Boolean Attribute Value}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.BooleanAttributeValue - * @generated - */ - public Adapter createBooleanAttributeValueAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue Integer Attributevalue}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.IntegerAttributevalue - * @generated - */ - public Adapter createIntegerAttributevalueAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.StringAttributeValue String Attribute Value}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.StringAttributeValue - * @generated - */ - public Adapter createStringAttributeValueAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration Launch Configuration}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration - * @generated - */ - public Adapter createLaunchConfigurationAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter Launch Configuration Parameter}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.LaunchConfigurationParameter - * @generated - */ - public Adapter createLaunchConfigurationParameterAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter Language Name Parameter}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.LanguageNameParameter - * @generated - */ - public Adapter createLanguageNameParameterAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter Addon Extension Parameter}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.AddonExtensionParameter - * @generated - */ - public Adapter createAddonExtensionParameterAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ModelURIParameter Model URI Parameter}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.ModelURIParameter - * @generated - */ - public Adapter createModelURIParameterAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter Animator URI Parameter}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.AnimatorURIParameter - * @generated - */ - public Adapter createAnimatorURIParameterAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.EntryPointParameter Entry Point Parameter}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.EntryPointParameter - * @generated - */ - public Adapter createEntryPointParameterAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter Initialization Arguments Parameter}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.InitializationArgumentsParameter - * @generated - */ - public Adapter createInitializationArgumentsParameterAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ModelRootParameter Model Root Parameter}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.ModelRootParameter - * @generated - */ - public Adapter createModelRootParameterAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter Initialization Method Parameter}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.InitializationMethodParameter - * @generated - */ - public Adapter createInitializationMethodParameterAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericStep Generic Step}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericStep - * @generated - */ - public Adapter createGenericStepAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericValue Generic Value}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericValue - * @generated - */ - public Adapter createGenericValueAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement EModel Element}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see org.eclipse.emf.ecore.EModelElement - * @generated - */ - public Adapter createEModelElementAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.ENamedElement ENamed Element}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see org.eclipse.emf.ecore.ENamedElement - * @generated - */ - public Adapter createENamedElementAdapter() { - return null; - } - - /** - * Creates a new adapter for the default case. - * - * This default implementation returns null. - * - * @return the new adapter. - * @generated - */ - public Adapter createEObjectAdapter() { - return null; - } - -} //TraceAdapterFactory diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java deleted file mode 100644 index 438216fd8..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java +++ /dev/null @@ -1,968 +0,0 @@ -/** - */ -package fr.inria.diverse.trace.commons.model.trace.util; - -import fr.inria.diverse.trace.commons.model.trace.*; - -import org.eclipse.emf.ecore.EModelElement; -import org.eclipse.emf.ecore.ENamedElement; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.util.Switch; - -/** - * - * The Switch for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} - * to invoke the caseXXX method for each class of the model, - * starting with the actual class of the object - * and proceeding up the inheritance hierarchy - * until a non-null result is returned, - * which is the result of the switch. - * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage - * @generated - */ -public class TraceSwitch extends Switch { - /** - * The cached model package - * - * - * @generated - */ - protected static TracePackage modelPackage; - - /** - * Creates an instance of the switch. - * - * - * @generated - */ - public TraceSwitch() { - if (modelPackage == null) { - modelPackage = TracePackage.eINSTANCE; - } - } - - /** - * Checks whether this is a switch for the given package. - * - * - * @param ePackage the package in question. - * @return whether this is a switch for the given package. - * @generated - */ - @Override - protected boolean isSwitchFor(EPackage ePackage) { - return ePackage == modelPackage; - } - - /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. - * - * - * @return the first non-null result returned by a caseXXX call. - * @generated - */ - @Override - protected T1 doSwitch(int classifierID, EObject theEObject) { - switch (classifierID) { - case TracePackage.MSE_OCCURRENCE: { - MSEOccurrence mseOccurrence = (MSEOccurrence)theEObject; - T1 result = caseMSEOccurrence(mseOccurrence); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.MSE: { - MSE mse = (MSE)theEObject; - T1 result = caseMSE(mse); - if (result == null) result = caseENamedElement(mse); - if (result == null) result = caseEModelElement(mse); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.MSE_MODEL: { - MSEModel mseModel = (MSEModel)theEObject; - T1 result = caseMSEModel(mseModel); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_MSE: { - GenericMSE genericMSE = (GenericMSE)theEObject; - T1 result = caseGenericMSE(genericMSE); - if (result == null) result = caseMSE(genericMSE); - if (result == null) result = caseENamedElement(genericMSE); - if (result == null) result = caseEModelElement(genericMSE); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.STEP: { - Step step = (Step)theEObject; - T1 result = caseStep(step); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.BIG_STEP: { - BigStep bigStep = (BigStep)theEObject; - T1 result = caseBigStep(bigStep); - if (result == null) result = caseStep(bigStep); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.SMALL_STEP: { - SmallStep smallStep = (SmallStep)theEObject; - T1 result = caseSmallStep(smallStep); - if (result == null) result = caseStep(smallStep); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.SEQUENTIAL_STEP: { - SequentialStep sequentialStep = (SequentialStep)theEObject; - T1 result = caseSequentialStep(sequentialStep); - if (result == null) result = caseBigStep(sequentialStep); - if (result == null) result = caseStep(sequentialStep); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.PARALLEL_STEP: { - ParallelStep parallelStep = (ParallelStep)theEObject; - T1 result = caseParallelStep(parallelStep); - if (result == null) result = caseBigStep(parallelStep); - if (result == null) result = caseStep(parallelStep); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_SEQUENTIAL_STEP: { - GenericSequentialStep genericSequentialStep = (GenericSequentialStep)theEObject; - T1 result = caseGenericSequentialStep(genericSequentialStep); - if (result == null) result = caseSequentialStep(genericSequentialStep); - if (result == null) result = caseGenericStep(genericSequentialStep); - if (result == null) result = caseBigStep(genericSequentialStep); - if (result == null) result = caseStep(genericSequentialStep); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_PARALLEL_STEP: { - GenericParallelStep genericParallelStep = (GenericParallelStep)theEObject; - T1 result = caseGenericParallelStep(genericParallelStep); - if (result == null) result = caseParallelStep(genericParallelStep); - if (result == null) result = caseGenericStep(genericParallelStep); - if (result == null) result = caseBigStep(genericParallelStep); - if (result == null) result = caseStep(genericParallelStep); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_SMALL_STEP: { - GenericSmallStep genericSmallStep = (GenericSmallStep)theEObject; - T1 result = caseGenericSmallStep(genericSmallStep); - if (result == null) result = caseSmallStep(genericSmallStep); - if (result == null) result = caseGenericStep(genericSmallStep); - if (result == null) result = caseStep(genericSmallStep); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.TRACE: { - Trace trace = (Trace)theEObject; - T1 result = caseTrace(trace); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.TRACED_OBJECT: { - TracedObject tracedObject = (TracedObject)theEObject; - T1 result = caseTracedObject(tracedObject); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.DIMENSION: { - Dimension dimension = (Dimension)theEObject; - T1 result = caseDimension(dimension); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.VALUE: { - Value value = (Value)theEObject; - T1 result = caseValue(value); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.STATE: { - State state = (State)theEObject; - T1 result = caseState(state); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_REFERENCE_VALUE: { - GenericReferenceValue genericReferenceValue = (GenericReferenceValue)theEObject; - T1 result = caseGenericReferenceValue(genericReferenceValue); - if (result == null) result = caseGenericValue(genericReferenceValue); - if (result == null) result = caseValue(genericReferenceValue); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_DIMENSION: { - GenericDimension genericDimension = (GenericDimension)theEObject; - T1 result = caseGenericDimension(genericDimension); - if (result == null) result = caseDimension(genericDimension); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_TRACED_OBJECT: { - GenericTracedObject genericTracedObject = (GenericTracedObject)theEObject; - T1 result = caseGenericTracedObject(genericTracedObject); - if (result == null) result = caseTracedObject(genericTracedObject); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_STATE: { - GenericState genericState = (GenericState)theEObject; - T1 result = caseGenericState(genericState); - if (result == null) result = caseState(genericState); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_TRACE: { - GenericTrace genericTrace = (GenericTrace)theEObject; - T1 result = caseGenericTrace(genericTrace); - if (result == null) result = caseTrace(genericTrace); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_ATTRIBUTE_VALUE: { - GenericAttributeValue genericAttributeValue = (GenericAttributeValue)theEObject; - T1 result = caseGenericAttributeValue(genericAttributeValue); - if (result == null) result = caseGenericValue(genericAttributeValue); - if (result == null) result = caseValue(genericAttributeValue); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.BOOLEAN_ATTRIBUTE_VALUE: { - BooleanAttributeValue booleanAttributeValue = (BooleanAttributeValue)theEObject; - T1 result = caseBooleanAttributeValue(booleanAttributeValue); - if (result == null) result = caseGenericAttributeValue(booleanAttributeValue); - if (result == null) result = caseGenericValue(booleanAttributeValue); - if (result == null) result = caseValue(booleanAttributeValue); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.INTEGER_ATTRIBUTEVALUE: { - IntegerAttributevalue integerAttributevalue = (IntegerAttributevalue)theEObject; - T1 result = caseIntegerAttributevalue(integerAttributevalue); - if (result == null) result = caseGenericAttributeValue(integerAttributevalue); - if (result == null) result = caseGenericValue(integerAttributevalue); - if (result == null) result = caseValue(integerAttributevalue); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.STRING_ATTRIBUTE_VALUE: { - StringAttributeValue stringAttributeValue = (StringAttributeValue)theEObject; - T1 result = caseStringAttributeValue(stringAttributeValue); - if (result == null) result = caseGenericAttributeValue(stringAttributeValue); - if (result == null) result = caseGenericValue(stringAttributeValue); - if (result == null) result = caseValue(stringAttributeValue); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.LAUNCH_CONFIGURATION: { - LaunchConfiguration launchConfiguration = (LaunchConfiguration)theEObject; - T1 result = caseLaunchConfiguration(launchConfiguration); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.LAUNCH_CONFIGURATION_PARAMETER: { - LaunchConfigurationParameter launchConfigurationParameter = (LaunchConfigurationParameter)theEObject; - T1 result = caseLaunchConfigurationParameter(launchConfigurationParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.LANGUAGE_NAME_PARAMETER: { - LanguageNameParameter languageNameParameter = (LanguageNameParameter)theEObject; - T1 result = caseLanguageNameParameter(languageNameParameter); - if (result == null) result = caseLaunchConfigurationParameter(languageNameParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.ADDON_EXTENSION_PARAMETER: { - AddonExtensionParameter addonExtensionParameter = (AddonExtensionParameter)theEObject; - T1 result = caseAddonExtensionParameter(addonExtensionParameter); - if (result == null) result = caseLaunchConfigurationParameter(addonExtensionParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.MODEL_URI_PARAMETER: { - ModelURIParameter modelURIParameter = (ModelURIParameter)theEObject; - T1 result = caseModelURIParameter(modelURIParameter); - if (result == null) result = caseLaunchConfigurationParameter(modelURIParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.ANIMATOR_URI_PARAMETER: { - AnimatorURIParameter animatorURIParameter = (AnimatorURIParameter)theEObject; - T1 result = caseAnimatorURIParameter(animatorURIParameter); - if (result == null) result = caseLaunchConfigurationParameter(animatorURIParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.ENTRY_POINT_PARAMETER: { - EntryPointParameter entryPointParameter = (EntryPointParameter)theEObject; - T1 result = caseEntryPointParameter(entryPointParameter); - if (result == null) result = caseLaunchConfigurationParameter(entryPointParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.INITIALIZATION_ARGUMENTS_PARAMETER: { - InitializationArgumentsParameter initializationArgumentsParameter = (InitializationArgumentsParameter)theEObject; - T1 result = caseInitializationArgumentsParameter(initializationArgumentsParameter); - if (result == null) result = caseLaunchConfigurationParameter(initializationArgumentsParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.MODEL_ROOT_PARAMETER: { - ModelRootParameter modelRootParameter = (ModelRootParameter)theEObject; - T1 result = caseModelRootParameter(modelRootParameter); - if (result == null) result = caseLaunchConfigurationParameter(modelRootParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.INITIALIZATION_METHOD_PARAMETER: { - InitializationMethodParameter initializationMethodParameter = (InitializationMethodParameter)theEObject; - T1 result = caseInitializationMethodParameter(initializationMethodParameter); - if (result == null) result = caseLaunchConfigurationParameter(initializationMethodParameter); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_STEP: { - GenericStep genericStep = (GenericStep)theEObject; - T1 result = caseGenericStep(genericStep); - if (result == null) result = caseStep(genericStep); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TracePackage.GENERIC_VALUE: { - GenericValue genericValue = (GenericValue)theEObject; - T1 result = caseGenericValue(genericValue); - if (result == null) result = caseValue(genericValue); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); - } - } - - /** - * Returns the result of interpreting the object as an instance of 'MSE Occurrence'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'MSE Occurrence'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseMSEOccurrence(MSEOccurrence object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'MSE'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'MSE'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseMSE(MSE object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'MSE Model'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'MSE Model'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseMSEModel(MSEModel object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic MSE'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic MSE'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericMSE(GenericMSE object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Step'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Step'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public > T1 caseStep(Step object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Big Step'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Big Step'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public , StateSubType extends State> T1 caseBigStep(BigStep object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Small Step'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Small Step'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public > T1 caseSmallStep(SmallStep object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Sequential Step'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Sequential Step'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public , StateSubType extends State> T1 caseSequentialStep(SequentialStep object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Parallel Step'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Parallel Step'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public , StateSubType extends State> T1 caseParallelStep(ParallelStep object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic Sequential Step'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic Sequential Step'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericSequentialStep(GenericSequentialStep object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic Parallel Step'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic Parallel Step'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericParallelStep(GenericParallelStep object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic Small Step'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic Small Step'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericSmallStep(GenericSmallStep object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Trace'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Trace'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public , TracedObjectSubtype extends TracedObject, StateSubType extends State> T1 caseTrace(Trace object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Traced Object'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Traced Object'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public > T1 caseTracedObject(TracedObject object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Dimension'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Dimension'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public > T1 caseDimension(Dimension object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Value'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Value'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public > T1 caseValue(Value object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'State'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'State'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public , ValueSubType extends Value> T1 caseState(State object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic Reference Value'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic Reference Value'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericReferenceValue(GenericReferenceValue object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic Dimension'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic Dimension'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericDimension(GenericDimension object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic Traced Object'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic Traced Object'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericTracedObject(GenericTracedObject object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic State'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic State'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericState(GenericState object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic Trace'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic Trace'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericTrace(GenericTrace object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic Attribute Value'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic Attribute Value'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericAttributeValue(GenericAttributeValue object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Boolean Attribute Value'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Boolean Attribute Value'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseBooleanAttributeValue(BooleanAttributeValue object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Integer Attributevalue'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Integer Attributevalue'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseIntegerAttributevalue(IntegerAttributevalue object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'String Attribute Value'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'String Attribute Value'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseStringAttributeValue(StringAttributeValue object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Launch Configuration'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Launch Configuration'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseLaunchConfiguration(LaunchConfiguration object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Launch Configuration Parameter'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Launch Configuration Parameter'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseLaunchConfigurationParameter(LaunchConfigurationParameter object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Language Name Parameter'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Language Name Parameter'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseLanguageNameParameter(LanguageNameParameter object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Addon Extension Parameter'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Addon Extension Parameter'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseAddonExtensionParameter(AddonExtensionParameter object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Model URI Parameter'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Model URI Parameter'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseModelURIParameter(ModelURIParameter object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Animator URI Parameter'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Animator URI Parameter'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseAnimatorURIParameter(AnimatorURIParameter object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Entry Point Parameter'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Entry Point Parameter'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseEntryPointParameter(EntryPointParameter object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Initialization Arguments Parameter'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Initialization Arguments Parameter'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseInitializationArgumentsParameter(InitializationArgumentsParameter object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Model Root Parameter'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Model Root Parameter'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseModelRootParameter(ModelRootParameter object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Initialization Method Parameter'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Initialization Method Parameter'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseInitializationMethodParameter(InitializationMethodParameter object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic Step'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic Step'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericStep(GenericStep object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Generic Value'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Generic Value'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseGenericValue(GenericValue object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'EModel Element'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'EModel Element'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseEModelElement(EModelElement object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'ENamed Element'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'ENamed Element'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T1 caseENamedElement(ENamedElement object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'EObject'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last case anyway. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'EObject'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) - * @generated - */ - @Override - public T1 defaultCase(EObject object) { - return null; - } - -} //TraceSwitch diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java index 45f7f343f..b55afd7c9 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java @@ -11,11 +11,12 @@ package fr.inria.diverse.trace.gemoc.api; import java.util.List; + import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.Step; public interface ITraceConstructor { diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java index e421311e7..aed24790d 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java @@ -12,8 +12,8 @@ import java.util.List; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index 4224bd86c..d8f193618 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -319,7 +319,7 @@ String stepRule = fr.inria.diverse.trace.commons.EcoreCraftingUtil.getFQN(ec, ". «ENDFOR» { - step = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createGenericSequentialStep(); + step = fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory.eINSTANCE.createGenericSequentialStep(); } fr.inria.diverse.trace.commons.model.trace.MSEOccurrence mseocc = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEOccurrence(); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index 70f72d0f8..784d3874f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -15,9 +15,11 @@ import com.google.common.collect.HashBiMap import fr.inria.diverse.trace.commons.model.trace.Dimension import fr.inria.diverse.trace.commons.model.trace.State import fr.inria.diverse.trace.commons.model.trace.Step +import fr.inria.diverse.trace.commons.model.trace.Trace import fr.inria.diverse.trace.commons.model.trace.TracedObject import fr.inria.diverse.trace.commons.model.trace.Value import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon +import fr.inria.diverse.trace.gemoc.api.IStateManager import fr.inria.diverse.trace.gemoc.api.ITraceConstructor import fr.inria.diverse.trace.gemoc.api.ITraceExplorer import fr.inria.diverse.trace.gemoc.api.ITraceExtractor @@ -44,8 +46,6 @@ import org.gemoc.xdsmlframework.api.engine_addon.DefaultEngineAddon import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint -import fr.inria.diverse.trace.commons.model.trace.Trace -import fr.inria.diverse.trace.gemoc.api.IStateManager abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDimensionalTraceAddon, State, TracedObject, Dimension, Value> { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index 879d703c9..08ec981c0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index 7cea7fa2d..e42227ab0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -47,9 +47,9 @@ import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java index 2ea3c5f39..c1fb33453 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java @@ -14,14 +14,14 @@ import fr.inria.diverse.trace.commons.model.trace.MSE; import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TraceFactory; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; import fr.inria.diverse.trace.gemoc.api.IStepFactory; public class GenericTraceStepFactory implements IStepFactory { @Override public Step createStep(MSE mse, List parameters, List result) { - return TraceFactory.eINSTANCE.createGenericSequentialStep(); + return GenerictraceFactory.eINSTANCE.createGenericSequentialStep(); } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.project b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.project index e728ad2b1..698f50837 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.project @@ -25,16 +25,10 @@ - - net.sf.eclipsecs.core.CheckstyleBuilder - - - org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature - net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird index 405d283ba..0dd2d5f97 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird @@ -5,6 +5,7 @@ platform:/resource/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore http://www.eclipse.org/emf/2002/Ecore + platform:/resource/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore @@ -41,36 +42,15 @@ - + - + - + - - - - bold - - - - - - - - - - bold - - - - bold - - - @@ -78,36 +58,24 @@ + + + + - + - - - - - - - - - - - - - - - - - + @@ -116,28 +84,16 @@ - + - - - - - - - - - - - - - + @@ -146,7 +102,7 @@ - + @@ -166,7 +122,7 @@ - + @@ -186,7 +142,7 @@ - + @@ -206,7 +162,7 @@ - + @@ -218,7 +174,7 @@ - + @@ -252,7 +208,7 @@ - + @@ -272,7 +228,7 @@ - + @@ -292,7 +248,7 @@ - + @@ -304,7 +260,7 @@ - + @@ -312,7 +268,7 @@ - + @@ -324,7 +280,7 @@ - + @@ -335,7 +291,7 @@ - + @@ -343,20 +299,16 @@ - + - - - - - + @@ -380,7 +332,7 @@ - + @@ -393,22 +345,22 @@ - + - + - + - + - + @@ -446,17 +398,17 @@ - + - + - + - + - + @@ -478,17 +430,17 @@ - + - + - + - + @@ -513,183 +465,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -702,58 +558,26 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -766,20 +590,68 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -792,8 +664,16 @@ + + + + + + + + - + @@ -807,38 +687,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -854,7 +702,7 @@ - + @@ -867,30 +715,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1052,16 +876,12 @@ - + - - - labelSize - - - labelSize - + + + @@ -1084,7 +904,8 @@ - + + routingStyle italic @@ -1119,16 +940,12 @@ - + - - - labelSize - - - labelSize - + + + @@ -1205,13 +1022,13 @@ - + - + @@ -1228,13 +1045,13 @@ - + - + KEEP_LOCATION @@ -1245,7 +1062,7 @@ - + KEEP_LOCATION @@ -1297,14 +1114,6 @@ - - - - - - - - @@ -1353,65 +1162,13 @@ - - - - - - labelSize - - - labelSize - - - - - - - - - - labelSize - - - labelSize - - - - - - - - - - labelSize - - - labelSize - - - - - - - - - - labelSize - - - labelSize - - - - - + - + KEEP_LOCATION @@ -1439,33 +1196,6 @@ - - - - - - labelSize - bold - - - labelSize - - - - - - - - - - labelSize - - - labelSize - - - - @@ -1498,31 +1228,6 @@ - - - - - - - bold - - - bold - - - - - - - - - - - - - - - @@ -1576,6 +1281,40 @@ + + + + + + routingStyle + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore index d2674643f..2c59641dd 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore @@ -36,30 +36,6 @@ - - -
- - - - -
- - - - -
- - - - -
- - - - @@ -79,21 +55,6 @@ - - - -
- - - - -
- - - - @@ -122,11 +83,6 @@ - - -
- - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java index 4b785a762..017854147 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java @@ -6,86 +6,16 @@ import fr.inria.diverse.trace.commons.model.trace.State; -import org.eclipse.emf.common.util.EList; - /** * * A representation of the model object 'Specific State'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link base.States.SpecificState#getStartedStepsRef Started Steps Ref}
    • - *
  • {@link base.States.SpecificState#getEndedStepsRef Ended Steps Ref}
    • - *
* * @see base.States.StatesPackage#getSpecificState() * @model * @generated */ public interface SpecificState extends State { - /** - * Returns the value of the 'Started Steps Ref' reference list. - * The list contents are of type {@link base.Steps.SpecificStep}. - * It is bidirectional and its opposite is '{@link base.Steps.SpecificStep#getStartingStateRef Starting State Ref}'. - * - *

- * If the meaning of the 'Started Steps Ref' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Started Steps Ref' reference list. - * @see base.States.StatesPackage#getSpecificState_StartedStepsRef() - * @see base.Steps.SpecificStep#getStartingStateRef - * @model opposite="startingStateRef" - * @generated - */ - EList getStartedStepsRef(); - - /** - * Returns the value of the 'Ended Steps Ref' reference list. - * The list contents are of type {@link base.Steps.SpecificStep}. - * It is bidirectional and its opposite is '{@link base.Steps.SpecificStep#getEndingStateRef Ending State Ref}'. - * - *

- * If the meaning of the 'Ended Steps Ref' reference list isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Ended Steps Ref' reference list. - * @see base.States.StatesPackage#getSpecificState_EndedStepsRef() - * @see base.Steps.SpecificStep#getEndingStateRef - * @model opposite="endingStateRef" - * @generated - */ - EList getEndedStepsRef(); - - /** - * - * - * @model kind="operation" - * @generated - */ - EList getValues(); - - /** - * - * - * @model kind="operation" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getStartedStepsRef();'" - * @generated - */ - EList getStartedSteps(); - - /** - * - * - * @model kind="operation" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getEndedStepsRef();'" - * @generated - */ - EList getEndedSteps(); } // SpecificState diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java index fd70ffa2b..576b70c5a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java @@ -3,7 +3,6 @@ package base.States; import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import org.eclipse.emf.common.util.EList; /** * @@ -16,12 +15,4 @@ * @generated */ public interface SpecificTracedObject extends TracedObject> { - - /** - * - * - * @model kind="operation" - * @generated - */ - EList> getDimensionsInternal(); } // SpecificTracedObject diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java index d0eb77af8..b15cf3c7d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java @@ -4,8 +4,6 @@ import fr.inria.diverse.trace.commons.model.trace.Value; -import org.eclipse.emf.common.util.EList; - /** * * A representation of the model object 'Specific Value'. @@ -17,13 +15,5 @@ * @generated */ public interface SpecificValue extends Value { - /** - * - * - * @model kind="operation" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList result = new org.eclipse.emf.common.util.BasicEList();\nresult.addAll(getStates());\nreturn result;'" - * @generated - */ - EList getStates(); } // SpecificValue diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java index 2aa287d05..4f5f3ad10 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java @@ -5,9 +5,7 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; /** * @@ -95,24 +93,6 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_STATE__VALUES = TracePackage.STATE__VALUES; - /** - * The feature id for the 'Started Steps Ref' reference list. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STATE__STARTED_STEPS_REF = TracePackage.STATE_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Ended Steps Ref' reference list. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STATE__ENDED_STEPS_REF = TracePackage.STATE_FEATURE_COUNT + 1; - /** * The number of structural features of the 'Specific State' class. * @@ -120,34 +100,7 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STATE_FEATURE_COUNT = TracePackage.STATE_FEATURE_COUNT + 2; - - /** - * The operation id for the 'Get Values' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STATE___GET_VALUES = TracePackage.STATE_OPERATION_COUNT + 0; - - /** - * The operation id for the 'Get Started Steps' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STATE___GET_STARTED_STEPS = TracePackage.STATE_OPERATION_COUNT + 1; - - /** - * The operation id for the 'Get Ended Steps' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STATE___GET_ENDED_STEPS = TracePackage.STATE_OPERATION_COUNT + 2; + int SPECIFIC_STATE_FEATURE_COUNT = TracePackage.STATE_FEATURE_COUNT + 0; /** * The number of operations of the 'Specific State' class. @@ -156,7 +109,7 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 3; + int SPECIFIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 0; /** * The meta object id for the '{@link base.States.impl.SpecificValueImpl Specific Value}' class. @@ -186,15 +139,6 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_VALUE_FEATURE_COUNT = TracePackage.VALUE_FEATURE_COUNT + 0; - /** - * The operation id for the 'Get States' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_VALUE___GET_STATES = TracePackage.VALUE_OPERATION_COUNT + 0; - /** * The number of operations of the 'Specific Value' class. * @@ -202,7 +146,7 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_VALUE_OPERATION_COUNT = TracePackage.VALUE_OPERATION_COUNT + 1; + int SPECIFIC_VALUE_OPERATION_COUNT = TracePackage.VALUE_OPERATION_COUNT + 0; /** * The meta object id for the '{@link base.States.SpecificAttributeValue Specific Attribute Value}' class. @@ -232,15 +176,6 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_ATTRIBUTE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 0; - /** - * The operation id for the 'Get States' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_ATTRIBUTE_VALUE___GET_STATES = SPECIFIC_VALUE___GET_STATES; - /** * The number of operations of the 'Specific Attribute Value' class. * @@ -315,15 +250,6 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_TRACED_OBJECT_FEATURE_COUNT = TracePackage.TRACED_OBJECT_FEATURE_COUNT + 0; - /** - * The operation id for the 'Get Dimensions Internal' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 0; - /** * The number of operations of the 'Specific Traced Object' class. * @@ -331,7 +257,7 @@ public interface StatesPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_TRACED_OBJECT_OPERATION_COUNT = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 1; + int SPECIFIC_TRACED_OBJECT_OPERATION_COUNT = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 0; /** * The meta object id for the '{@link base.States.SpecificReferenceValue Specific Reference Value}' class. @@ -361,15 +287,6 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_REFERENCE_VALUE_FEATURE_COUNT = SPECIFIC_VALUE_FEATURE_COUNT + 0; - /** - * The operation id for the 'Get States' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_REFERENCE_VALUE___GET_STATES = SPECIFIC_VALUE___GET_STATES; - /** * The number of operations of the 'Specific Reference Value' class. * @@ -390,58 +307,6 @@ public interface StatesPackage extends EPackage { */ EClass getSpecificState(); - /** - * Returns the meta object for the reference list '{@link base.States.SpecificState#getStartedStepsRef Started Steps Ref}'. - * - * - * @return the meta object for the reference list 'Started Steps Ref'. - * @see base.States.SpecificState#getStartedStepsRef() - * @see #getSpecificState() - * @generated - */ - EReference getSpecificState_StartedStepsRef(); - - /** - * Returns the meta object for the reference list '{@link base.States.SpecificState#getEndedStepsRef Ended Steps Ref}'. - * - * - * @return the meta object for the reference list 'Ended Steps Ref'. - * @see base.States.SpecificState#getEndedStepsRef() - * @see #getSpecificState() - * @generated - */ - EReference getSpecificState_EndedStepsRef(); - - /** - * Returns the meta object for the '{@link base.States.SpecificState#getValues() Get Values}' operation. - * - * - * @return the meta object for the 'Get Values' operation. - * @see base.States.SpecificState#getValues() - * @generated - */ - EOperation getSpecificState__GetValues(); - - /** - * Returns the meta object for the '{@link base.States.SpecificState#getStartedSteps() Get Started Steps}' operation. - * - * - * @return the meta object for the 'Get Started Steps' operation. - * @see base.States.SpecificState#getStartedSteps() - * @generated - */ - EOperation getSpecificState__GetStartedSteps(); - - /** - * Returns the meta object for the '{@link base.States.SpecificState#getEndedSteps() Get Ended Steps}' operation. - * - * - * @return the meta object for the 'Get Ended Steps' operation. - * @see base.States.SpecificState#getEndedSteps() - * @generated - */ - EOperation getSpecificState__GetEndedSteps(); - /** * Returns the meta object for class '{@link base.States.SpecificAttributeValue Specific Attribute Value}'. * @@ -472,16 +337,6 @@ public interface StatesPackage extends EPackage { */ EClass getSpecificTracedObject(); - /** - * Returns the meta object for the '{@link base.States.SpecificTracedObject#getDimensionsInternal() Get Dimensions Internal}' operation. - * - * - * @return the meta object for the 'Get Dimensions Internal' operation. - * @see base.States.SpecificTracedObject#getDimensionsInternal() - * @generated - */ - EOperation getSpecificTracedObject__GetDimensionsInternal(); - /** * Returns the meta object for class '{@link base.States.SpecificReferenceValue Specific Reference Value}'. * @@ -502,16 +357,6 @@ public interface StatesPackage extends EPackage { */ EClass getSpecificValue(); - /** - * Returns the meta object for the '{@link base.States.SpecificValue#getStates() Get States}' operation. - * - * - * @return the meta object for the 'Get States' operation. - * @see base.States.SpecificValue#getStates() - * @generated - */ - EOperation getSpecificValue__GetStates(); - /** * Returns the factory that creates the instances of the model. * @@ -545,46 +390,6 @@ interface Literals { */ EClass SPECIFIC_STATE = eINSTANCE.getSpecificState(); - /** - * The meta object literal for the 'Started Steps Ref' reference list feature. - * - * - * @generated - */ - EReference SPECIFIC_STATE__STARTED_STEPS_REF = eINSTANCE.getSpecificState_StartedStepsRef(); - - /** - * The meta object literal for the 'Ended Steps Ref' reference list feature. - * - * - * @generated - */ - EReference SPECIFIC_STATE__ENDED_STEPS_REF = eINSTANCE.getSpecificState_EndedStepsRef(); - - /** - * The meta object literal for the 'Get Values' operation. - * - * - * @generated - */ - EOperation SPECIFIC_STATE___GET_VALUES = eINSTANCE.getSpecificState__GetValues(); - - /** - * The meta object literal for the 'Get Started Steps' operation. - * - * - * @generated - */ - EOperation SPECIFIC_STATE___GET_STARTED_STEPS = eINSTANCE.getSpecificState__GetStartedSteps(); - - /** - * The meta object literal for the 'Get Ended Steps' operation. - * - * - * @generated - */ - EOperation SPECIFIC_STATE___GET_ENDED_STEPS = eINSTANCE.getSpecificState__GetEndedSteps(); - /** * The meta object literal for the '{@link base.States.SpecificAttributeValue Specific Attribute Value}' class. * @@ -615,14 +420,6 @@ interface Literals { */ EClass SPECIFIC_TRACED_OBJECT = eINSTANCE.getSpecificTracedObject(); - /** - * The meta object literal for the 'Get Dimensions Internal' operation. - * - * - * @generated - */ - EOperation SPECIFIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = eINSTANCE.getSpecificTracedObject__GetDimensionsInternal(); - /** * The meta object literal for the '{@link base.States.SpecificReferenceValue Specific Reference Value}' class. * @@ -643,14 +440,6 @@ interface Literals { */ EClass SPECIFIC_VALUE = eINSTANCE.getSpecificValue(); - /** - * The meta object literal for the 'Get States' operation. - * - * - * @generated - */ - EOperation SPECIFIC_VALUE___GET_STATES = eINSTANCE.getSpecificValue__GetStates(); - } } //StatesPackage diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java index 08dcbe0b1..e61ba9e8e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java @@ -7,59 +7,23 @@ import base.States.StatesPackage; import base.Steps.SpecificStep; -import base.Steps.StepsPackage; - +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.commons.model.trace.impl.StateImpl; - -import java.lang.reflect.InvocationTargetException; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; /** * * An implementation of the model object 'Specific State'. * - *

- * The following features are implemented: - *

- *
    - *
  • {@link base.States.impl.SpecificStateImpl#getStartedStepsRef Started Steps Ref}
    • - *
  • {@link base.States.impl.SpecificStateImpl#getEndedStepsRef Ended Steps Ref}
    • - *
* * @generated */ public class SpecificStateImpl extends StateImpl implements SpecificState { - /** - * The cached value of the '{@link #getStartedStepsRef() Started Steps Ref}' reference list. - * - * - * @see #getStartedStepsRef() - * @generated - * @ordered - */ - protected EList startedStepsRef; - - /** - * The cached value of the '{@link #getEndedStepsRef() Ended Steps Ref}' reference list. - * - * - * @see #getEndedStepsRef() - * @generated - * @ordered - */ - protected EList endedStepsRef; - /** * * @@ -82,163 +46,43 @@ protected EClass eStaticClass() { /** * * + * This is specialized for the more specific element type known in this context. * @generated */ - public EList getStartedStepsRef() { - if (startedStepsRef == null) { - startedStepsRef = new EObjectWithInverseResolvingEList(SpecificStep.class, this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF); - } - return startedStepsRef; - } - - /** - * - * - * @generated - */ - public EList getEndedStepsRef() { - if (endedStepsRef == null) { - endedStepsRef = new EObjectWithInverseResolvingEList(SpecificStep.class, this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF); - } - return endedStepsRef; - } - - /** - * - * - * @generated - */ - public EList getStartedSteps() { - return getStartedStepsRef(); - } - - /** - * - * - * @generated - */ - public EList getEndedSteps() { - return getEndedStepsRef(); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: - return ((InternalEList)(InternalEList)getStartedStepsRef()).basicAdd(otherEnd, msgs); - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: - return ((InternalEList)(InternalEList)getEndedStepsRef()).basicAdd(otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: - return ((InternalEList)getStartedStepsRef()).basicRemove(otherEnd, msgs); - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: - return ((InternalEList)getEndedStepsRef()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: - return getStartedStepsRef(); - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: - return getEndedStepsRef(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: - getStartedStepsRef().clear(); - getStartedStepsRef().addAll((Collection)newValue); - return; - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: - getEndedStepsRef().clear(); - getEndedStepsRef().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: - getStartedStepsRef().clear(); - return; - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: - getEndedStepsRef().clear(); - return; + public EList getStartedSteps() { + if (startedSteps == null) { + startedSteps = new EObjectWithInverseResolvingEList(SpecificStep.class, this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS, TracePackage.STEP__STARTING_STATE) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return Step.class; } }; } - super.eUnset(featureID); + return startedSteps; } /** * * + * This is specialized for the more specific element type known in this context. * @generated */ @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF: - return startedStepsRef != null && !startedStepsRef.isEmpty(); - case StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF: - return endedStepsRef != null && !endedStepsRef.isEmpty(); + public EList getEndedSteps() { + if (endedSteps == null) { + endedSteps = new EObjectWithInverseResolvingEList(SpecificStep.class, this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS, TracePackage.STEP__ENDING_STATE) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return Step.class; } }; } - return super.eIsSet(featureID); + return endedSteps; } /** * * + * This is specialized for the more specific element type known in this context. * @generated */ @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case StatesPackage.SPECIFIC_STATE___GET_STARTED_STEPS: - return getStartedSteps(); - case StatesPackage.SPECIFIC_STATE___GET_ENDED_STEPS: - return getEndedSteps(); + public EList getValues() { + if (values == null) { + values = new EObjectWithInverseResolvingEList.ManyInverse(SpecificValue.class, this, StatesPackage.SPECIFIC_STATE__VALUES, TracePackage.VALUE__STATES) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return Value.class; } }; } - return super.eInvoke(operationID, arguments); + return values; } } //SpecificStateImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java index 5640f3914..e72a2c488 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java @@ -6,13 +6,13 @@ import base.States.SpecificValue; import base.States.StatesPackage; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl; - -import java.lang.reflect.InvocationTargetException; - import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; /** * @@ -44,26 +44,15 @@ protected EClass eStaticClass() { /** * * - * @generated - */ - public EList getStates() { - final EList result = new org.eclipse.emf.common.util.BasicEList(); - result.addAll(getStates()); - return result; - } - - /** - * - * + * This is specialized for the more specific element type known in this context. * @generated */ @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case StatesPackage.SPECIFIC_VALUE___GET_STATES: - return getStates(); + public EList getStates() { + if (states == null) { + states = new EObjectWithInverseResolvingEList.ManyInverse(SpecificState.class, this, StatesPackage.SPECIFIC_VALUE__STATES, TracePackage.STATE__VALUES) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return State.class; } }; } - return super.eInvoke(operationID, arguments); + return states; } } //SpecificValueImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java index 4c621cf55..49d0065c3 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java @@ -23,9 +23,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; -import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.ETypeParameter; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -160,51 +158,6 @@ public EClass getSpecificState() { return specificStateEClass; } - /** - * - * - * @generated - */ - public EReference getSpecificState_StartedStepsRef() { - return (EReference)specificStateEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getSpecificState_EndedStepsRef() { - return (EReference)specificStateEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EOperation getSpecificState__GetValues() { - return specificStateEClass.getEOperations().get(0); - } - - /** - * - * - * @generated - */ - public EOperation getSpecificState__GetStartedSteps() { - return specificStateEClass.getEOperations().get(1); - } - - /** - * - * - * @generated - */ - public EOperation getSpecificState__GetEndedSteps() { - return specificStateEClass.getEOperations().get(2); - } - /** * * @@ -232,15 +185,6 @@ public EClass getSpecificTracedObject() { return specificTracedObjectEClass; } - /** - * - * - * @generated - */ - public EOperation getSpecificTracedObject__GetDimensionsInternal() { - return specificTracedObjectEClass.getEOperations().get(0); - } - /** * * @@ -259,15 +203,6 @@ public EClass getSpecificValue() { return specificValueEClass; } - /** - * - * - * @generated - */ - public EOperation getSpecificValue__GetStates() { - return specificValueEClass.getEOperations().get(0); - } - /** * * @@ -297,23 +232,16 @@ public void createPackageContents() { // Create classes and their features specificStateEClass = createEClass(SPECIFIC_STATE); - createEReference(specificStateEClass, SPECIFIC_STATE__STARTED_STEPS_REF); - createEReference(specificStateEClass, SPECIFIC_STATE__ENDED_STEPS_REF); - createEOperation(specificStateEClass, SPECIFIC_STATE___GET_VALUES); - createEOperation(specificStateEClass, SPECIFIC_STATE___GET_STARTED_STEPS); - createEOperation(specificStateEClass, SPECIFIC_STATE___GET_ENDED_STEPS); specificAttributeValueEClass = createEClass(SPECIFIC_ATTRIBUTE_VALUE); specificDimensionEClass = createEClass(SPECIFIC_DIMENSION); specificTracedObjectEClass = createEClass(SPECIFIC_TRACED_OBJECT); - createEOperation(specificTracedObjectEClass, SPECIFIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL); specificReferenceValueEClass = createEClass(SPECIFIC_REFERENCE_VALUE); specificValueEClass = createEClass(SPECIFIC_VALUE); - createEOperation(specificValueEClass, SPECIFIC_VALUE___GET_STATES); } /** @@ -378,14 +306,6 @@ public void initializePackageContents() { // Initialize classes, features, and operations; add parameters initEClass(specificStateEClass, SpecificState.class, "SpecificState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSpecificState_StartedStepsRef(), theStepsPackage.getSpecificStep(), theStepsPackage.getSpecificStep_StartingStateRef(), "startedStepsRef", null, 0, -1, SpecificState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSpecificState_EndedStepsRef(), theStepsPackage.getSpecificStep(), theStepsPackage.getSpecificStep_EndingStateRef(), "endedStepsRef", null, 0, -1, SpecificState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEOperation(getSpecificState__GetValues(), this.getSpecificValue(), "getValues", 0, -1, IS_UNIQUE, IS_ORDERED); - - initEOperation(getSpecificState__GetStartedSteps(), theStepsPackage.getSpecificStep(), "getStartedSteps", 0, -1, IS_UNIQUE, IS_ORDERED); - - initEOperation(getSpecificState__GetEndedSteps(), theStepsPackage.getSpecificStep(), "getEndedSteps", 0, -1, IS_UNIQUE, IS_ORDERED); initEClass(specificAttributeValueEClass, SpecificAttributeValue.class, "SpecificAttributeValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -393,17 +313,9 @@ public void initializePackageContents() { initEClass(specificTracedObjectEClass, SpecificTracedObject.class, "SpecificTracedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - EOperation op = initEOperation(getSpecificTracedObject__GetDimensionsInternal(), null, "getDimensionsInternal", 0, -1, IS_UNIQUE, IS_ORDERED); - g1 = createEGenericType(this.getSpecificDimension()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - initEOperation(op, g1); - initEClass(specificReferenceValueEClass, SpecificReferenceValue.class, "SpecificReferenceValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(specificValueEClass, SpecificValue.class, "SpecificValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEOperation(getSpecificValue__GetStates(), this.getSpecificState(), "getStates", 0, -1, IS_UNIQUE, IS_ORDERED); } } //StatesPackageImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java index ecae39cb3..f8582f460 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java @@ -11,109 +11,11 @@ * A representation of the model object 'Specific Step'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link base.Steps.SpecificStep#getStartingStateRef Starting State Ref}
    • - *
  • {@link base.Steps.SpecificStep#getEndingStateRef Ending State Ref}
    • - *
* * @see base.Steps.StepsPackage#getSpecificStep() * @model abstract="true" * @generated */ public interface SpecificStep extends Step { - /** - * Returns the value of the 'Starting State Ref' reference. - * It is bidirectional and its opposite is '{@link base.States.SpecificState#getStartedStepsRef Started Steps Ref}'. - * - *

- * If the meaning of the 'Starting State Ref' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Starting State Ref' reference. - * @see #setStartingStateRef(SpecificState) - * @see base.Steps.StepsPackage#getSpecificStep_StartingStateRef() - * @see base.States.SpecificState#getStartedStepsRef - * @model opposite="startedStepsRef" required="true" - * @generated - */ - SpecificState getStartingStateRef(); - - /** - * Sets the value of the '{@link base.Steps.SpecificStep#getStartingStateRef Starting State Ref}' reference. - * - * - * @param value the new value of the 'Starting State Ref' reference. - * @see #getStartingStateRef() - * @generated - */ - void setStartingStateRef(SpecificState value); - - /** - * Returns the value of the 'Ending State Ref' reference. - * It is bidirectional and its opposite is '{@link base.States.SpecificState#getEndedStepsRef Ended Steps Ref}'. - * - *

- * If the meaning of the 'Ending State Ref' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Ending State Ref' reference. - * @see #setEndingStateRef(SpecificState) - * @see base.Steps.StepsPackage#getSpecificStep_EndingStateRef() - * @see base.States.SpecificState#getEndedStepsRef - * @model opposite="endedStepsRef" - * @generated - */ - SpecificState getEndingStateRef(); - - /** - * Sets the value of the '{@link base.Steps.SpecificStep#getEndingStateRef Ending State Ref}' reference. - * - * - * @param value the new value of the 'Ending State Ref' reference. - * @see #getEndingStateRef() - * @generated - */ - void setEndingStateRef(SpecificState value); - - /** - * - * - * @model kind="operation" required="true" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getStartingStateRef();'" - * @generated - */ - SpecificState getStartingState(); - - /** - * - * - * @model kind="operation" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return getEndingStateRef();'" - * @generated - */ - SpecificState getEndingState(); - - /** - * - * - * @model required="true" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return basicGetStartingStateRef();'" - * @generated - */ - SpecificState basicGetStartingState(); - - /** - * - * - * @model required="true" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='return basicGetEndingStateRef();'" - * @generated - */ - SpecificState basicGetEndingState(); } // SpecificStep diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java index 9451cab87..3aac3aa49 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java @@ -5,9 +5,7 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; /** * @@ -95,24 +93,6 @@ public interface StepsPackage extends EPackage { */ int SPECIFIC_STEP__ENDING_STATE = TracePackage.STEP__ENDING_STATE; - /** - * The feature id for the 'Starting State Ref' reference. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STEP__STARTING_STATE_REF = TracePackage.STEP_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Ending State Ref' reference. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STEP__ENDING_STATE_REF = TracePackage.STEP_FEATURE_COUNT + 1; - /** * The number of structural features of the 'Specific Step' class. * @@ -120,43 +100,7 @@ public interface StepsPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STEP_FEATURE_COUNT = TracePackage.STEP_FEATURE_COUNT + 2; - - /** - * The operation id for the 'Get Starting State' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STEP___GET_STARTING_STATE = TracePackage.STEP_OPERATION_COUNT + 0; - - /** - * The operation id for the 'Get Ending State' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STEP___GET_ENDING_STATE = TracePackage.STEP_OPERATION_COUNT + 1; - - /** - * The operation id for the 'Basic Get Starting State' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STEP___BASIC_GET_STARTING_STATE = TracePackage.STEP_OPERATION_COUNT + 2; - - /** - * The operation id for the 'Basic Get Ending State' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_STEP___BASIC_GET_ENDING_STATE = TracePackage.STEP_OPERATION_COUNT + 3; + int SPECIFIC_STEP_FEATURE_COUNT = TracePackage.STEP_FEATURE_COUNT + 0; /** * The number of operations of the 'Specific Step' class. @@ -165,7 +109,7 @@ public interface StepsPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_STEP_OPERATION_COUNT = TracePackage.STEP_OPERATION_COUNT + 4; + int SPECIFIC_STEP_OPERATION_COUNT = TracePackage.STEP_OPERATION_COUNT + 0; /** * The meta object id for the '{@link base.Steps.impl.RootImplicitStepImpl Root Implicit Step}' class. @@ -268,24 +212,6 @@ public interface StepsPackage extends EPackage { */ int SPECIFIC_ROOT_STEP__SUB_STEPS = TracePackage.SEQUENTIAL_STEP__SUB_STEPS; - /** - * The feature id for the 'Starting State Ref' reference. - * - * - * @generated - * @ordered - */ - int SPECIFIC_ROOT_STEP__STARTING_STATE_REF = TracePackage.SEQUENTIAL_STEP_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Ending State Ref' reference. - * - * - * @generated - * @ordered - */ - int SPECIFIC_ROOT_STEP__ENDING_STATE_REF = TracePackage.SEQUENTIAL_STEP_FEATURE_COUNT + 1; - /** * The number of structural features of the 'Specific Root Step' class. * @@ -293,43 +219,7 @@ public interface StepsPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_ROOT_STEP_FEATURE_COUNT = TracePackage.SEQUENTIAL_STEP_FEATURE_COUNT + 2; - - /** - * The operation id for the 'Get Starting State' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_ROOT_STEP___GET_STARTING_STATE = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 0; - - /** - * The operation id for the 'Get Ending State' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_ROOT_STEP___GET_ENDING_STATE = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 1; - - /** - * The operation id for the 'Basic Get Starting State' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_ROOT_STEP___BASIC_GET_STARTING_STATE = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 2; - - /** - * The operation id for the 'Basic Get Ending State' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_ROOT_STEP___BASIC_GET_ENDING_STATE = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 3; + int SPECIFIC_ROOT_STEP_FEATURE_COUNT = TracePackage.SEQUENTIAL_STEP_FEATURE_COUNT + 0; /** * The number of operations of the 'Specific Root Step' class. @@ -338,7 +228,7 @@ public interface StepsPackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_ROOT_STEP_OPERATION_COUNT = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 4; + int SPECIFIC_ROOT_STEP_OPERATION_COUNT = TracePackage.SEQUENTIAL_STEP_OPERATION_COUNT + 0; /** @@ -351,68 +241,6 @@ public interface StepsPackage extends EPackage { */ EClass getSpecificStep(); - /** - * Returns the meta object for the reference '{@link base.Steps.SpecificStep#getStartingStateRef Starting State Ref}'. - * - * - * @return the meta object for the reference 'Starting State Ref'. - * @see base.Steps.SpecificStep#getStartingStateRef() - * @see #getSpecificStep() - * @generated - */ - EReference getSpecificStep_StartingStateRef(); - - /** - * Returns the meta object for the reference '{@link base.Steps.SpecificStep#getEndingStateRef Ending State Ref}'. - * - * - * @return the meta object for the reference 'Ending State Ref'. - * @see base.Steps.SpecificStep#getEndingStateRef() - * @see #getSpecificStep() - * @generated - */ - EReference getSpecificStep_EndingStateRef(); - - /** - * Returns the meta object for the '{@link base.Steps.SpecificStep#getStartingState() Get Starting State}' operation. - * - * - * @return the meta object for the 'Get Starting State' operation. - * @see base.Steps.SpecificStep#getStartingState() - * @generated - */ - EOperation getSpecificStep__GetStartingState(); - - /** - * Returns the meta object for the '{@link base.Steps.SpecificStep#getEndingState() Get Ending State}' operation. - * - * - * @return the meta object for the 'Get Ending State' operation. - * @see base.Steps.SpecificStep#getEndingState() - * @generated - */ - EOperation getSpecificStep__GetEndingState(); - - /** - * Returns the meta object for the '{@link base.Steps.SpecificStep#basicGetStartingState() Basic Get Starting State}' operation. - * - * - * @return the meta object for the 'Basic Get Starting State' operation. - * @see base.Steps.SpecificStep#basicGetStartingState() - * @generated - */ - EOperation getSpecificStep__BasicGetStartingState(); - - /** - * Returns the meta object for the '{@link base.Steps.SpecificStep#basicGetEndingState() Basic Get Ending State}' operation. - * - * - * @return the meta object for the 'Basic Get Ending State' operation. - * @see base.Steps.SpecificStep#basicGetEndingState() - * @generated - */ - EOperation getSpecificStep__BasicGetEndingState(); - /** * Returns the meta object for class '{@link base.Steps.RootImplicitStep Root Implicit Step}'. * @@ -466,54 +294,6 @@ interface Literals { */ EClass SPECIFIC_STEP = eINSTANCE.getSpecificStep(); - /** - * The meta object literal for the 'Starting State Ref' reference feature. - * - * - * @generated - */ - EReference SPECIFIC_STEP__STARTING_STATE_REF = eINSTANCE.getSpecificStep_StartingStateRef(); - - /** - * The meta object literal for the 'Ending State Ref' reference feature. - * - * - * @generated - */ - EReference SPECIFIC_STEP__ENDING_STATE_REF = eINSTANCE.getSpecificStep_EndingStateRef(); - - /** - * The meta object literal for the 'Get Starting State' operation. - * - * - * @generated - */ - EOperation SPECIFIC_STEP___GET_STARTING_STATE = eINSTANCE.getSpecificStep__GetStartingState(); - - /** - * The meta object literal for the 'Get Ending State' operation. - * - * - * @generated - */ - EOperation SPECIFIC_STEP___GET_ENDING_STATE = eINSTANCE.getSpecificStep__GetEndingState(); - - /** - * The meta object literal for the 'Basic Get Starting State' operation. - * - * - * @generated - */ - EOperation SPECIFIC_STEP___BASIC_GET_STARTING_STATE = eINSTANCE.getSpecificStep__BasicGetStartingState(); - - /** - * The meta object literal for the 'Basic Get Ending State' operation. - * - * - * @generated - */ - EOperation SPECIFIC_STEP___BASIC_GET_ENDING_STATE = eINSTANCE.getSpecificStep__BasicGetEndingState(); - /** * The meta object literal for the '{@link base.Steps.impl.RootImplicitStepImpl Root Implicit Step}' class. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java index 2f0c1f3eb..4782eab54 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java @@ -3,61 +3,21 @@ package base.Steps.impl; import base.States.SpecificState; -import base.States.StatesPackage; - import base.Steps.SpecificRootStep; import base.Steps.SpecificStep; import base.Steps.StepsPackage; import fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; /** * * An implementation of the model object 'Specific Root Step'. * - *

- * The following features are implemented: - *

- *
    - *
  • {@link base.Steps.impl.SpecificRootStepImpl#getStartingStateRef Starting State Ref}
    • - *
  • {@link base.Steps.impl.SpecificRootStepImpl#getEndingStateRef Ending State Ref}
    • - *
* * @generated */ public class SpecificRootStepImpl extends SequentialStepImpl implements SpecificRootStep { - /** - * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. - * - * - * @see #getStartingStateRef() - * @generated - * @ordered - */ - protected SpecificState startingStateRef; - - /** - * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. - * - * - * @see #getEndingStateRef() - * @generated - * @ordered - */ - protected SpecificState endingStateRef; - /** * * @@ -77,339 +37,4 @@ protected EClass eStaticClass() { return StepsPackage.Literals.SPECIFIC_ROOT_STEP; } - /** - * - * - * @generated - */ - public SpecificState getStartingStateRef() { - if (startingStateRef != null && startingStateRef.eIsProxy()) { - InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; - startingStateRef = (SpecificState)eResolveProxy(oldStartingStateRef); - if (startingStateRef != oldStartingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); - } - } - return startingStateRef; - } - - /** - * - * - * @generated - */ - public SpecificState basicGetStartingStateRef() { - return startingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetStartingStateRef(SpecificState newStartingStateRef, NotificationChain msgs) { - SpecificState oldStartingStateRef = startingStateRef; - startingStateRef = newStartingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setStartingStateRef(SpecificState newStartingStateRef) { - if (newStartingStateRef != startingStateRef) { - NotificationChain msgs = null; - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); - if (newStartingStateRef != null) - msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); - msgs = basicSetStartingStateRef(newStartingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); - } - - /** - * - * - * @generated - */ - public SpecificState getEndingStateRef() { - if (endingStateRef != null && endingStateRef.eIsProxy()) { - InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; - endingStateRef = (SpecificState)eResolveProxy(oldEndingStateRef); - if (endingStateRef != oldEndingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); - } - } - return endingStateRef; - } - - /** - * - * - * @generated - */ - public SpecificState basicGetEndingStateRef() { - return endingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetEndingStateRef(SpecificState newEndingStateRef, NotificationChain msgs) { - SpecificState oldEndingStateRef = endingStateRef; - endingStateRef = newEndingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setEndingStateRef(SpecificState newEndingStateRef) { - if (newEndingStateRef != endingStateRef) { - NotificationChain msgs = null; - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); - if (newEndingStateRef != null) - msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); - msgs = basicSetEndingStateRef(newEndingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); - } - - /** - * - * - * @generated - */ - public SpecificState getStartingState() { - return getStartingStateRef(); - } - - /** - * - * - * @generated - */ - public SpecificState getEndingState() { - return getEndingStateRef(); - } - - /** - * - * - * @generated - */ - public SpecificState basicGetStartingState() { - return basicGetStartingStateRef(); - } - - /** - * - * - * @generated - */ - public SpecificState basicGetEndingState() { - return basicGetEndingStateRef(); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); - return basicSetStartingStateRef((SpecificState)otherEnd, msgs); - case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); - return basicSetEndingStateRef((SpecificState)otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: - return basicSetStartingStateRef(null, msgs); - case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: - return basicSetEndingStateRef(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: - if (resolve) return getStartingStateRef(); - return basicGetStartingStateRef(); - case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: - if (resolve) return getEndingStateRef(); - return basicGetEndingStateRef(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: - setStartingStateRef((SpecificState)newValue); - return; - case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: - setEndingStateRef((SpecificState)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: - setStartingStateRef((SpecificState)null); - return; - case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: - setEndingStateRef((SpecificState)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: - return startingStateRef != null; - case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: - return endingStateRef != null; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { - if (baseClass == SpecificStep.class) { - switch (derivedFeatureID) { - case StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF: return StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF; - case StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF: return StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF; - default: return -1; - } - } - return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); - } - - /** - * - * - * @generated - */ - @Override - public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { - if (baseClass == SpecificStep.class) { - switch (baseFeatureID) { - case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: return StepsPackage.SPECIFIC_ROOT_STEP__STARTING_STATE_REF; - case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: return StepsPackage.SPECIFIC_ROOT_STEP__ENDING_STATE_REF; - default: return -1; - } - } - return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); - } - - /** - * - * - * @generated - */ - @Override - public int eDerivedOperationID(int baseOperationID, Class baseClass) { - if (baseClass == SpecificStep.class) { - switch (baseOperationID) { - case StepsPackage.SPECIFIC_STEP___GET_STARTING_STATE: return StepsPackage.SPECIFIC_ROOT_STEP___GET_STARTING_STATE; - case StepsPackage.SPECIFIC_STEP___GET_ENDING_STATE: return StepsPackage.SPECIFIC_ROOT_STEP___GET_ENDING_STATE; - case StepsPackage.SPECIFIC_STEP___BASIC_GET_STARTING_STATE: return StepsPackage.SPECIFIC_ROOT_STEP___BASIC_GET_STARTING_STATE; - case StepsPackage.SPECIFIC_STEP___BASIC_GET_ENDING_STATE: return StepsPackage.SPECIFIC_ROOT_STEP___BASIC_GET_ENDING_STATE; - default: return -1; - } - } - return super.eDerivedOperationID(baseOperationID, baseClass); - } - - /** - * - * - * @generated - */ - @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case StepsPackage.SPECIFIC_ROOT_STEP___GET_STARTING_STATE: - return getStartingState(); - case StepsPackage.SPECIFIC_ROOT_STEP___GET_ENDING_STATE: - return getEndingState(); - case StepsPackage.SPECIFIC_ROOT_STEP___BASIC_GET_STARTING_STATE: - return basicGetStartingState(); - case StepsPackage.SPECIFIC_ROOT_STEP___BASIC_GET_ENDING_STATE: - return basicGetEndingState(); - } - return super.eInvoke(operationID, arguments); - } - } //SpecificRootStepImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java index 2d2647bcd..2a18b8ab3 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java @@ -3,60 +3,21 @@ package base.Steps.impl; import base.States.SpecificState; -import base.States.StatesPackage; - import base.Steps.SpecificStep; import base.Steps.StepsPackage; import fr.inria.diverse.trace.commons.model.trace.impl.StepImpl; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; /** * * An implementation of the model object 'Specific Step'. * - *

- * The following features are implemented: - *

- *
    - *
  • {@link base.Steps.impl.SpecificStepImpl#getStartingStateRef Starting State Ref}
    • - *
  • {@link base.Steps.impl.SpecificStepImpl#getEndingStateRef Ending State Ref}
    • - *
* * @generated */ public abstract class SpecificStepImpl extends StepImpl implements SpecificStep { - /** - * The cached value of the '{@link #getStartingStateRef() Starting State Ref}' reference. - * - * - * @see #getStartingStateRef() - * @generated - * @ordered - */ - protected SpecificState startingStateRef; - - /** - * The cached value of the '{@link #getEndingStateRef() Ending State Ref}' reference. - * - * - * @see #getEndingStateRef() - * @generated - * @ordered - */ - protected SpecificState endingStateRef; - /** * * @@ -83,8 +44,8 @@ protected EClass eStaticClass() { * @generated */ @Override - public void setStartingState(SpecificState newStartingState) { - super.setStartingState(newStartingState); + public NotificationChain basicSetStartingState(SpecificState newStartingState, NotificationChain msgs) { + return super.basicSetStartingState(newStartingState, msgs); } /** @@ -94,290 +55,8 @@ public void setStartingState(SpecificState newStartingState) { * @generated */ @Override - public void setEndingState(SpecificState newEndingState) { - super.setEndingState(newEndingState); - } - - /** - * - * - * @generated - */ - public SpecificState getStartingStateRef() { - if (startingStateRef != null && startingStateRef.eIsProxy()) { - InternalEObject oldStartingStateRef = (InternalEObject)startingStateRef; - startingStateRef = (SpecificState)eResolveProxy(oldStartingStateRef); - if (startingStateRef != oldStartingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF, oldStartingStateRef, startingStateRef)); - } - } - return startingStateRef; - } - - /** - * - * - * @generated - */ - public SpecificState basicGetStartingStateRef() { - return startingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetStartingStateRef(SpecificState newStartingStateRef, NotificationChain msgs) { - SpecificState oldStartingStateRef = startingStateRef; - startingStateRef = newStartingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF, oldStartingStateRef, newStartingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setStartingStateRef(SpecificState newStartingStateRef) { - if (newStartingStateRef != startingStateRef) { - NotificationChain msgs = null; - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); - if (newStartingStateRef != null) - msgs = ((InternalEObject)newStartingStateRef).eInverseAdd(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); - msgs = basicSetStartingStateRef(newStartingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF, newStartingStateRef, newStartingStateRef)); - } - - /** - * - * - * @generated - */ - public SpecificState getEndingStateRef() { - if (endingStateRef != null && endingStateRef.eIsProxy()) { - InternalEObject oldEndingStateRef = (InternalEObject)endingStateRef; - endingStateRef = (SpecificState)eResolveProxy(oldEndingStateRef); - if (endingStateRef != oldEndingStateRef) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF, oldEndingStateRef, endingStateRef)); - } - } - return endingStateRef; - } - - /** - * - * - * @generated - */ - public SpecificState basicGetEndingStateRef() { - return endingStateRef; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetEndingStateRef(SpecificState newEndingStateRef, NotificationChain msgs) { - SpecificState oldEndingStateRef = endingStateRef; - endingStateRef = newEndingStateRef; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF, oldEndingStateRef, newEndingStateRef); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setEndingStateRef(SpecificState newEndingStateRef) { - if (newEndingStateRef != endingStateRef) { - NotificationChain msgs = null; - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); - if (newEndingStateRef != null) - msgs = ((InternalEObject)newEndingStateRef).eInverseAdd(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); - msgs = basicSetEndingStateRef(newEndingStateRef, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF, newEndingStateRef, newEndingStateRef)); - } - - /** - * - * - * @generated - */ - public SpecificState getStartingState() { - return getStartingStateRef(); - } - - /** - * - * - * @generated - */ - public SpecificState getEndingState() { - return getEndingStateRef(); - } - - /** - * - * - * @generated - */ - public SpecificState basicGetStartingState() { - return basicGetStartingStateRef(); - } - - /** - * - * - * @generated - */ - public SpecificState basicGetEndingState() { - return basicGetEndingStateRef(); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: - if (startingStateRef != null) - msgs = ((InternalEObject)startingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__STARTED_STEPS_REF, SpecificState.class, msgs); - return basicSetStartingStateRef((SpecificState)otherEnd, msgs); - case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: - if (endingStateRef != null) - msgs = ((InternalEObject)endingStateRef).eInverseRemove(this, StatesPackage.SPECIFIC_STATE__ENDED_STEPS_REF, SpecificState.class, msgs); - return basicSetEndingStateRef((SpecificState)otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: - return basicSetStartingStateRef(null, msgs); - case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: - return basicSetEndingStateRef(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: - if (resolve) return getStartingStateRef(); - return basicGetStartingStateRef(); - case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: - if (resolve) return getEndingStateRef(); - return basicGetEndingStateRef(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: - setStartingStateRef((SpecificState)newValue); - return; - case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: - setEndingStateRef((SpecificState)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: - setStartingStateRef((SpecificState)null); - return; - case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: - setEndingStateRef((SpecificState)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case StepsPackage.SPECIFIC_STEP__STARTING_STATE_REF: - return startingStateRef != null; - case StepsPackage.SPECIFIC_STEP__ENDING_STATE_REF: - return endingStateRef != null; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { - switch (operationID) { - case StepsPackage.SPECIFIC_STEP___GET_STARTING_STATE: - return getStartingState(); - case StepsPackage.SPECIFIC_STEP___GET_ENDING_STATE: - return getEndingState(); - case StepsPackage.SPECIFIC_STEP___BASIC_GET_STARTING_STATE: - return basicGetStartingState(); - case StepsPackage.SPECIFIC_STEP___BASIC_GET_ENDING_STATE: - return basicGetEndingState(); - } - return super.eInvoke(operationID, arguments); + public NotificationChain basicSetEndingState(SpecificState newEndingState, NotificationChain msgs) { + return super.basicSetEndingState(newEndingState, msgs); } } //SpecificStepImpl diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java index 61bc32d71..d5ad8a763 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java @@ -20,10 +20,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; -import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - import org.eclipse.emf.ecore.impl.EPackageImpl; /** @@ -135,60 +132,6 @@ public EClass getSpecificStep() { return specificStepEClass; } - /** - * - * - * @generated - */ - public EReference getSpecificStep_StartingStateRef() { - return (EReference)specificStepEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getSpecificStep_EndingStateRef() { - return (EReference)specificStepEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EOperation getSpecificStep__GetStartingState() { - return specificStepEClass.getEOperations().get(0); - } - - /** - * - * - * @generated - */ - public EOperation getSpecificStep__GetEndingState() { - return specificStepEClass.getEOperations().get(1); - } - - /** - * - * - * @generated - */ - public EOperation getSpecificStep__BasicGetStartingState() { - return specificStepEClass.getEOperations().get(2); - } - - /** - * - * - * @generated - */ - public EOperation getSpecificStep__BasicGetEndingState() { - return specificStepEClass.getEOperations().get(3); - } - /** * * @@ -236,12 +179,6 @@ public void createPackageContents() { // Create classes and their features specificStepEClass = createEClass(SPECIFIC_STEP); - createEReference(specificStepEClass, SPECIFIC_STEP__STARTING_STATE_REF); - createEReference(specificStepEClass, SPECIFIC_STEP__ENDING_STATE_REF); - createEOperation(specificStepEClass, SPECIFIC_STEP___GET_STARTING_STATE); - createEOperation(specificStepEClass, SPECIFIC_STEP___GET_ENDING_STATE); - createEOperation(specificStepEClass, SPECIFIC_STEP___BASIC_GET_STARTING_STATE); - createEOperation(specificStepEClass, SPECIFIC_STEP___BASIC_GET_ENDING_STATE); rootImplicitStepEClass = createEClass(ROOT_IMPLICIT_STEP); @@ -299,16 +236,6 @@ public void initializePackageContents() { // Initialize classes, features, and operations; add parameters initEClass(specificStepEClass, SpecificStep.class, "SpecificStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSpecificStep_StartingStateRef(), theStatesPackage.getSpecificState(), theStatesPackage.getSpecificState_StartedStepsRef(), "startingStateRef", null, 1, 1, SpecificStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSpecificStep_EndingStateRef(), theStatesPackage.getSpecificState(), theStatesPackage.getSpecificState_EndedStepsRef(), "endingStateRef", null, 0, 1, SpecificStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEOperation(getSpecificStep__GetStartingState(), theStatesPackage.getSpecificState(), "getStartingState", 1, 1, IS_UNIQUE, IS_ORDERED); - - initEOperation(getSpecificStep__GetEndingState(), theStatesPackage.getSpecificState(), "getEndingState", 0, 1, IS_UNIQUE, IS_ORDERED); - - initEOperation(getSpecificStep__BasicGetStartingState(), theStatesPackage.getSpecificState(), "basicGetStartingState", 1, 1, IS_UNIQUE, IS_ORDERED); - - initEOperation(getSpecificStep__BasicGetEndingState(), theStatesPackage.getSpecificState(), "basicGetEndingState", 1, 1, IS_UNIQUE, IS_ORDERED); initEClass(rootImplicitStepEClass, RootImplicitStep.class, "RootImplicitStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index b5dc421e5..610840886 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -52,7 +52,6 @@ class TraceMMGeneratorStates { private val Map runtimeClass2ClassExtension = new HashMap private val Set multipleOrig = new HashSet private val List tracedClassGetters = new ArrayList - private val List valuesGetters = new ArrayList new(Ecorext mmext, EPackage mm, TraceMMGenerationTraceability traceability, TraceMMExplorer traceMMExplorer, String languageName, EPackage tracemmresult, boolean gemoc) { @@ -203,34 +202,6 @@ class TraceMMGeneratorStates { val tracedClass = handleTraceClass(runtimeClass) tracedClasses.add(tracedClass) } - - if (!tracedClassGetters.empty) { - val getTracedObjectsEOperation = traceMMExplorer.specificTraceClass.EOperations.findFirst[name == "getTracedObjects"] - val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation - getTracedObjectsEOperation.EAnnotations.add(bodyAnnotation) - bodyAnnotation.source = GenModelPackage.eNS_URI - bodyAnnotation.details.put("body", ''' - final EList>> result = new org.eclipse.emf.common.util.BasicEList<>(); - «FOR getter : tracedClassGetters» - result.addAll(«getter»); - «ENDFOR» - return result; - ''') - } - - if (!valuesGetters.empty) { - val getValuesEOperation = traceMMExplorer.specificStateClass.EOperations.findFirst[name == "getValues"] - val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation - getValuesEOperation.EAnnotations.add(bodyAnnotation) - bodyAnnotation.source = GenModelPackage.eNS_URI - bodyAnnotation.details.put("body", ''' - final EList result = new org.eclipse.emf.common.util.BasicEList<>(); - «FOR getter : valuesGetters» - result.addAll(«getter»); - «ENDFOR» - return result; - ''') - } } private def EClass handleTraceClass(EClass runtimeClass) { @@ -301,17 +272,17 @@ class TraceMMGeneratorStates { traceability.addRefs_originalObject(tracedClass, ref) } - // Link Trace class -> Traced class - if (!tracedClass.abstract) { - val refName = TraceMMStrings.ref_createTraceClassToTracedClass(tracedClass) - val refTraceClassToTracedClass = addReferenceToClass(traceMMExplorer.specificTraceClass, refName, tracedClass) - tracedClassGetters.add(EcoreCraftingUtil.stringGetter(refName)) - refTraceClassToTracedClass.containment = true - refTraceClassToTracedClass.ordered = false - refTraceClassToTracedClass.unique = true - refTraceClassToTracedClass.upperBound = -1 - refTraceClassToTracedClass.lowerBound = 0 - } +// // Link Trace class -> Traced class +// if (!tracedClass.abstract) { +// val refName = TraceMMStrings.ref_createTraceClassToTracedClass(tracedClass) +// val refTraceClassToTracedClass = addReferenceToClass(traceMMExplorer.specificTraceClass, refName, tracedClass) +// tracedClassGetters.add(EcoreCraftingUtil.stringGetter(refName)) +// refTraceClassToTracedClass.containment = true +// refTraceClassToTracedClass.ordered = false +// refTraceClassToTracedClass.unique = true +// refTraceClassToTracedClass.upperBound = -1 +// refTraceClassToTracedClass.lowerBound = 0 +// } // Then going through all properties for the remaining generation var Set runtimeProperties = new HashSet @@ -400,47 +371,25 @@ class TraceMMGeneratorStates { traceability.putValueClass(runtimeProperty, valueClass) - // Link State -> Value class - val refState2Value = addReferenceToClass(traceMMExplorer.specificStateClass, - TraceMMStrings.ref_createGlobalToState(valueClass), valueClass) - refState2Value.ordered = false - refState2Value.unique = true - refState2Value.upperBound = -1 - refState2Value.lowerBound = 0 - valuesGetters.add(EcoreCraftingUtil.stringGetter(refState2Value)) - - traceability.putStateClassToValueClass(runtimeProperty, refState2Value) - - // Link Value class -> State (bidirectional) - val refState2Global = addReferenceToClass(valueClass, TraceMMStrings.ref_ValueToStates, - traceMMExplorer.specificStateClass) - refState2Global.upperBound = -1 - refState2Global.lowerBound = 1 - refState2Global.EOpposite = refState2Value - refState2Value.EOpposite = refState2Global +// // Link State -> Value class +// val refState2Value = addReferenceToClass(traceMMExplorer.specificStateClass, +// TraceMMStrings.ref_createGlobalToState(valueClass), valueClass) +// refState2Value.ordered = false +// refState2Value.unique = true +// refState2Value.upperBound = -1 +// refState2Value.lowerBound = 0 +// valuesGetters.add(EcoreCraftingUtil.stringGetter(refState2Value)) +// +// traceability.putStateClassToValueClass(runtimeProperty, refState2Value) +// +// // Link Value class -> State (bidirectional) +// val refState2Global = addReferenceToClass(valueClass, TraceMMStrings.ref_ValueToStates, +// traceMMExplorer.specificStateClass) +// refState2Global.upperBound = -1 +// refState2Global.lowerBound = 1 +// refState2Global.EOpposite = refState2Value +// refState2Value.EOpposite = refState2Global } - - val getDimensionsEOperation = EcoreFactory.eINSTANCE.createEOperation - val genericType = EcoreFactory.eINSTANCE.createEGenericType - genericType.EClassifier = traceMMExplorer.specificDimensionClass - val typeBinding = EcoreFactory.eINSTANCE.createEGenericType - genericType.ETypeArguments.add(typeBinding) - getDimensionsEOperation.EGenericType = genericType - getDimensionsEOperation.lowerBound = 0 - getDimensionsEOperation.upperBound = -1 - getDimensionsEOperation.name = "getDimensionsInternal" - val bodyAnnotation = EcoreFactory.eINSTANCE.createEAnnotation - getDimensionsEOperation.EAnnotations.add(bodyAnnotation) - bodyAnnotation.source = GenModelPackage.eNS_URI - bodyAnnotation.details.put("body", ''' - final EList> result = new org.eclipse.emf.ecore.util.BasicInternalEList<>(); - «FOR getter : dimensionsGetters» - result.add(«getter»); - «ENDFOR» - return result; - ''') - tracedClass.EOperations.add(getDimensionsEOperation) - return tracedClass } else { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend index 8ae22812f..158571072 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend @@ -10,20 +10,19 @@ *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.codegen +import ecorext.ClassExtension import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability +import java.util.Collection import java.util.HashSet import java.util.Set import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EClassifier +import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature -import fr.inria.diverse.trace.metamodel.generator.TraceMMStrings -import ecorext.ClassExtension -import java.util.Collection -import org.eclipse.emf.ecore.EPackage class StateManagerGeneratorJava { @@ -36,6 +35,7 @@ class StateManagerGeneratorJava { // Shortcuts private val String stateFQN + private val String valueFQN private boolean getTracedToExeUsed = false @@ -51,6 +51,7 @@ class StateManagerGeneratorJava { this.refGenPackages = refGenPackages stateFQN = getJavaFQN(traceability.traceMMExplorer.getSpecificStateClass) + valueFQN = getJavaFQN(traceability.traceMMExplorer.specificValueClass) } private def String getFQN(EStructuralFeature eFeature) { @@ -74,7 +75,7 @@ class StateManagerGeneratorJava { } } - private def String stringGetterExeValue(String javaVarName, EStructuralFeature p) { + private def String stringGetterExeValue(String javaVarName, EStructuralFeature p, EClass typeToCastTo) { return ''' «IF (p instanceof EReference && traceability.hasTracedClass(p.EType as EClass))» @@ -84,9 +85,9 @@ class StateManagerGeneratorJava { «ELSE» («getJavaFQN(p.EType, true)») «ENDIF» - «getTracedToExeMethodName»(«javaVarName».«EcoreCraftingUtil.stringGetter(p)») + «getTracedToExeMethodName»(((«getJavaFQN(typeToCastTo)») «javaVarName»).«EcoreCraftingUtil.stringGetter(p)») «ELSE» - «javaVarName».«EcoreCraftingUtil.stringGetter(p)» + ((«getJavaFQN(typeToCastTo)») «javaVarName»).«EcoreCraftingUtil.stringGetter(p)» «ENDIF»''' } @@ -179,17 +180,40 @@ class StateManagerGeneratorJava { @SuppressWarnings("unchecked") private void restoreStateExecute(«stateFQN» state) { - «FOR p : traceability.allMutableProperties.sortBy[FQN]» - «val EReference pdimension = traceability.getDimensionRef(p)» - «val EClass stateClass = traceability.getValueClass(p)» - for («getJavaFQN(stateClass)» value : state.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createGlobalToState(stateClass))») { + for («valueFQN» value : state.getValues()) { final EObject parent = value.eContainer().eContainer(); - ««« Case in which we can use the "originalObject" reference and simply set its values - «IF p.eContainer instanceof ClassExtension» - ««« We have to test at runtime be can't know at design time the type of the object containing the property - ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. - «FOR concreteSubType : getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» - if (parent instanceof «getJavaFQN(concreteSubType)») { + «FOR p : traceability.allMutableProperties.sortBy[FQN] SEPARATOR "else"» + «val EReference pdimension = traceability.getDimensionRef(p)» + «val EClass valueClass = traceability.getValueClass(p)» + if (value instanceof «getJavaFQN(valueClass)») { + ««« Case in which we can use the "originalObject" reference and simply set its values + «IF p.eContainer instanceof ClassExtension» + ««« We have to test at runtime be can't know at design time the type of the object containing the property + ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. + «val concreteSubTypes = getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» + «IF concreteSubTypes.size > 1» + «FOR concreteSubType : concreteSubTypes» + if (parent instanceof «getJavaFQN(concreteSubType)») { + «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» + «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; + «IF !origRefs.isEmpty» + «val EReference origRef = origRefs.get(0)» + «IF p.many» + «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; + originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); + originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value", p, valueClass)»); + «ELSE» + «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p, valueClass)»; + «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; + if (current != toset) { + ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; + } + «ENDIF» + «ENDIF» + } + «ENDFOR» + «ELSEIF concreteSubTypes.size == 1» + «val concreteSubType = concreteSubTypes.head» «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; «IF !origRefs.isEmpty» @@ -197,34 +221,83 @@ class StateManagerGeneratorJava { «IF p.many» «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); - originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value",p)»); + originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value", p, valueClass)»); «ELSE» - «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p)»; + «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p, valueClass)»; «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; if (current != toset) { ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; } «ENDIF» «ENDIF» + «ENDIF» + ««« Case in which we have to recreate/restore execution objects in the model + «ELSEIF p.eContainer instanceof EClass» + «getJavaFQN(p.EContainingClass)» exeObject = («getJavaFQN(p.EContainingClass)») «getTracedToExeMethodName»(parent); + «IF p.many» + exeObject.«EcoreCraftingUtil.stringGetter(p)».clear(); + «IF p instanceof EReference» + exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) «getTracedToExeMethodName»(((«getJavaFQN(valueClass)») value).«EcoreCraftingUtil.stringGetter(p)»)); + «ELSE» + exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) ((«getJavaFQN(valueClass)») value).«EcoreCraftingUtil.stringGetter(p)»); + «ENDIF» + «ELSE» + exeObject.«EcoreCraftingUtil.stringSetter(p, stringGetterExeValue("value", p, valueClass), refGenPackages)»; + «ENDIF» + «ENDIF» } «ENDFOR» - ««« Case in which we have to recreate/restore execution objects in the model - «ELSEIF p.eContainer instanceof EClass» - «getJavaFQN(p.EContainingClass)» exeObject = («getJavaFQN(p.EContainingClass)») «getTracedToExeMethodName»(parent); - «IF p.many» - exeObject.«EcoreCraftingUtil.stringGetter(p)».clear(); - «IF p instanceof EReference» - exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) «getTracedToExeMethodName»(value.«EcoreCraftingUtil.stringGetter(p)»)); - «ELSE» - exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) value.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - «ELSE» - exeObject.«EcoreCraftingUtil.stringSetter(p, stringGetterExeValue("value",p), refGenPackages)»; - «ENDIF» - «ENDIF» } - «ENDFOR» } + +««« @SuppressWarnings("unchecked") +««« private void restoreStateExecute(«stateFQN» state) { +««« «FOR p : traceability.allMutableProperties.sortBy[FQN]» +««« «val EReference pdimension = traceability.getDimensionRef(p)» +««« «val EClass stateClass = traceability.getValueClass(p)» +««« for («valueFQN» value : state.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createGlobalToState(stateClass))») { +««« final EObject parent = value.eContainer().eContainer(); +««« ««« Case in which we can use the "originalObject" reference and simply set its values +««« «IF p.eContainer instanceof ClassExtension» +««« ««« We have to test at runtime be can't know at design time the type of the object containing the property +««« ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. +««« «FOR concreteSubType : getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» +««« if (parent instanceof «getJavaFQN(concreteSubType)») { +««« «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» +««« «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; +««« «IF !origRefs.isEmpty» +««« «val EReference origRef = origRefs.get(0)» +««« «IF p.many» +««« «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; +««« originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); +««« originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value",p)»); +««« «ELSE» +««« «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p)»; +««« «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; +««« if (current != toset) { +««« ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; +««« } +««« «ENDIF» +««« «ENDIF» +««« } +««« «ENDFOR» +««« ««« Case in which we have to recreate/restore execution objects in the model +««« «ELSEIF p.eContainer instanceof EClass» +««« «getJavaFQN(p.EContainingClass)» exeObject = («getJavaFQN(p.EContainingClass)») «getTracedToExeMethodName»(parent); +««« «IF p.many» +««« exeObject.«EcoreCraftingUtil.stringGetter(p)».clear(); +««« «IF p instanceof EReference» +««« exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) «getTracedToExeMethodName»(value.«EcoreCraftingUtil.stringGetter(p)»)); +««« «ELSE» +««« exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) value.«EcoreCraftingUtil.stringGetter(p)»); +««« «ENDIF» +««« «ELSE» +««« exeObject.«EcoreCraftingUtil.stringSetter(p, stringGetterExeValue("value",p), refGenPackages)»; +««« «ENDIF» +««« «ENDIF» +««« } +««« «ENDFOR» +««« } ''' } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 4bb1a075a..785ecc321 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -277,7 +277,7 @@ class TraceConstructorGeneratorJava { import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; - import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; + import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.MSEModel; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; @@ -447,18 +447,16 @@ class TraceConstructorGeneratorJava { tracedObject.«stringSetter(origRef, "o_cast")»; «ENDFOR» exeToTraced.put(o_cast, tracedObject); - traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))».add(tracedObject); - + traceRoot.getTracedObjects().add(tracedObject); «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» «val EClass pdimensionClass = traceability.getDimensionClass(p)» - «val EReference pdimensionRef = traceability.getDimensionRef(p)» «val EClass valueClass = traceability.getValueClass(p)» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» // Creation of the dimension corresponding to the field «p.name» - tracedObject.«EcoreCraftingUtil.stringSetter(pdimensionRef, EcoreCraftingUtil.stringCreate(pdimensionClass))»; + final «getJavaFQN(pdimensionClass)» dimension = EcoreCraftingUtil.stringCreate(pdimensionClass) + tracedObject.getDimensions().add(dimension); // Creation of the first value of the field «p.name» «getJavaFQN(valueClass)» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(valueClass)»; @@ -508,8 +506,9 @@ class TraceConstructorGeneratorJava { «ENDIF» ««« End IF EReference «ENDIF» ««« End IF p.many - tracedObject.«EcoreCraftingUtil.stringGetter(pdimensionRef)».getValues().add(firstValue_«p.name»); - newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(firstValue_«p.name»); + dimension.getValues().add(firstValue_«p.name»); +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(firstValue_«p.name»); + newState.getValues().add(firstValue_«p.name»); «ENDFOR» ««« End FOR p : getAllMutableProperties } // end if (!exeToTraced.containsKey @@ -546,9 +545,10 @@ private def String generateAddStateUsingListenerMethods() { private «stateFQN» copyState(«stateFQN» oldState) { «stateFQN» newState = «EcoreCraftingUtil.stringCreate(stateClass)»; - «FOR p : traceability.allMutableProperties.sortBy[FQN]» - newState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))».addAll(oldState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))»); - «ENDFOR» +««« «FOR p : traceability.allMutableProperties.sortBy[FQN]» +««« newState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))».addAll(oldState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))»); +««« «ENDFOR» + newState.getValues().addAll(oldState.getValues()); copiedState = true; return newState; } @@ -594,7 +594,8 @@ private def String generateAddStateUsingListenerMethods() { «FOR p : c.EStructuralFeatures» «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val EReference pdimension = traceability.getDimensionRef(p)» - newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); + newState.getValues().remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); «ENDFOR» }««« end if instanceof «ENDFOR» @@ -627,7 +628,8 @@ private def String generateAddStateUsingListenerMethods() { // Rollback: we remove the last value of this field from the new state «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o); «getJavaFQN(valueClass)» lastValue = traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1); - newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); + newState.getValues().remove(lastValue); // And we create a proper new value ««« «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» @@ -648,7 +650,8 @@ private def String generateAddStateUsingListenerMethods() { newValue.«stringSetter(valueProperty,"value")»; traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().add(newValue); - newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); + newState.getValues().add(newValue); } ««« end if feature id «ENDFOR» @@ -676,6 +679,7 @@ private def String generateAddStateUsingListenerMethods() { «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val EReference pdimension = traceability.getDimensionRef(p)» if (p.getFeatureID() == «stringFeatureID(p)») { + «getJavaFQN(pdimension.EType)» // We compare the last collection in the value sequence, and the current one in the potentially changed object List<«getJavaFQN(valueClass)»> valueSequence = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues(); «getJavaFQN(valueClass)» previousValue = null; @@ -724,8 +728,9 @@ private def String generateAddStateUsingListenerMethods() { stateChanged = true; // Rollback: we remove the last value of this field from the new state «getJavaFQN(valueClass)» lastValue = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1); - newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); - // And we create a proper new value +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); + newState.getValues().remove(lastValue); + // And we create a proper new value «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» «IF p.many» @@ -740,7 +745,8 @@ private def String generateAddStateUsingListenerMethods() { newValue.«stringSetter(valueProperty,stringGetterTracedValue("o_cast", p))»; «ENDIF» tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().add(newValue); - newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); + newState.getValues().add(newValue); }««« end if change }««« end if featureid «ENDFOR» @@ -762,7 +768,8 @@ private def String generateAddStateUsingListenerMethods() { }««« end if (stateChanged) else if (copiedState) { «FOR p : traceability.allMutableProperties.sortBy[FQN]» - newState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))».clear(); +««« newState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))».clear(); + newState.getValues().clear(); «ENDFOR» } copiedState = false; @@ -989,7 +996,7 @@ private def String generateAddStateUsingListenerMethods() { // Creating generic (or almost generic) links «stateFQN» state = traceRoot.getStates().get(traceRoot.getStates().size()-1); - step_cast.setStartingStateRef(state); + step_cast.setStartingState(state); if (!context.isEmpty() && context.getFirst() != null) { ((SequentialStep<«specificStepFQN», «stateFQN»>) context.getFirst()).getSubSteps().add(step_cast); } else { @@ -1101,8 +1108,8 @@ private def String generateAddStateUsingListenerMethods() { } «ENDFOR» if (implicitStep != null) { - implicitStep.setStartingStateRef(startingState); - implicitStep.setEndingStateRef(endingState); + implicitStep.setStartingState(startingState); + implicitStep.setEndingState(endingState); ((SequentialStep<«specificStepFQN», «stateFQN»>) currentStep).getSubSteps().add(implicitStep); } @@ -1113,7 +1120,7 @@ private def String generateAddStateUsingListenerMethods() { public void endStep(fr.inria.diverse.trace.commons.model.trace.Step step) { «specificStepFQN» popped = context.pop(); if (popped != null) - popped.«stringSetter(TraceMMStrings.ref_StepToState_ending, "lastState")»; + popped.setEndingState(lastState); } ''' } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java index ee06e4a1a..92e43c3a9 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java @@ -64,8 +64,8 @@ import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.core.IRunConfiguration; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; From 376781408d1e94d81499ee1ac8bc3f915b1b62d3 Mon Sep 17 00:00:00 2001 From: d-leroy Date: Mon, 6 Feb 2017 15:55:47 +0100 Subject: [PATCH 101/267] Working version of generic trace metamodel + multidimensional trace --- .../model/GenericTrace.aird | 37 +- .../model/GenericTrace.ecore | 11 +- .../model/GenericTrace.genmodel | 125 ++ .../model/GenericTraceImpl.ecore | 61 + .../model/GenericTraceImpl.genmodel | 54 + .../model/LaunchConfiguration.ecore | 23 + .../model/LaunchConfiguration.genmodel | 27 + .../generictrace/BooleanAttributeValue.java | 50 + .../generictrace/GenericAttributeValue.java | 17 + .../model/generictrace/GenericDimension.java | 52 + .../generictrace/GenericParallelStep.java | 17 + .../generictrace/GenericReferenceValue.java | 50 + .../generictrace/GenericSequentialStep.java | 17 + .../model/generictrace/GenericSmallStep.java | 17 + .../model/generictrace/GenericState.java | 19 + .../model/generictrace/GenericStep.java | 18 + .../model/generictrace/GenericTrace.java | 18 + .../generictrace/GenericTracedObject.java | 18 + .../model/generictrace/GenericValue.java | 19 + .../generictrace/GenerictraceFactory.java | 132 ++ .../generictrace/GenerictracePackage.java | 1180 ++++++++++++ .../generictrace/IntegerAttributevalue.java | 49 + .../generictrace/StringAttributeValue.java | 49 + .../impl/BooleanAttributeValueImpl.java | 162 ++ .../impl/GenericAttributeValueImpl.java | 37 + .../impl/GenericDimensionImpl.java | 177 ++ .../impl/GenericParallelStepImpl.java | 37 + .../impl/GenericReferenceValueImpl.java | 156 ++ .../impl/GenericSequentialStepImpl.java | 37 + .../impl/GenericSmallStepImpl.java | 37 + .../generictrace/impl/GenericStateImpl.java | 89 + .../generictrace/impl/GenericStepImpl.java | 64 + .../generictrace/impl/GenericTraceImpl.java | 87 + .../impl/GenericTracedObjectImpl.java | 39 + .../generictrace/impl/GenericValueImpl.java | 59 + .../impl/GenerictraceFactoryImpl.java | 254 +++ .../impl/GenerictracePackageImpl.java | 571 ++++++ .../impl/IntegerAttributevalueImpl.java | 162 ++ .../impl/StringAttributeValueImpl.java | 162 ++ .../util/GenerictraceAdapterFactory.java | 469 +++++ .../generictrace/util/GenerictraceSwitch.java | 505 +++++ .../AddonExtensionParameter.java | 17 + .../AnimatorURIParameter.java | 17 + .../EntryPointParameter.java | 17 + .../InitializationArgumentsParameter.java | 17 + .../InitializationMethodParameter.java | 17 + .../LanguageNameParameter.java | 17 + .../LaunchConfiguration.java | 69 + .../LaunchConfigurationParameter.java | 51 + .../LaunchconfigurationFactory.java | 114 ++ .../LaunchconfigurationPackage.java | 750 ++++++++ .../ModelRootParameter.java | 17 + .../ModelURIParameter.java | 17 + .../impl/AddonExtensionParameterImpl.java | 37 + .../impl/AnimatorURIParameterImpl.java | 37 + .../impl/EntryPointParameterImpl.java | 37 + .../InitializationArgumentsParameterImpl.java | 37 + .../InitializationMethodParameterImpl.java | 37 + .../impl/LanguageNameParameterImpl.java | 37 + .../impl/LaunchConfigurationImpl.java | 222 +++ .../LaunchConfigurationParameterImpl.java | 163 ++ .../impl/LaunchconfigurationFactoryImpl.java | 232 +++ .../impl/LaunchconfigurationPackageImpl.java | 420 +++++ .../impl/ModelRootParameterImpl.java | 37 + .../impl/ModelURIParameterImpl.java | 37 + .../LaunchconfigurationAdapterFactory.java | 282 +++ .../util/LaunchconfigurationSwitch.java | 307 +++ .../trace/commons/model/trace/BigStep.java | 39 + .../trace/commons/model/trace/Dimension.java | 41 + .../trace/commons/model/trace/GenericMSE.java | 96 + .../trace/commons/model/trace/MSE.java | 36 + .../trace/commons/model/trace/MSEModel.java | 42 + .../commons/model/trace/MSEOccurrence.java | 86 + .../commons/model/trace/ParallelStep.java | 17 + .../commons/model/trace/SequentialStep.java | 17 + .../trace/commons/model/trace/SmallStep.java | 17 + .../trace/commons/model/trace/State.java | 79 + .../trace/commons/model/trace/Step.java | 108 ++ .../trace/commons/model/trace/Trace.java | 113 ++ .../commons/model/trace/TraceFactory.java | 60 + .../commons/model/trace/TracePackage.java | 1663 +++++++++++++++++ .../commons/model/trace/TracedObject.java | 51 + .../trace/commons/model/trace/Value.java | 43 + .../commons/model/trace/impl/BigStepImpl.java | 151 ++ .../model/trace/impl/DimensionImpl.java | 152 ++ .../model/trace/impl/GenericMSEImpl.java | 255 +++ .../commons/model/trace/impl/MSEImpl.java | 83 + .../model/trace/impl/MSEModelImpl.java | 152 ++ .../model/trace/impl/MSEOccurrenceImpl.java | 250 +++ .../model/trace/impl/ParallelStepImpl.java | 39 + .../model/trace/impl/SequentialStepImpl.java | 39 + .../model/trace/impl/SmallStepImpl.java | 38 + .../commons/model/trace/impl/StateImpl.java | 244 +++ .../commons/model/trace/impl/StepImpl.java | 369 ++++ .../model/trace/impl/TraceFactoryImpl.java | 166 ++ .../commons/model/trace/impl/TraceImpl.java | 326 ++++ .../model/trace/impl/TracePackageImpl.java | 886 +++++++++ .../model/trace/impl/TracedObjectImpl.java | 143 ++ .../commons/model/trace/impl/ValueImpl.java | 167 ++ .../model/trace/util/TraceAdapterFactory.java | 392 ++++ .../commons/model/trace/util/TraceSwitch.java | 426 +++++ .../trace/gemoc/api/ITraceExtractor.java | 9 + .../fr.inria.diverse.trace.gemoc/.project | 6 - .../traceaddon/GenericTraceExplorer.java | 40 +- .../traceaddon/GenericTraceExtractor.java | 99 +- .../traceaddon/GenericTraceNotifier.java | 22 +- .../model/base.aird | 59 +- .../model/base.ecore | 11 - .../src/base/BasePackage.java | 30 +- .../src/base/SpecificTrace.java | 9 - .../src/base/States/StatesPackage.java | 11 +- .../src/base/impl/BasePackageImpl.java | 23 - .../src/base/impl/SpecificTraceImpl.java | 14 + .../generator/TraceMMGeneratorStates.xtend | 44 +- .../TraceConstructorGeneratorJava.xtend | 118 +- .../MultidimensionalTimelineRenderer.java | 36 +- 116 files changed, 15218 insertions(+), 305 deletions(-) create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.genmodel create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.genmodel create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/BooleanAttributeValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericAttributeValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericDimension.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericReferenceValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSmallStep.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericState.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericStep.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTrace.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributevalue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/StringAttributeValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericDimensionImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStateImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStepImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTraceImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributevalueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AddonExtensionParameter.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AnimatorURIParameter.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/EntryPointParameter.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationMethodParameter.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LanguageNameParameter.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfiguration.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelRootParameter.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelURIParameter.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird index 1c056bc87..48c5c79e4 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird @@ -56,15 +56,6 @@ - - - - - - - - - @@ -360,6 +351,10 @@ + + + + @@ -1373,12 +1368,12 @@ - + - - - + + + @@ -1404,6 +1399,14 @@ + + + + + + + + @@ -1451,12 +1454,12 @@ - + - - - + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index 1f6d92e33..e58463f5a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -151,8 +151,17 @@ + + +
+ + + + volatile="true" transient="true"> + +
+ diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel new file mode 100644 index 000000000..42c7c957b --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel @@ -0,0 +1,125 @@ + + + GenericTrace.ecore + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore new file mode 100644 index 000000000..7a557dec1 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.genmodel b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.genmodel new file mode 100644 index 000000000..0872efdde --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.genmodel @@ -0,0 +1,54 @@ + + + GenericTraceImpl.ecore + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore new file mode 100644 index 000000000..909c76c5c --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.genmodel b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.genmodel new file mode 100644 index 000000000..d05c54c03 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.genmodel @@ -0,0 +1,27 @@ + + + LaunchConfiguration.ecore + + + + + + + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/BooleanAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/BooleanAttributeValue.java new file mode 100644 index 000000000..b4bdc631b --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/BooleanAttributeValue.java @@ -0,0 +1,50 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + + +/** + * + * A representation of the model object 'Boolean Attribute Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue Attribute Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getBooleanAttributeValue() + * @model + * @generated + */ +public interface BooleanAttributeValue extends GenericAttributeValue { + /** + * Returns the value of the 'Attribute Value' attribute. + * The default value is "false". + * + *

+ * If the meaning of the 'Attribute Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Attribute Value' attribute. + * @see #setAttributeValue(boolean) + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getBooleanAttributeValue_AttributeValue() + * @model default="false" + * @generated + */ + boolean isAttributeValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue Attribute Value}' attribute. + * + * + * @param value the new value of the 'Attribute Value' attribute. + * @see #isAttributeValue() + * @generated + */ + void setAttributeValue(boolean value); + +} // BooleanAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericAttributeValue.java new file mode 100644 index 000000000..f735fd515 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericAttributeValue.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + + +/** + * + * A representation of the model object 'Generic Attribute Value'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericAttributeValue() + * @model abstract="true" + * @generated + */ +public interface GenericAttributeValue extends GenericValue { +} // GenericAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericDimension.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericDimension.java new file mode 100644 index 000000000..b0ce5f4ed --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericDimension.java @@ -0,0 +1,52 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import fr.inria.diverse.trace.commons.model.trace.Dimension; + +import org.eclipse.emf.ecore.EStructuralFeature; + +/** + * + * A representation of the model object 'Generic Dimension'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension#getDynamicProperty Dynamic Property}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericDimension() + * @model + * @generated + */ +public interface GenericDimension extends Dimension { + /** + * Returns the value of the 'Dynamic Property' reference. + * + *

+ * If the meaning of the 'Dynamic Property' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Dynamic Property' reference. + * @see #setDynamicProperty(EStructuralFeature) + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericDimension_DynamicProperty() + * @model + * @generated + */ + EStructuralFeature getDynamicProperty(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension#getDynamicProperty Dynamic Property}' reference. + * + * + * @param value the new value of the 'Dynamic Property' reference. + * @see #getDynamicProperty() + * @generated + */ + void setDynamicProperty(EStructuralFeature value); + +} // GenericDimension diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java new file mode 100644 index 000000000..97845dbaa --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + + +/** + * + * A representation of the model object 'Generic Parallel Step'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericParallelStep() + * @model + * @generated + */ +public interface GenericParallelStep extends GenericStep { +} // GenericParallelStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericReferenceValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericReferenceValue.java new file mode 100644 index 000000000..edebc6dcd --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericReferenceValue.java @@ -0,0 +1,50 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Generic Reference Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue#getReferenceValue Reference Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericReferenceValue() + * @model + * @generated + */ +public interface GenericReferenceValue extends GenericValue { + /** + * Returns the value of the 'Reference Value' reference. + * + *

+ * If the meaning of the 'Reference Value' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Reference Value' reference. + * @see #setReferenceValue(EObject) + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericReferenceValue_ReferenceValue() + * @model + * @generated + */ + EObject getReferenceValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue#getReferenceValue Reference Value}' reference. + * + * + * @param value the new value of the 'Reference Value' reference. + * @see #getReferenceValue() + * @generated + */ + void setReferenceValue(EObject value); + +} // GenericReferenceValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java new file mode 100644 index 000000000..3e68f7e5a --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + + +/** + * + * A representation of the model object 'Generic Sequential Step'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericSequentialStep() + * @model + * @generated + */ +public interface GenericSequentialStep extends GenericStep { +} // GenericSequentialStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSmallStep.java new file mode 100644 index 000000000..facc30ece --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSmallStep.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + + +/** + * + * A representation of the model object 'Generic Small Step'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericSmallStep() + * @model + * @generated + */ +public interface GenericSmallStep extends GenericStep { +} // GenericSmallStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericState.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericState.java new file mode 100644 index 000000000..f0dd83016 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericState.java @@ -0,0 +1,19 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import fr.inria.diverse.trace.commons.model.trace.State; + +/** + * + * A representation of the model object 'Generic State'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericState() + * @model + * @generated + */ +public interface GenericState extends State { + +} // GenericState diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericStep.java new file mode 100644 index 000000000..90728af34 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericStep.java @@ -0,0 +1,18 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import fr.inria.diverse.trace.commons.model.trace.Step; + +/** + * + * A representation of the model object 'Generic Step'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericStep() + * @model abstract="true" + * @generated + */ +public interface GenericStep extends Step { +} // GenericStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTrace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTrace.java new file mode 100644 index 000000000..6c9baa655 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTrace.java @@ -0,0 +1,18 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import fr.inria.diverse.trace.commons.model.trace.Trace; + +/** + * + * A representation of the model object 'Generic Trace'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericTrace() + * @model + * @generated + */ +public interface GenericTrace extends Trace { +} // GenericTrace diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java new file mode 100644 index 000000000..aa0508b43 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java @@ -0,0 +1,18 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import fr.inria.diverse.trace.commons.model.trace.TracedObject; + +/** + * + * A representation of the model object 'Generic Traced Object'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericTracedObject() + * @model + * @generated + */ +public interface GenericTracedObject extends TracedObject { +} // GenericTracedObject diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericValue.java new file mode 100644 index 000000000..48343e38f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericValue.java @@ -0,0 +1,19 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import fr.inria.diverse.trace.commons.model.trace.Value; + +/** + * + * A representation of the model object 'Generic Value'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericValue() + * @model abstract="true" + * @generated + */ +public interface GenericValue extends Value { + +} // GenericValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java new file mode 100644 index 000000000..2ee570d46 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java @@ -0,0 +1,132 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import org.eclipse.emf.ecore.EFactory; + +/** + * + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage + * @generated + */ +public interface GenerictraceFactory extends EFactory { + /** + * The singleton instance of the factory. + * + * + * @generated + */ + GenerictraceFactory eINSTANCE = fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictraceFactoryImpl.init(); + + /** + * Returns a new object of class 'Generic Sequential Step'. + * + * + * @return a new object of class 'Generic Sequential Step'. + * @generated + */ + GenericSequentialStep createGenericSequentialStep(); + + /** + * Returns a new object of class 'Generic Parallel Step'. + * + * + * @return a new object of class 'Generic Parallel Step'. + * @generated + */ + GenericParallelStep createGenericParallelStep(); + + /** + * Returns a new object of class 'Generic Small Step'. + * + * + * @return a new object of class 'Generic Small Step'. + * @generated + */ + GenericSmallStep createGenericSmallStep(); + + /** + * Returns a new object of class 'Generic Reference Value'. + * + * + * @return a new object of class 'Generic Reference Value'. + * @generated + */ + GenericReferenceValue createGenericReferenceValue(); + + /** + * Returns a new object of class 'Generic Dimension'. + * + * + * @return a new object of class 'Generic Dimension'. + * @generated + */ + GenericDimension createGenericDimension(); + + /** + * Returns a new object of class 'Generic Traced Object'. + * + * + * @return a new object of class 'Generic Traced Object'. + * @generated + */ + GenericTracedObject createGenericTracedObject(); + + /** + * Returns a new object of class 'Generic State'. + * + * + * @return a new object of class 'Generic State'. + * @generated + */ + GenericState createGenericState(); + + /** + * Returns a new object of class 'Generic Trace'. + * + * + * @return a new object of class 'Generic Trace'. + * @generated + */ + GenericTrace createGenericTrace(); + + /** + * Returns a new object of class 'Boolean Attribute Value'. + * + * + * @return a new object of class 'Boolean Attribute Value'. + * @generated + */ + BooleanAttributeValue createBooleanAttributeValue(); + + /** + * Returns a new object of class 'Integer Attributevalue'. + * + * + * @return a new object of class 'Integer Attributevalue'. + * @generated + */ + IntegerAttributevalue createIntegerAttributevalue(); + + /** + * Returns a new object of class 'String Attribute Value'. + * + * + * @return a new object of class 'String Attribute Value'. + * @generated + */ + StringAttributeValue createStringAttributeValue(); + + /** + * Returns the package supported by this factory. + * + * + * @return the package supported by this factory. + * @generated + */ + GenerictracePackage getGenerictracePackage(); + +} //GenerictraceFactory diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java new file mode 100644 index 000000000..d4ce1a0c1 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java @@ -0,0 +1,1180 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +/** + * + * The Package for the model. + * It contains accessors for the meta objects to represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory + * @model kind="package" + * @generated + */ +public interface GenerictracePackage extends EPackage { + /** + * The package name. + * + * + * @generated + */ + String eNAME = "generictrace"; + + /** + * The package namespace URI. + * + * + * @generated + */ + String eNS_URI = "http://www.gemoc.org/generic_trace_impl"; + + /** + * The package namespace name. + * + * + * @generated + */ + String eNS_PREFIX = "generictrace"; + + /** + * The singleton instance of the package. + * + * + * @generated + */ + GenerictracePackage eINSTANCE = fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl.init(); + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStepImpl Generic Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStepImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericStep() + * @generated + */ + int GENERIC_STEP = 12; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP__MSEOCCURRENCE = TracePackage.STEP__MSEOCCURRENCE; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP__STARTING_STATE = TracePackage.STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP__ENDING_STATE = TracePackage.STEP__ENDING_STATE; + + /** + * The number of structural features of the 'Generic Step' class. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP_FEATURE_COUNT = TracePackage.STEP_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Generic Step' class. + * + * + * @generated + * @ordered + */ + int GENERIC_STEP_OPERATION_COUNT = TracePackage.STEP_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSequentialStepImpl Generic Sequential Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSequentialStepImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSequentialStep() + * @generated + */ + int GENERIC_SEQUENTIAL_STEP = 0; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP__MSEOCCURRENCE = GENERIC_STEP__MSEOCCURRENCE; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP__STARTING_STATE = GENERIC_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP__ENDING_STATE = GENERIC_STEP__ENDING_STATE; + + /** + * The number of structural features of the 'Generic Sequential Step' class. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP_FEATURE_COUNT = GENERIC_STEP_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Generic Sequential Step' class. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP_OPERATION_COUNT = GENERIC_STEP_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericParallelStepImpl Generic Parallel Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericParallelStepImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericParallelStep() + * @generated + */ + int GENERIC_PARALLEL_STEP = 1; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP__MSEOCCURRENCE = GENERIC_STEP__MSEOCCURRENCE; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP__STARTING_STATE = GENERIC_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP__ENDING_STATE = GENERIC_STEP__ENDING_STATE; + + /** + * The number of structural features of the 'Generic Parallel Step' class. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP_FEATURE_COUNT = GENERIC_STEP_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Generic Parallel Step' class. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP_OPERATION_COUNT = GENERIC_STEP_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSmallStepImpl Generic Small Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSmallStepImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSmallStep() + * @generated + */ + int GENERIC_SMALL_STEP = 2; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP__MSEOCCURRENCE = GENERIC_STEP__MSEOCCURRENCE; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP__STARTING_STATE = GENERIC_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP__ENDING_STATE = GENERIC_STEP__ENDING_STATE; + + /** + * The number of structural features of the 'Generic Small Step' class. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP_FEATURE_COUNT = GENERIC_STEP_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Generic Small Step' class. + * + * + * @generated + * @ordered + */ + int GENERIC_SMALL_STEP_OPERATION_COUNT = GENERIC_STEP_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericValueImpl Generic Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericValue() + * @generated + */ + int GENERIC_VALUE = 13; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_VALUE__STATES = TracePackage.VALUE__STATES; + + /** + * The number of structural features of the 'Generic Value' class. + * + * + * @generated + * @ordered + */ + int GENERIC_VALUE_FEATURE_COUNT = TracePackage.VALUE_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Generic Value' class. + * + * + * @generated + * @ordered + */ + int GENERIC_VALUE_OPERATION_COUNT = TracePackage.VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericReferenceValueImpl Generic Reference Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericReferenceValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericReferenceValue() + * @generated + */ + int GENERIC_REFERENCE_VALUE = 3; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_REFERENCE_VALUE__STATES = GENERIC_VALUE__STATES; + + /** + * The feature id for the 'Reference Value' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_REFERENCE_VALUE__REFERENCE_VALUE = GENERIC_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Generic Reference Value' class. + * + * + * @generated + * @ordered + */ + int GENERIC_REFERENCE_VALUE_FEATURE_COUNT = GENERIC_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Generic Reference Value' class. + * + * + * @generated + * @ordered + */ + int GENERIC_REFERENCE_VALUE_OPERATION_COUNT = GENERIC_VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl Generic Dimension}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericDimension() + * @generated + */ + int GENERIC_DIMENSION = 4; + + /** + * The feature id for the 'Values' containment reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_DIMENSION__VALUES = TracePackage.DIMENSION__VALUES; + + /** + * The feature id for the 'Dynamic Property' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_DIMENSION__DYNAMIC_PROPERTY = TracePackage.DIMENSION_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Generic Dimension' class. + * + * + * @generated + * @ordered + */ + int GENERIC_DIMENSION_FEATURE_COUNT = TracePackage.DIMENSION_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Generic Dimension' class. + * + * + * @generated + * @ordered + */ + int GENERIC_DIMENSION_OPERATION_COUNT = TracePackage.DIMENSION_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl Generic Traced Object}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTracedObject() + * @generated + */ + int GENERIC_TRACED_OBJECT = 5; + + /** + * The feature id for the 'Dimensions' containment reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACED_OBJECT__DIMENSIONS = TracePackage.TRACED_OBJECT__DIMENSIONS; + + /** + * The number of structural features of the 'Generic Traced Object' class. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACED_OBJECT_FEATURE_COUNT = TracePackage.TRACED_OBJECT_FEATURE_COUNT + 0; + + /** + * The operation id for the 'Get Dimensions Internal' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = TracePackage.TRACED_OBJECT___GET_DIMENSIONS_INTERNAL; + + /** + * The number of operations of the 'Generic Traced Object' class. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACED_OBJECT_OPERATION_COUNT = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl Generic State}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericState() + * @generated + */ + int GENERIC_STATE = 6; + + /** + * The feature id for the 'Started Steps' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE__STARTED_STEPS = TracePackage.STATE__STARTED_STEPS; + + /** + * The feature id for the 'Ended Steps' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE__ENDED_STEPS = TracePackage.STATE__ENDED_STEPS; + + /** + * The feature id for the 'Values' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE__VALUES = TracePackage.STATE__VALUES; + + /** + * The number of structural features of the 'Generic State' class. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE_FEATURE_COUNT = TracePackage.STATE_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Generic State' class. + * + * + * @generated + * @ordered + */ + int GENERIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTraceImpl Generic Trace}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTraceImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTrace() + * @generated + */ + int GENERIC_TRACE = 7; + + /** + * The feature id for the 'Root Step' containment reference. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACE__ROOT_STEP = TracePackage.TRACE__ROOT_STEP; + + /** + * The feature id for the 'Traced Objects' containment reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACE__TRACED_OBJECTS = TracePackage.TRACE__TRACED_OBJECTS; + + /** + * The feature id for the 'States' containment reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACE__STATES = TracePackage.TRACE__STATES; + + /** + * The feature id for the 'Launchconfiguration' containment reference. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACE__LAUNCHCONFIGURATION = TracePackage.TRACE__LAUNCHCONFIGURATION; + + /** + * The number of structural features of the 'Generic Trace' class. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACE_FEATURE_COUNT = TracePackage.TRACE_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Generic Trace' class. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACE_OPERATION_COUNT = TracePackage.TRACE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericAttributeValueImpl Generic Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericAttributeValue() + * @generated + */ + int GENERIC_ATTRIBUTE_VALUE = 8; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_ATTRIBUTE_VALUE__STATES = GENERIC_VALUE__STATES; + + /** + * The number of structural features of the 'Generic Attribute Value' class. + * + * + * @generated + * @ordered + */ + int GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_VALUE_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Generic Attribute Value' class. + * + * + * @generated + * @ordered + */ + int GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getBooleanAttributeValue() + * @generated + */ + int BOOLEAN_ATTRIBUTE_VALUE = 9; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int BOOLEAN_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + + /** + * The feature id for the 'Attribute Value' attribute. + * + * + * @generated + * @ordered + */ + int BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Boolean Attribute Value' class. + * + * + * @generated + * @ordered + */ + int BOOLEAN_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Boolean Attribute Value' class. + * + * + * @generated + * @ordered + */ + int BOOLEAN_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributevalueImpl Integer Attributevalue}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributevalueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerAttributevalue() + * @generated + */ + int INTEGER_ATTRIBUTEVALUE = 10; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int INTEGER_ATTRIBUTEVALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + + /** + * The feature id for the 'Attribute Value' attribute. + * + * + * @generated + * @ordered + */ + int INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Integer Attributevalue' class. + * + * + * @generated + * @ordered + */ + int INTEGER_ATTRIBUTEVALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Integer Attributevalue' class. + * + * + * @generated + * @ordered + */ + int INTEGER_ATTRIBUTEVALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl String Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getStringAttributeValue() + * @generated + */ + int STRING_ATTRIBUTE_VALUE = 11; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int STRING_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + + /** + * The feature id for the 'Attribute Value' attribute. + * + * + * @generated + * @ordered + */ + int STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'String Attribute Value' class. + * + * + * @generated + * @ordered + */ + int STRING_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'String Attribute Value' class. + * + * + * @generated + * @ordered + */ + int STRING_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the 'ISerializable' data type. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getISerializable() + * @generated + */ + int ISERIALIZABLE = 14; + + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep Generic Sequential Step}'. + * + * + * @return the meta object for class 'Generic Sequential Step'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep + * @generated + */ + EClass getGenericSequentialStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep Generic Parallel Step}'. + * + * + * @return the meta object for class 'Generic Parallel Step'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep + * @generated + */ + EClass getGenericParallelStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep Generic Small Step}'. + * + * + * @return the meta object for class 'Generic Small Step'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep + * @generated + */ + EClass getGenericSmallStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue Generic Reference Value}'. + * + * + * @return the meta object for class 'Generic Reference Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue + * @generated + */ + EClass getGenericReferenceValue(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue#getReferenceValue Reference Value}'. + * + * + * @return the meta object for the reference 'Reference Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue#getReferenceValue() + * @see #getGenericReferenceValue() + * @generated + */ + EReference getGenericReferenceValue_ReferenceValue(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension Generic Dimension}'. + * + * + * @return the meta object for class 'Generic Dimension'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericDimension + * @generated + */ + EClass getGenericDimension(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension#getDynamicProperty Dynamic Property}'. + * + * + * @return the meta object for the reference 'Dynamic Property'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericDimension#getDynamicProperty() + * @see #getGenericDimension() + * @generated + */ + EReference getGenericDimension_DynamicProperty(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject Generic Traced Object}'. + * + * + * @return the meta object for class 'Generic Traced Object'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject + * @generated + */ + EClass getGenericTracedObject(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericState Generic State}'. + * + * + * @return the meta object for class 'Generic State'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericState + * @generated + */ + EClass getGenericState(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTrace Generic Trace}'. + * + * + * @return the meta object for class 'Generic Trace'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTrace + * @generated + */ + EClass getGenericTrace(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue Generic Attribute Value}'. + * + * + * @return the meta object for class 'Generic Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue + * @generated + */ + EClass getGenericAttributeValue(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue Boolean Attribute Value}'. + * + * + * @return the meta object for class 'Boolean Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue + * @generated + */ + EClass getBooleanAttributeValue(); + + /** + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue Attribute Value}'. + * + * + * @return the meta object for the attribute 'Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue() + * @see #getBooleanAttributeValue() + * @generated + */ + EAttribute getBooleanAttributeValue_AttributeValue(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue Integer Attributevalue}'. + * + * + * @return the meta object for class 'Integer Attributevalue'. + * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue + * @generated + */ + EClass getIntegerAttributevalue(); + + /** + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue#getAttributeValue Attribute Value}'. + * + * + * @return the meta object for the attribute 'Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue#getAttributeValue() + * @see #getIntegerAttributevalue() + * @generated + */ + EAttribute getIntegerAttributevalue_AttributeValue(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue String Attribute Value}'. + * + * + * @return the meta object for class 'String Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue + * @generated + */ + EClass getStringAttributeValue(); + + /** + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue Attribute Value}'. + * + * + * @return the meta object for the attribute 'Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue() + * @see #getStringAttributeValue() + * @generated + */ + EAttribute getStringAttributeValue_AttributeValue(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericStep Generic Step}'. + * + * + * @return the meta object for class 'Generic Step'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericStep + * @generated + */ + EClass getGenericStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericValue Generic Value}'. + * + * + * @return the meta object for class 'Generic Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericValue + * @generated + */ + EClass getGenericValue(); + + /** + * Returns the meta object for data type 'ISerializable'. + * + * + * @return the meta object for data type 'ISerializable'. + * @model instanceClass="byte[]" + * @generated + */ + EDataType getISerializable(); + + /** + * Returns the factory that creates the instances of the model. + * + * + * @return the factory that creates the instances of the model. + * @generated + */ + GenerictraceFactory getGenerictraceFactory(); + + /** + * + * Defines literals for the meta objects that represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSequentialStepImpl Generic Sequential Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSequentialStepImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSequentialStep() + * @generated + */ + EClass GENERIC_SEQUENTIAL_STEP = eINSTANCE.getGenericSequentialStep(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericParallelStepImpl Generic Parallel Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericParallelStepImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericParallelStep() + * @generated + */ + EClass GENERIC_PARALLEL_STEP = eINSTANCE.getGenericParallelStep(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSmallStepImpl Generic Small Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSmallStepImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSmallStep() + * @generated + */ + EClass GENERIC_SMALL_STEP = eINSTANCE.getGenericSmallStep(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericReferenceValueImpl Generic Reference Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericReferenceValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericReferenceValue() + * @generated + */ + EClass GENERIC_REFERENCE_VALUE = eINSTANCE.getGenericReferenceValue(); + + /** + * The meta object literal for the 'Reference Value' reference feature. + * + * + * @generated + */ + EReference GENERIC_REFERENCE_VALUE__REFERENCE_VALUE = eINSTANCE.getGenericReferenceValue_ReferenceValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl Generic Dimension}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericDimension() + * @generated + */ + EClass GENERIC_DIMENSION = eINSTANCE.getGenericDimension(); + + /** + * The meta object literal for the 'Dynamic Property' reference feature. + * + * + * @generated + */ + EReference GENERIC_DIMENSION__DYNAMIC_PROPERTY = eINSTANCE.getGenericDimension_DynamicProperty(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl Generic Traced Object}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTracedObject() + * @generated + */ + EClass GENERIC_TRACED_OBJECT = eINSTANCE.getGenericTracedObject(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl Generic State}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericState() + * @generated + */ + EClass GENERIC_STATE = eINSTANCE.getGenericState(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTraceImpl Generic Trace}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTraceImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTrace() + * @generated + */ + EClass GENERIC_TRACE = eINSTANCE.getGenericTrace(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericAttributeValueImpl Generic Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericAttributeValue() + * @generated + */ + EClass GENERIC_ATTRIBUTE_VALUE = eINSTANCE.getGenericAttributeValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getBooleanAttributeValue() + * @generated + */ + EClass BOOLEAN_ATTRIBUTE_VALUE = eINSTANCE.getBooleanAttributeValue(); + + /** + * The meta object literal for the 'Attribute Value' attribute feature. + * + * + * @generated + */ + EAttribute BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getBooleanAttributeValue_AttributeValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributevalueImpl Integer Attributevalue}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributevalueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerAttributevalue() + * @generated + */ + EClass INTEGER_ATTRIBUTEVALUE = eINSTANCE.getIntegerAttributevalue(); + + /** + * The meta object literal for the 'Attribute Value' attribute feature. + * + * + * @generated + */ + EAttribute INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE = eINSTANCE.getIntegerAttributevalue_AttributeValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl String Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getStringAttributeValue() + * @generated + */ + EClass STRING_ATTRIBUTE_VALUE = eINSTANCE.getStringAttributeValue(); + + /** + * The meta object literal for the 'Attribute Value' attribute feature. + * + * + * @generated + */ + EAttribute STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getStringAttributeValue_AttributeValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStepImpl Generic Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStepImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericStep() + * @generated + */ + EClass GENERIC_STEP = eINSTANCE.getGenericStep(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericValueImpl Generic Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericValue() + * @generated + */ + EClass GENERIC_VALUE = eINSTANCE.getGenericValue(); + + /** + * The meta object literal for the 'ISerializable' data type. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getISerializable() + * @generated + */ + EDataType ISERIALIZABLE = eINSTANCE.getISerializable(); + + } + +} //GenerictracePackage diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributevalue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributevalue.java new file mode 100644 index 000000000..1405360ad --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributevalue.java @@ -0,0 +1,49 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + + +/** + * + * A representation of the model object 'Integer Attributevalue'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue#getAttributeValue Attribute Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerAttributevalue() + * @model + * @generated + */ +public interface IntegerAttributevalue extends GenericAttributeValue { + /** + * Returns the value of the 'Attribute Value' attribute. + * + *

+ * If the meaning of the 'Attribute Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Attribute Value' attribute. + * @see #setAttributeValue(int) + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerAttributevalue_AttributeValue() + * @model + * @generated + */ + int getAttributeValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue#getAttributeValue Attribute Value}' attribute. + * + * + * @param value the new value of the 'Attribute Value' attribute. + * @see #getAttributeValue() + * @generated + */ + void setAttributeValue(int value); + +} // IntegerAttributevalue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/StringAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/StringAttributeValue.java new file mode 100644 index 000000000..a883cd502 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/StringAttributeValue.java @@ -0,0 +1,49 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + + +/** + * + * A representation of the model object 'String Attribute Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue Attribute Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getStringAttributeValue() + * @model + * @generated + */ +public interface StringAttributeValue extends GenericAttributeValue { + /** + * Returns the value of the 'Attribute Value' attribute. + * + *

+ * If the meaning of the 'Attribute Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Attribute Value' attribute. + * @see #setAttributeValue(String) + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getStringAttributeValue_AttributeValue() + * @model + * @generated + */ + String getAttributeValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue Attribute Value}' attribute. + * + * + * @param value the new value of the 'Attribute Value' attribute. + * @see #getAttributeValue() + * @generated + */ + void setAttributeValue(String value); + +} // StringAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java new file mode 100644 index 000000000..543e0b56b --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java @@ -0,0 +1,162 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Boolean Attribute Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl#isAttributeValue Attribute Value}
    • + *
+ * + * @generated + */ +public class BooleanAttributeValueImpl extends GenericAttributeValueImpl implements BooleanAttributeValue { + /** + * The default value of the '{@link #isAttributeValue() Attribute Value}' attribute. + * + * + * @see #isAttributeValue() + * @generated + * @ordered + */ + protected static final boolean ATTRIBUTE_VALUE_EDEFAULT = false; + + /** + * The cached value of the '{@link #isAttributeValue() Attribute Value}' attribute. + * + * + * @see #isAttributeValue() + * @generated + * @ordered + */ + protected boolean attributeValue = ATTRIBUTE_VALUE_EDEFAULT; + + /** + * + * + * @generated + */ + protected BooleanAttributeValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.BOOLEAN_ATTRIBUTE_VALUE; + } + + /** + * + * + * @generated + */ + public boolean isAttributeValue() { + return attributeValue; + } + + /** + * + * + * @generated + */ + public void setAttributeValue(boolean newAttributeValue) { + boolean oldAttributeValue = attributeValue; + attributeValue = newAttributeValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return isAttributeValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + setAttributeValue((Boolean)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return attributeValue != ATTRIBUTE_VALUE_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeValue: "); + result.append(attributeValue); + result.append(')'); + return result.toString(); + } + +} //BooleanAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java new file mode 100644 index 000000000..fb107af3d --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Generic Attribute Value'. + * + * + * @generated + */ +public abstract class GenericAttributeValueImpl extends GenericValueImpl implements GenericAttributeValue { + /** + * + * + * @generated + */ + protected GenericAttributeValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_ATTRIBUTE_VALUE; + } + +} //GenericAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericDimensionImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericDimensionImpl.java new file mode 100644 index 000000000..a52cb3671 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericDimensionImpl.java @@ -0,0 +1,177 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; +import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; + +/** + * + * An implementation of the model object 'Generic Dimension'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl#getDynamicProperty Dynamic Property}
    • + *
+ * + * @generated + */ +public class GenericDimensionImpl extends DimensionImpl implements GenericDimension { + /** + * The cached value of the '{@link #getDynamicProperty() Dynamic Property}' reference. + * + * + * @see #getDynamicProperty() + * @generated + * @ordered + */ + protected EStructuralFeature dynamicProperty; + + /** + * + * + * @generated + */ + protected GenericDimensionImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_DIMENSION; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getValues() { + if (values == null) { + values = new EObjectContainmentEList(GenericValue.class, this, GenerictracePackage.GENERIC_DIMENSION__VALUES); + } + return values; + } + + /** + * + * + * @generated + */ + public EStructuralFeature getDynamicProperty() { + if (dynamicProperty != null && dynamicProperty.eIsProxy()) { + InternalEObject oldDynamicProperty = (InternalEObject)dynamicProperty; + dynamicProperty = (EStructuralFeature)eResolveProxy(oldDynamicProperty); + if (dynamicProperty != oldDynamicProperty) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, GenerictracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY, oldDynamicProperty, dynamicProperty)); + } + } + return dynamicProperty; + } + + /** + * + * + * @generated + */ + public EStructuralFeature basicGetDynamicProperty() { + return dynamicProperty; + } + + /** + * + * + * @generated + */ + public void setDynamicProperty(EStructuralFeature newDynamicProperty) { + EStructuralFeature oldDynamicProperty = dynamicProperty; + dynamicProperty = newDynamicProperty; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY, oldDynamicProperty, dynamicProperty)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: + if (resolve) return getDynamicProperty(); + return basicGetDynamicProperty(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: + setDynamicProperty((EStructuralFeature)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: + setDynamicProperty((EStructuralFeature)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.GENERIC_DIMENSION__DYNAMIC_PROPERTY: + return dynamicProperty != null; + } + return super.eIsSet(featureID); + } + +} //GenericDimensionImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java new file mode 100644 index 000000000..2b3c57b04 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Generic Parallel Step'. + * + * + * @generated + */ +public class GenericParallelStepImpl extends GenericStepImpl implements GenericParallelStep { + /** + * + * + * @generated + */ + protected GenericParallelStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_PARALLEL_STEP; + } + +} //GenericParallelStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java new file mode 100644 index 000000000..bedea2990 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java @@ -0,0 +1,156 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Generic Reference Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericReferenceValueImpl#getReferenceValue Reference Value}
    • + *
+ * + * @generated + */ +public class GenericReferenceValueImpl extends GenericValueImpl implements GenericReferenceValue { + /** + * The cached value of the '{@link #getReferenceValue() Reference Value}' reference. + * + * + * @see #getReferenceValue() + * @generated + * @ordered + */ + protected EObject referenceValue; + + /** + * + * + * @generated + */ + protected GenericReferenceValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_REFERENCE_VALUE; + } + + /** + * + * + * @generated + */ + public EObject getReferenceValue() { + if (referenceValue != null && referenceValue.eIsProxy()) { + InternalEObject oldReferenceValue = (InternalEObject)referenceValue; + referenceValue = eResolveProxy(oldReferenceValue); + if (referenceValue != oldReferenceValue) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); + } + } + return referenceValue; + } + + /** + * + * + * @generated + */ + public EObject basicGetReferenceValue() { + return referenceValue; + } + + /** + * + * + * @generated + */ + public void setReferenceValue(EObject newReferenceValue) { + EObject oldReferenceValue = referenceValue; + referenceValue = newReferenceValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: + if (resolve) return getReferenceValue(); + return basicGetReferenceValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: + setReferenceValue((EObject)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: + setReferenceValue((EObject)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: + return referenceValue != null; + } + return super.eIsSet(featureID); + } + +} //GenericReferenceValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java new file mode 100644 index 000000000..3a29f5954 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Generic Sequential Step'. + * + * + * @generated + */ +public class GenericSequentialStepImpl extends GenericStepImpl implements GenericSequentialStep { + /** + * + * + * @generated + */ + protected GenericSequentialStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_SEQUENTIAL_STEP; + } + +} //GenericSequentialStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java new file mode 100644 index 000000000..7576173c5 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Generic Small Step'. + * + * + * @generated + */ +public class GenericSmallStepImpl extends GenericStepImpl implements GenericSmallStep { + /** + * + * + * @generated + */ + protected GenericSmallStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_SMALL_STEP; + } + +} //GenericSmallStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStateImpl.java new file mode 100644 index 000000000..e9672ecca --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStateImpl.java @@ -0,0 +1,89 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericState; +import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.Value; + +import fr.inria.diverse.trace.commons.model.trace.impl.StateImpl; +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; + +/** + * + * An implementation of the model object 'Generic State'. + * + * + * @generated + */ +public class GenericStateImpl extends StateImpl implements GenericState { + /** + * + * + * @generated + */ + protected GenericStateImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_STATE; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getStartedSteps() { + if (startedSteps == null) { + startedSteps = new EObjectWithInverseResolvingEList(GenericStep.class, this, GenerictracePackage.GENERIC_STATE__STARTED_STEPS, TracePackage.STEP__STARTING_STATE) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return Step.class; } }; + } + return startedSteps; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getEndedSteps() { + if (endedSteps == null) { + endedSteps = new EObjectWithInverseResolvingEList(GenericStep.class, this, GenerictracePackage.GENERIC_STATE__ENDED_STEPS, TracePackage.STEP__ENDING_STATE) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return Step.class; } }; + } + return endedSteps; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getValues() { + if (values == null) { + values = new EObjectWithInverseResolvingEList.ManyInverse(GenericValue.class, this, GenerictracePackage.GENERIC_STATE__VALUES, TracePackage.VALUE__STATES) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return Value.class; } }; + } + return values; + } + +} //GenericStateImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStepImpl.java new file mode 100644 index 000000000..324d63dc9 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStepImpl.java @@ -0,0 +1,64 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericState; +import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.StepImpl; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Generic Step'. + * + * + * @generated + */ +public abstract class GenericStepImpl extends StepImpl implements GenericStep { + /** + * + * + * @generated + */ + protected GenericStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_STEP; + } + + /** + * + * + * This is specialized for the more specific type known in this context. + * @generated + */ + @Override + public NotificationChain basicSetStartingState(GenericState newStartingState, NotificationChain msgs) { + return super.basicSetStartingState(newStartingState, msgs); + } + + /** + * + * + * This is specialized for the more specific type known in this context. + * @generated + */ + @Override + public NotificationChain basicSetEndingState(GenericState newEndingState, NotificationChain msgs) { + return super.basicSetEndingState(newEndingState, msgs); + } + +} //GenericStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTraceImpl.java new file mode 100644 index 000000000..336923a2f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTraceImpl.java @@ -0,0 +1,87 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericState; +import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericTrace; +import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; + +/** + * + * An implementation of the model object 'Generic Trace'. + * + * + * @generated + */ +public class GenericTraceImpl extends TraceImpl implements GenericTrace { + /** + * + * + * @generated + */ + protected GenericTraceImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_TRACE; + } + + /** + * + * + * This is specialized for the more specific type known in this context. + * @generated + */ + @Override + public NotificationChain basicSetRootStep(StepSubType newRootStep, NotificationChain msgs) { + return super.basicSetRootStep(newRootStep, msgs); + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getTracedObjects() { + if (tracedObjects == null) { + tracedObjects = new EObjectContainmentEList(GenericTracedObject.class, this, GenerictracePackage.GENERIC_TRACE__TRACED_OBJECTS); + } + return tracedObjects; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getStates() { + if (states == null) { + states = new EObjectContainmentEList(GenericState.class, this, GenerictracePackage.GENERIC_TRACE__STATES); + } + return states; + } + +} //GenericTraceImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java new file mode 100644 index 000000000..584df8137 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java @@ -0,0 +1,39 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; +import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl; +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Generic Traced Object'. + * + * + * @generated + */ +public class GenericTracedObjectImpl extends TracedObjectImpl implements GenericTracedObject { + /** + * + * + * @generated + */ + protected GenericTracedObjectImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_TRACED_OBJECT; + } + +} //GenericTracedObjectImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericValueImpl.java new file mode 100644 index 000000000..b29eaad40 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericValueImpl.java @@ -0,0 +1,59 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenericState; +import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; + +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl; +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; + +/** + * + * An implementation of the model object 'Generic Value'. + * + * + * @generated + */ +public abstract class GenericValueImpl extends ValueImpl implements GenericValue { + /** + * + * + * @generated + */ + protected GenericValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.GENERIC_VALUE; + } + + /** + * + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList getStates() { + if (states == null) { + states = new EObjectWithInverseResolvingEList.ManyInverse(GenericState.class, this, GenerictracePackage.GENERIC_VALUE__STATES, TracePackage.STATE__VALUES) { private static final long serialVersionUID = 1L; @Override public Class getInverseFeatureClass() { return State.class; } }; + } + return states; + } + +} //GenericValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java new file mode 100644 index 000000000..81a3806fb --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java @@ -0,0 +1,254 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.*; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; + +/** + * + * An implementation of the model Factory. + * + * @generated + */ +public class GenerictraceFactoryImpl extends EFactoryImpl implements GenerictraceFactory { + /** + * Creates the default factory implementation. + * + * + * @generated + */ + public static GenerictraceFactory init() { + try { + GenerictraceFactory theGenerictraceFactory = (GenerictraceFactory)EPackage.Registry.INSTANCE.getEFactory(GenerictracePackage.eNS_URI); + if (theGenerictraceFactory != null) { + return theGenerictraceFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new GenerictraceFactoryImpl(); + } + + /** + * Creates an instance of the factory. + * + * + * @generated + */ + public GenerictraceFactoryImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case GenerictracePackage.GENERIC_SEQUENTIAL_STEP: return createGenericSequentialStep(); + case GenerictracePackage.GENERIC_PARALLEL_STEP: return createGenericParallelStep(); + case GenerictracePackage.GENERIC_SMALL_STEP: return createGenericSmallStep(); + case GenerictracePackage.GENERIC_REFERENCE_VALUE: return createGenericReferenceValue(); + case GenerictracePackage.GENERIC_DIMENSION: return createGenericDimension(); + case GenerictracePackage.GENERIC_TRACED_OBJECT: return createGenericTracedObject(); + case GenerictracePackage.GENERIC_STATE: return createGenericState(); + case GenerictracePackage.GENERIC_TRACE: return createGenericTrace(); + case GenerictracePackage.BOOLEAN_ATTRIBUTE_VALUE: return createBooleanAttributeValue(); + case GenerictracePackage.INTEGER_ATTRIBUTEVALUE: return createIntegerAttributevalue(); + case GenerictracePackage.STRING_ATTRIBUTE_VALUE: return createStringAttributeValue(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + @Override + public Object createFromString(EDataType eDataType, String initialValue) { + switch (eDataType.getClassifierID()) { + case GenerictracePackage.ISERIALIZABLE: + return createISerializableFromString(eDataType, initialValue); + default: + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + @Override + public String convertToString(EDataType eDataType, Object instanceValue) { + switch (eDataType.getClassifierID()) { + case GenerictracePackage.ISERIALIZABLE: + return convertISerializableToString(eDataType, instanceValue); + default: + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + public GenericSequentialStep createGenericSequentialStep() { + GenericSequentialStepImpl genericSequentialStep = new GenericSequentialStepImpl(); + return genericSequentialStep; + } + + /** + * + * + * @generated + */ + public GenericParallelStep createGenericParallelStep() { + GenericParallelStepImpl genericParallelStep = new GenericParallelStepImpl(); + return genericParallelStep; + } + + /** + * + * + * @generated + */ + public GenericSmallStep createGenericSmallStep() { + GenericSmallStepImpl genericSmallStep = new GenericSmallStepImpl(); + return genericSmallStep; + } + + /** + * + * + * @generated + */ + public GenericReferenceValue createGenericReferenceValue() { + GenericReferenceValueImpl genericReferenceValue = new GenericReferenceValueImpl(); + return genericReferenceValue; + } + + /** + * + * + * @generated + */ + public GenericDimension createGenericDimension() { + GenericDimensionImpl genericDimension = new GenericDimensionImpl(); + return genericDimension; + } + + /** + * + * + * @generated + */ + public GenericTracedObject createGenericTracedObject() { + GenericTracedObjectImpl genericTracedObject = new GenericTracedObjectImpl(); + return genericTracedObject; + } + + /** + * + * + * @generated + */ + public GenericState createGenericState() { + GenericStateImpl genericState = new GenericStateImpl(); + return genericState; + } + + /** + * + * + * @generated + */ + public GenericTrace createGenericTrace() { + GenericTraceImpl genericTrace = new GenericTraceImpl(); + return genericTrace; + } + + /** + * + * + * @generated + */ + public BooleanAttributeValue createBooleanAttributeValue() { + BooleanAttributeValueImpl booleanAttributeValue = new BooleanAttributeValueImpl(); + return booleanAttributeValue; + } + + /** + * + * + * @generated + */ + public IntegerAttributevalue createIntegerAttributevalue() { + IntegerAttributevalueImpl integerAttributevalue = new IntegerAttributevalueImpl(); + return integerAttributevalue; + } + + /** + * + * + * @generated + */ + public StringAttributeValue createStringAttributeValue() { + StringAttributeValueImpl stringAttributeValue = new StringAttributeValueImpl(); + return stringAttributeValue; + } + + /** + * + * + * @generated + */ + public byte[] createISerializableFromString(EDataType eDataType, String initialValue) { + return (byte[])super.createFromString(initialValue); + } + + /** + * + * + * @generated + */ + public String convertISerializableToString(EDataType eDataType, Object instanceValue) { + return super.convertToString(instanceValue); + } + + /** + * + * + * @generated + */ + public GenerictracePackage getGenerictracePackage() { + return (GenerictracePackage)getEPackage(); + } + + /** + * + * + * @deprecated + * @generated + */ + @Deprecated + public static GenerictracePackage getPackage() { + return GenerictracePackage.eINSTANCE; + } + +} //GenerictraceFactoryImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java new file mode 100644 index 000000000..2bdde26c5 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java @@ -0,0 +1,571 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; +import fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericState; +import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericTrace; +import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; +import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue; +import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; + +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EGenericType; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.ETypeParameter; +import org.eclipse.emf.ecore.EcorePackage; + +import org.eclipse.emf.ecore.impl.EPackageImpl; + +/** + * + * An implementation of the model Package. + * + * @generated + */ +public class GenerictracePackageImpl extends EPackageImpl implements GenerictracePackage { + /** + * + * + * @generated + */ + private EClass genericSequentialStepEClass = null; + + /** + * + * + * @generated + */ + private EClass genericParallelStepEClass = null; + + /** + * + * + * @generated + */ + private EClass genericSmallStepEClass = null; + + /** + * + * + * @generated + */ + private EClass genericReferenceValueEClass = null; + + /** + * + * + * @generated + */ + private EClass genericDimensionEClass = null; + + /** + * + * + * @generated + */ + private EClass genericTracedObjectEClass = null; + + /** + * + * + * @generated + */ + private EClass genericStateEClass = null; + + /** + * + * + * @generated + */ + private EClass genericTraceEClass = null; + + /** + * + * + * @generated + */ + private EClass genericAttributeValueEClass = null; + + /** + * + * + * @generated + */ + private EClass booleanAttributeValueEClass = null; + + /** + * + * + * @generated + */ + private EClass integerAttributevalueEClass = null; + + /** + * + * + * @generated + */ + private EClass stringAttributeValueEClass = null; + + /** + * + * + * @generated + */ + private EClass genericStepEClass = null; + + /** + * + * + * @generated + */ + private EClass genericValueEClass = null; + + /** + * + * + * @generated + */ + private EDataType iSerializableEDataType = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + *

Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * + * + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#eNS_URI + * @see #init() + * @generated + */ + private GenerictracePackageImpl() { + super(eNS_URI, GenerictraceFactory.eINSTANCE); + } + + /** + * + * + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * + *

This method is used to initialize {@link GenerictracePackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * + * + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static GenerictracePackage init() { + if (isInited) return (GenerictracePackage)EPackage.Registry.INSTANCE.getEPackage(GenerictracePackage.eNS_URI); + + // Obtain or create and register package + GenerictracePackageImpl theGenerictracePackage = (GenerictracePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof GenerictracePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new GenerictracePackageImpl()); + + isInited = true; + + // Initialize simple dependencies + TracePackage.eINSTANCE.eClass(); + + // Create package meta-data objects + theGenerictracePackage.createPackageContents(); + + // Initialize created meta-data + theGenerictracePackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theGenerictracePackage.freeze(); + + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(GenerictracePackage.eNS_URI, theGenerictracePackage); + return theGenerictracePackage; + } + + /** + * + * + * @generated + */ + public EClass getGenericSequentialStep() { + return genericSequentialStepEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericParallelStep() { + return genericParallelStepEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericSmallStep() { + return genericSmallStepEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericReferenceValue() { + return genericReferenceValueEClass; + } + + /** + * + * + * @generated + */ + public EReference getGenericReferenceValue_ReferenceValue() { + return (EReference)genericReferenceValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getGenericDimension() { + return genericDimensionEClass; + } + + /** + * + * + * @generated + */ + public EReference getGenericDimension_DynamicProperty() { + return (EReference)genericDimensionEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getGenericTracedObject() { + return genericTracedObjectEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericState() { + return genericStateEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericTrace() { + return genericTraceEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericAttributeValue() { + return genericAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EClass getBooleanAttributeValue() { + return booleanAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getBooleanAttributeValue_AttributeValue() { + return (EAttribute)booleanAttributeValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getIntegerAttributevalue() { + return integerAttributevalueEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getIntegerAttributevalue_AttributeValue() { + return (EAttribute)integerAttributevalueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getStringAttributeValue() { + return stringAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getStringAttributeValue_AttributeValue() { + return (EAttribute)stringAttributeValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getGenericStep() { + return genericStepEClass; + } + + /** + * + * + * @generated + */ + public EClass getGenericValue() { + return genericValueEClass; + } + + /** + * + * + * @generated + */ + public EDataType getISerializable() { + return iSerializableEDataType; + } + + /** + * + * + * @generated + */ + public GenerictraceFactory getGenerictraceFactory() { + return (GenerictraceFactory)getEFactoryInstance(); + } + + /** + * + * + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + genericSequentialStepEClass = createEClass(GENERIC_SEQUENTIAL_STEP); + + genericParallelStepEClass = createEClass(GENERIC_PARALLEL_STEP); + + genericSmallStepEClass = createEClass(GENERIC_SMALL_STEP); + + genericReferenceValueEClass = createEClass(GENERIC_REFERENCE_VALUE); + createEReference(genericReferenceValueEClass, GENERIC_REFERENCE_VALUE__REFERENCE_VALUE); + + genericDimensionEClass = createEClass(GENERIC_DIMENSION); + createEReference(genericDimensionEClass, GENERIC_DIMENSION__DYNAMIC_PROPERTY); + + genericTracedObjectEClass = createEClass(GENERIC_TRACED_OBJECT); + + genericStateEClass = createEClass(GENERIC_STATE); + + genericTraceEClass = createEClass(GENERIC_TRACE); + + genericAttributeValueEClass = createEClass(GENERIC_ATTRIBUTE_VALUE); + + booleanAttributeValueEClass = createEClass(BOOLEAN_ATTRIBUTE_VALUE); + createEAttribute(booleanAttributeValueEClass, BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + + integerAttributevalueEClass = createEClass(INTEGER_ATTRIBUTEVALUE); + createEAttribute(integerAttributevalueEClass, INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE); + + stringAttributeValueEClass = createEClass(STRING_ATTRIBUTE_VALUE); + createEAttribute(stringAttributeValueEClass, STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + + genericStepEClass = createEClass(GENERIC_STEP); + + genericValueEClass = createEClass(GENERIC_VALUE); + + // Create data types + iSerializableEDataType = createEDataType(ISERIALIZABLE); + } + + /** + * + * + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + TracePackage theTracePackage = (TracePackage)EPackage.Registry.INSTANCE.getEPackage(TracePackage.eNS_URI); + EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); + + // Create type parameters + ETypeParameter genericTraceEClass_StepSubType = addETypeParameter(genericTraceEClass, "StepSubType"); + + // Set bounds for type parameters + EGenericType g1 = createEGenericType(this.getGenericStep()); + genericTraceEClass_StepSubType.getEBounds().add(g1); + + // Add supertypes to classes + genericSequentialStepEClass.getESuperTypes().add(this.getGenericStep()); + genericParallelStepEClass.getESuperTypes().add(this.getGenericStep()); + genericSmallStepEClass.getESuperTypes().add(this.getGenericStep()); + genericReferenceValueEClass.getESuperTypes().add(this.getGenericValue()); + g1 = createEGenericType(theTracePackage.getDimension()); + EGenericType g2 = createEGenericType(this.getGenericValue()); + g1.getETypeArguments().add(g2); + genericDimensionEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theTracePackage.getTracedObject()); + g2 = createEGenericType(this.getGenericDimension()); + g1.getETypeArguments().add(g2); + genericTracedObjectEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theTracePackage.getState()); + g2 = createEGenericType(this.getGenericStep()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(this.getGenericValue()); + g1.getETypeArguments().add(g2); + genericStateEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theTracePackage.getTrace()); + g2 = createEGenericType(genericTraceEClass_StepSubType); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(this.getGenericTracedObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(this.getGenericState()); + g1.getETypeArguments().add(g2); + genericTraceEClass.getEGenericSuperTypes().add(g1); + genericAttributeValueEClass.getESuperTypes().add(this.getGenericValue()); + booleanAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); + integerAttributevalueEClass.getESuperTypes().add(this.getGenericAttributeValue()); + stringAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); + g1 = createEGenericType(theTracePackage.getStep()); + g2 = createEGenericType(this.getGenericState()); + g1.getETypeArguments().add(g2); + genericStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theTracePackage.getValue()); + g2 = createEGenericType(this.getGenericState()); + g1.getETypeArguments().add(g2); + genericValueEClass.getEGenericSuperTypes().add(g1); + + // Initialize classes, features, and operations; add parameters + initEClass(genericSequentialStepEClass, GenericSequentialStep.class, "GenericSequentialStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericParallelStepEClass, GenericParallelStep.class, "GenericParallelStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericSmallStepEClass, GenericSmallStep.class, "GenericSmallStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericReferenceValueEClass, GenericReferenceValue.class, "GenericReferenceValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getGenericReferenceValue_ReferenceValue(), ecorePackage.getEObject(), null, "referenceValue", null, 0, 1, GenericReferenceValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(genericDimensionEClass, GenericDimension.class, "GenericDimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getGenericDimension_DynamicProperty(), theEcorePackage.getEStructuralFeature(), null, "dynamicProperty", null, 0, 1, GenericDimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(genericTracedObjectEClass, GenericTracedObject.class, "GenericTracedObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericStateEClass, GenericState.class, "GenericState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericTraceEClass, GenericTrace.class, "GenericTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericAttributeValueEClass, GenericAttributeValue.class, "GenericAttributeValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(booleanAttributeValueEClass, BooleanAttributeValue.class, "BooleanAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getBooleanAttributeValue_AttributeValue(), ecorePackage.getEBoolean(), "attributeValue", "false", 0, 1, BooleanAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(integerAttributevalueEClass, IntegerAttributevalue.class, "IntegerAttributevalue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getIntegerAttributevalue_AttributeValue(), ecorePackage.getEInt(), "attributeValue", null, 0, 1, IntegerAttributevalue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(stringAttributeValueEClass, StringAttributeValue.class, "StringAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getStringAttributeValue_AttributeValue(), ecorePackage.getEString(), "attributeValue", null, 0, 1, StringAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(genericStepEClass, GenericStep.class, "GenericStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(genericValueEClass, GenericValue.class, "GenericValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + // Initialize data types + initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); + + // Create resource + createResource(eNS_URI); + } + +} //GenerictracePackageImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributevalueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributevalueImpl.java new file mode 100644 index 000000000..d3ea18899 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributevalueImpl.java @@ -0,0 +1,162 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Integer Attributevalue'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributevalueImpl#getAttributeValue Attribute Value}
    • + *
+ * + * @generated + */ +public class IntegerAttributevalueImpl extends GenericAttributeValueImpl implements IntegerAttributevalue { + /** + * The default value of the '{@link #getAttributeValue() Attribute Value}' attribute. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected static final int ATTRIBUTE_VALUE_EDEFAULT = 0; + + /** + * The cached value of the '{@link #getAttributeValue() Attribute Value}' attribute. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected int attributeValue = ATTRIBUTE_VALUE_EDEFAULT; + + /** + * + * + * @generated + */ + protected IntegerAttributevalueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.INTEGER_ATTRIBUTEVALUE; + } + + /** + * + * + * @generated + */ + public int getAttributeValue() { + return attributeValue; + } + + /** + * + * + * @generated + */ + public void setAttributeValue(int newAttributeValue) { + int oldAttributeValue = attributeValue; + attributeValue = newAttributeValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + return getAttributeValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + setAttributeValue((Integer)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + return attributeValue != ATTRIBUTE_VALUE_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeValue: "); + result.append(attributeValue); + result.append(')'); + return result.toString(); + } + +} //IntegerAttributevalueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java new file mode 100644 index 000000000..288965aef --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java @@ -0,0 +1,162 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'String Attribute Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl#getAttributeValue Attribute Value}
    • + *
+ * + * @generated + */ +public class StringAttributeValueImpl extends GenericAttributeValueImpl implements StringAttributeValue { + /** + * The default value of the '{@link #getAttributeValue() Attribute Value}' attribute. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected static final String ATTRIBUTE_VALUE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAttributeValue() Attribute Value}' attribute. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected String attributeValue = ATTRIBUTE_VALUE_EDEFAULT; + + /** + * + * + * @generated + */ + protected StringAttributeValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.STRING_ATTRIBUTE_VALUE; + } + + /** + * + * + * @generated + */ + public String getAttributeValue() { + return attributeValue; + } + + /** + * + * + * @generated + */ + public void setAttributeValue(String newAttributeValue) { + String oldAttributeValue = attributeValue; + attributeValue = newAttributeValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return getAttributeValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + setAttributeValue((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return ATTRIBUTE_VALUE_EDEFAULT == null ? attributeValue != null : !ATTRIBUTE_VALUE_EDEFAULT.equals(attributeValue); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeValue: "); + result.append(attributeValue); + result.append(')'); + return result.toString(); + } + +} //StringAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java new file mode 100644 index 000000000..5120ad768 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java @@ -0,0 +1,469 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.util; + +import fr.inria.diverse.trace.commons.model.generictrace.*; + +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * The Adapter Factory for the model. + * It provides an adapter createXXX method for each class of the model. + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage + * @generated + */ +public class GenerictraceAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + * + * + * @generated + */ + protected static GenerictracePackage modelPackage; + + /** + * Creates an instance of the adapter factory. + * + * + * @generated + */ + public GenerictraceAdapterFactory() { + if (modelPackage == null) { + modelPackage = GenerictracePackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + * + * This implementation returns true if the object is either the model's package or is an instance object of the model. + * + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the createXXX methods. + * + * + * @generated + */ + protected GenerictraceSwitch modelSwitch = + new GenerictraceSwitch() { + @Override + public Adapter caseGenericSequentialStep(GenericSequentialStep object) { + return createGenericSequentialStepAdapter(); + } + @Override + public Adapter caseGenericParallelStep(GenericParallelStep object) { + return createGenericParallelStepAdapter(); + } + @Override + public Adapter caseGenericSmallStep(GenericSmallStep object) { + return createGenericSmallStepAdapter(); + } + @Override + public Adapter caseGenericReferenceValue(GenericReferenceValue object) { + return createGenericReferenceValueAdapter(); + } + @Override + public Adapter caseGenericDimension(GenericDimension object) { + return createGenericDimensionAdapter(); + } + @Override + public Adapter caseGenericTracedObject(GenericTracedObject object) { + return createGenericTracedObjectAdapter(); + } + @Override + public Adapter caseGenericState(GenericState object) { + return createGenericStateAdapter(); + } + @Override + public Adapter caseGenericTrace(GenericTrace object) { + return createGenericTraceAdapter(); + } + @Override + public Adapter caseGenericAttributeValue(GenericAttributeValue object) { + return createGenericAttributeValueAdapter(); + } + @Override + public Adapter caseBooleanAttributeValue(BooleanAttributeValue object) { + return createBooleanAttributeValueAdapter(); + } + @Override + public Adapter caseIntegerAttributevalue(IntegerAttributevalue object) { + return createIntegerAttributevalueAdapter(); + } + @Override + public Adapter caseStringAttributeValue(StringAttributeValue object) { + return createStringAttributeValueAdapter(); + } + @Override + public Adapter caseGenericStep(GenericStep object) { + return createGenericStepAdapter(); + } + @Override + public Adapter caseGenericValue(GenericValue object) { + return createGenericValueAdapter(); + } + @Override + public > Adapter caseStep(Step object) { + return createStepAdapter(); + } + @Override + public > Adapter caseValue(Value object) { + return createValueAdapter(); + } + @Override + public > Adapter caseDimension(Dimension object) { + return createDimensionAdapter(); + } + @Override + public > Adapter caseTracedObject(TracedObject object) { + return createTracedObjectAdapter(); + } + @Override + public , ValueSubType extends Value> Adapter caseState(State object) { + return createStateAdapter(); + } + @Override + public , TracedObjectSubtype extends TracedObject, StateSubType extends State> Adapter caseTrace(Trace object) { + return createTraceAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the target. + * + * + * @param target the object to adapt. + * @return the adapter for the target. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep Generic Sequential Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep + * @generated + */ + public Adapter createGenericSequentialStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep Generic Parallel Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep + * @generated + */ + public Adapter createGenericParallelStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep Generic Small Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep + * @generated + */ + public Adapter createGenericSmallStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue Generic Reference Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue + * @generated + */ + public Adapter createGenericReferenceValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension Generic Dimension}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericDimension + * @generated + */ + public Adapter createGenericDimensionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject Generic Traced Object}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject + * @generated + */ + public Adapter createGenericTracedObjectAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericState Generic State}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericState + * @generated + */ + public Adapter createGenericStateAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTrace Generic Trace}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTrace + * @generated + */ + public Adapter createGenericTraceAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue Generic Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue + * @generated + */ + public Adapter createGenericAttributeValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue Boolean Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue + * @generated + */ + public Adapter createBooleanAttributeValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue Integer Attributevalue}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue + * @generated + */ + public Adapter createIntegerAttributevalueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue String Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue + * @generated + */ + public Adapter createStringAttributeValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericStep Generic Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericStep + * @generated + */ + public Adapter createGenericStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericValue Generic Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericValue + * @generated + */ + public Adapter createGenericValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Step + * @generated + */ + public Adapter createStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Value + * @generated + */ + public Adapter createValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Dimension + * @generated + */ + public Adapter createDimensionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.TracedObject + * @generated + */ + public Adapter createTracedObjectAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.State + * @generated + */ + public Adapter createStateAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Trace + * @generated + */ + public Adapter createTraceAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + * + * This default implementation returns null. + * + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //GenerictraceAdapterFactory diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java new file mode 100644 index 000000000..5d0c38ff4 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java @@ -0,0 +1,505 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.util; + +import fr.inria.diverse.trace.commons.model.generictrace.*; + +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; + +/** + * + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the caseXXX method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage + * @generated + */ +public class GenerictraceSwitch extends Switch { + /** + * The cached model package + * + * + * @generated + */ + protected static GenerictracePackage modelPackage; + + /** + * Creates an instance of the switch. + * + * + * @generated + */ + public GenerictraceSwitch() { + if (modelPackage == null) { + modelPackage = GenerictracePackage.eINSTANCE; + } + } + + /** + * Checks whether this is a switch for the given package. + * + * + * @param ePackage the package in question. + * @return whether this is a switch for the given package. + * @generated + */ + @Override + protected boolean isSwitchFor(EPackage ePackage) { + return ePackage == modelPackage; + } + + /** + * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * + * + * @return the first non-null result returned by a caseXXX call. + * @generated + */ + @Override + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case GenerictracePackage.GENERIC_SEQUENTIAL_STEP: { + GenericSequentialStep genericSequentialStep = (GenericSequentialStep)theEObject; + T result = caseGenericSequentialStep(genericSequentialStep); + if (result == null) result = caseGenericStep(genericSequentialStep); + if (result == null) result = caseStep(genericSequentialStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.GENERIC_PARALLEL_STEP: { + GenericParallelStep genericParallelStep = (GenericParallelStep)theEObject; + T result = caseGenericParallelStep(genericParallelStep); + if (result == null) result = caseGenericStep(genericParallelStep); + if (result == null) result = caseStep(genericParallelStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.GENERIC_SMALL_STEP: { + GenericSmallStep genericSmallStep = (GenericSmallStep)theEObject; + T result = caseGenericSmallStep(genericSmallStep); + if (result == null) result = caseGenericStep(genericSmallStep); + if (result == null) result = caseStep(genericSmallStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.GENERIC_REFERENCE_VALUE: { + GenericReferenceValue genericReferenceValue = (GenericReferenceValue)theEObject; + T result = caseGenericReferenceValue(genericReferenceValue); + if (result == null) result = caseGenericValue(genericReferenceValue); + if (result == null) result = caseValue(genericReferenceValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.GENERIC_DIMENSION: { + GenericDimension genericDimension = (GenericDimension)theEObject; + T result = caseGenericDimension(genericDimension); + if (result == null) result = caseDimension(genericDimension); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.GENERIC_TRACED_OBJECT: { + GenericTracedObject genericTracedObject = (GenericTracedObject)theEObject; + T result = caseGenericTracedObject(genericTracedObject); + if (result == null) result = caseTracedObject(genericTracedObject); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.GENERIC_STATE: { + GenericState genericState = (GenericState)theEObject; + T result = caseGenericState(genericState); + if (result == null) result = caseState(genericState); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.GENERIC_TRACE: { + GenericTrace genericTrace = (GenericTrace)theEObject; + T result = caseGenericTrace(genericTrace); + if (result == null) result = caseTrace(genericTrace); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.GENERIC_ATTRIBUTE_VALUE: { + GenericAttributeValue genericAttributeValue = (GenericAttributeValue)theEObject; + T result = caseGenericAttributeValue(genericAttributeValue); + if (result == null) result = caseGenericValue(genericAttributeValue); + if (result == null) result = caseValue(genericAttributeValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.BOOLEAN_ATTRIBUTE_VALUE: { + BooleanAttributeValue booleanAttributeValue = (BooleanAttributeValue)theEObject; + T result = caseBooleanAttributeValue(booleanAttributeValue); + if (result == null) result = caseGenericAttributeValue(booleanAttributeValue); + if (result == null) result = caseGenericValue(booleanAttributeValue); + if (result == null) result = caseValue(booleanAttributeValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.INTEGER_ATTRIBUTEVALUE: { + IntegerAttributevalue integerAttributevalue = (IntegerAttributevalue)theEObject; + T result = caseIntegerAttributevalue(integerAttributevalue); + if (result == null) result = caseGenericAttributeValue(integerAttributevalue); + if (result == null) result = caseGenericValue(integerAttributevalue); + if (result == null) result = caseValue(integerAttributevalue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.STRING_ATTRIBUTE_VALUE: { + StringAttributeValue stringAttributeValue = (StringAttributeValue)theEObject; + T result = caseStringAttributeValue(stringAttributeValue); + if (result == null) result = caseGenericAttributeValue(stringAttributeValue); + if (result == null) result = caseGenericValue(stringAttributeValue); + if (result == null) result = caseValue(stringAttributeValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.GENERIC_STEP: { + GenericStep genericStep = (GenericStep)theEObject; + T result = caseGenericStep(genericStep); + if (result == null) result = caseStep(genericStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.GENERIC_VALUE: { + GenericValue genericValue = (GenericValue)theEObject; + T result = caseGenericValue(genericValue); + if (result == null) result = caseValue(genericValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Sequential Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Sequential Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericSequentialStep(GenericSequentialStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Parallel Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Parallel Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericParallelStep(GenericParallelStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Small Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Small Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericSmallStep(GenericSmallStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Reference Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Reference Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericReferenceValue(GenericReferenceValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Dimension'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Dimension'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericDimension(GenericDimension object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Traced Object'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Traced Object'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericTracedObject(GenericTracedObject object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic State'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic State'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericState(GenericState object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Trace'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Trace'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericTrace(GenericTrace object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericAttributeValue(GenericAttributeValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Boolean Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Boolean Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseBooleanAttributeValue(BooleanAttributeValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Integer Attributevalue'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Integer Attributevalue'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseIntegerAttributevalue(IntegerAttributevalue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'String Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'String Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseStringAttributeValue(StringAttributeValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericStep(GenericStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericValue(GenericValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public > T caseStep(Step object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public > T caseValue(Value object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Dimension'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Dimension'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public > T caseDimension(Dimension object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Traced Object'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Traced Object'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public > T caseTracedObject(TracedObject object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'State'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'State'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , ValueSubType extends Value> T caseState(State object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Trace'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Trace'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , TracedObjectSubtype extends TracedObject, StateSubType extends State> T caseTrace(Trace object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + @Override + public T defaultCase(EObject object) { + return null; + } + +} //GenerictraceSwitch diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AddonExtensionParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AddonExtensionParameter.java new file mode 100644 index 000000000..89c523034 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AddonExtensionParameter.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + + +/** + * + * A representation of the model object 'Addon Extension Parameter'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getAddonExtensionParameter() + * @model + * @generated + */ +public interface AddonExtensionParameter extends LaunchConfigurationParameter { +} // AddonExtensionParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AnimatorURIParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AnimatorURIParameter.java new file mode 100644 index 000000000..6a58c66fb --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AnimatorURIParameter.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + + +/** + * + * A representation of the model object 'Animator URI Parameter'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getAnimatorURIParameter() + * @model + * @generated + */ +public interface AnimatorURIParameter extends LaunchConfigurationParameter { +} // AnimatorURIParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/EntryPointParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/EntryPointParameter.java new file mode 100644 index 000000000..254fe8a2a --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/EntryPointParameter.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + + +/** + * + * A representation of the model object 'Entry Point Parameter'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getEntryPointParameter() + * @model + * @generated + */ +public interface EntryPointParameter extends LaunchConfigurationParameter { +} // EntryPointParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java new file mode 100644 index 000000000..8c03f8ba6 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + + +/** + * + * A representation of the model object 'Initialization Arguments Parameter'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getInitializationArgumentsParameter() + * @model + * @generated + */ +public interface InitializationArgumentsParameter extends LaunchConfigurationParameter { +} // InitializationArgumentsParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationMethodParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationMethodParameter.java new file mode 100644 index 000000000..54d108515 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationMethodParameter.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + + +/** + * + * A representation of the model object 'Initialization Method Parameter'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getInitializationMethodParameter() + * @model + * @generated + */ +public interface InitializationMethodParameter extends LaunchConfigurationParameter { +} // InitializationMethodParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LanguageNameParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LanguageNameParameter.java new file mode 100644 index 000000000..da4ecaf00 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LanguageNameParameter.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + + +/** + * + * A representation of the model object 'Language Name Parameter'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLanguageNameParameter() + * @model + * @generated + */ +public interface LanguageNameParameter extends LaunchConfigurationParameter { +} // LanguageNameParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfiguration.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfiguration.java new file mode 100644 index 000000000..900ca633b --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfiguration.java @@ -0,0 +1,69 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Launch Configuration'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getParameters Parameters}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getType Type}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfiguration() + * @model + * @generated + */ +public interface LaunchConfiguration extends EObject { + /** + * Returns the value of the 'Parameters' containment reference list. + * The list contents are of type {@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter}. + * + *

+ * If the meaning of the 'Parameters' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Parameters' containment reference list. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfiguration_Parameters() + * @model containment="true" + * @generated + */ + EList getParameters(); + + /** + * Returns the value of the 'Type' attribute. + * + *

+ * If the meaning of the 'Type' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Type' attribute. + * @see #setType(String) + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfiguration_Type() + * @model required="true" + * @generated + */ + String getType(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getType Type}' attribute. + * + * + * @param value the new value of the 'Type' attribute. + * @see #getType() + * @generated + */ + void setType(String value); + +} // LaunchConfiguration diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java new file mode 100644 index 000000000..445cb3a1f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java @@ -0,0 +1,51 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Launch Configuration Parameter'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfigurationParameter() + * @model abstract="true" + * @generated + */ +public interface LaunchConfigurationParameter extends EObject { + /** + * Returns the value of the 'Value' attribute. + * The default value is "". + * + *

+ * If the meaning of the 'Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Value' attribute. + * @see #setValue(String) + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfigurationParameter_Value() + * @model default="" + * @generated + */ + String getValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue Value}' attribute. + * + * + * @param value the new value of the 'Value' attribute. + * @see #getValue() + * @generated + */ + void setValue(String value); + +} // LaunchConfigurationParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java new file mode 100644 index 000000000..b9aaa08ea --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java @@ -0,0 +1,114 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + +import org.eclipse.emf.ecore.EFactory; + +/** + * + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage + * @generated + */ +public interface LaunchconfigurationFactory extends EFactory { + /** + * The singleton instance of the factory. + * + * + * @generated + */ + LaunchconfigurationFactory eINSTANCE = fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationFactoryImpl.init(); + + /** + * Returns a new object of class 'Launch Configuration'. + * + * + * @return a new object of class 'Launch Configuration'. + * @generated + */ + LaunchConfiguration createLaunchConfiguration(); + + /** + * Returns a new object of class 'Language Name Parameter'. + * + * + * @return a new object of class 'Language Name Parameter'. + * @generated + */ + LanguageNameParameter createLanguageNameParameter(); + + /** + * Returns a new object of class 'Addon Extension Parameter'. + * + * + * @return a new object of class 'Addon Extension Parameter'. + * @generated + */ + AddonExtensionParameter createAddonExtensionParameter(); + + /** + * Returns a new object of class 'Model URI Parameter'. + * + * + * @return a new object of class 'Model URI Parameter'. + * @generated + */ + ModelURIParameter createModelURIParameter(); + + /** + * Returns a new object of class 'Animator URI Parameter'. + * + * + * @return a new object of class 'Animator URI Parameter'. + * @generated + */ + AnimatorURIParameter createAnimatorURIParameter(); + + /** + * Returns a new object of class 'Entry Point Parameter'. + * + * + * @return a new object of class 'Entry Point Parameter'. + * @generated + */ + EntryPointParameter createEntryPointParameter(); + + /** + * Returns a new object of class 'Initialization Arguments Parameter'. + * + * + * @return a new object of class 'Initialization Arguments Parameter'. + * @generated + */ + InitializationArgumentsParameter createInitializationArgumentsParameter(); + + /** + * Returns a new object of class 'Model Root Parameter'. + * + * + * @return a new object of class 'Model Root Parameter'. + * @generated + */ + ModelRootParameter createModelRootParameter(); + + /** + * Returns a new object of class 'Initialization Method Parameter'. + * + * + * @return a new object of class 'Initialization Method Parameter'. + * @generated + */ + InitializationMethodParameter createInitializationMethodParameter(); + + /** + * Returns the package supported by this factory. + * + * + * @return the package supported by this factory. + * @generated + */ + LaunchconfigurationPackage getLaunchconfigurationPackage(); + +} //LaunchconfigurationFactory diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java new file mode 100644 index 000000000..e4da29ea2 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java @@ -0,0 +1,750 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +/** + * + * The Package for the model. + * It contains accessors for the meta objects to represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationFactory + * @model kind="package" + * @generated + */ +public interface LaunchconfigurationPackage extends EPackage { + /** + * The package name. + * + * + * @generated + */ + String eNAME = "launchconfiguration"; + + /** + * The package namespace URI. + * + * + * @generated + */ + String eNS_URI = "http://www.gemoc.org/launch_configuration"; + + /** + * The package namespace name. + * + * + * @generated + */ + String eNS_PREFIX = "launchconfiguration"; + + /** + * The singleton instance of the package. + * + * + * @generated + */ + LaunchconfigurationPackage eINSTANCE = fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl.init(); + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl Launch Configuration}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfiguration() + * @generated + */ + int LAUNCH_CONFIGURATION = 0; + + /** + * The feature id for the 'Parameters' containment reference list. + * + * + * @generated + * @ordered + */ + int LAUNCH_CONFIGURATION__PARAMETERS = 0; + + /** + * The feature id for the 'Type' attribute. + * + * + * @generated + * @ordered + */ + int LAUNCH_CONFIGURATION__TYPE = 1; + + /** + * The number of structural features of the 'Launch Configuration' class. + * + * + * @generated + * @ordered + */ + int LAUNCH_CONFIGURATION_FEATURE_COUNT = 2; + + /** + * The number of operations of the 'Launch Configuration' class. + * + * + * @generated + * @ordered + */ + int LAUNCH_CONFIGURATION_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl Launch Configuration Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfigurationParameter() + * @generated + */ + int LAUNCH_CONFIGURATION_PARAMETER = 1; + + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int LAUNCH_CONFIGURATION_PARAMETER__VALUE = 0; + + /** + * The number of structural features of the 'Launch Configuration Parameter' class. + * + * + * @generated + * @ordered + */ + int LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT = 1; + + /** + * The number of operations of the 'Launch Configuration Parameter' class. + * + * + * @generated + * @ordered + */ + int LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl Language Name Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLanguageNameParameter() + * @generated + */ + int LANGUAGE_NAME_PARAMETER = 2; + + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int LANGUAGE_NAME_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + + /** + * The number of structural features of the 'Language Name Parameter' class. + * + * + * @generated + * @ordered + */ + int LANGUAGE_NAME_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Language Name Parameter' class. + * + * + * @generated + * @ordered + */ + int LANGUAGE_NAME_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAddonExtensionParameter() + * @generated + */ + int ADDON_EXTENSION_PARAMETER = 3; + + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int ADDON_EXTENSION_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + + /** + * The number of structural features of the 'Addon Extension Parameter' class. + * + * + * @generated + * @ordered + */ + int ADDON_EXTENSION_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Addon Extension Parameter' class. + * + * + * @generated + * @ordered + */ + int ADDON_EXTENSION_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl Model URI Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelURIParameter() + * @generated + */ + int MODEL_URI_PARAMETER = 4; + + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int MODEL_URI_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + + /** + * The number of structural features of the 'Model URI Parameter' class. + * + * + * @generated + * @ordered + */ + int MODEL_URI_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Model URI Parameter' class. + * + * + * @generated + * @ordered + */ + int MODEL_URI_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl Animator URI Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAnimatorURIParameter() + * @generated + */ + int ANIMATOR_URI_PARAMETER = 5; + + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int ANIMATOR_URI_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + + /** + * The number of structural features of the 'Animator URI Parameter' class. + * + * + * @generated + * @ordered + */ + int ANIMATOR_URI_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Animator URI Parameter' class. + * + * + * @generated + * @ordered + */ + int ANIMATOR_URI_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl Entry Point Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getEntryPointParameter() + * @generated + */ + int ENTRY_POINT_PARAMETER = 6; + + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int ENTRY_POINT_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + + /** + * The number of structural features of the 'Entry Point Parameter' class. + * + * + * @generated + * @ordered + */ + int ENTRY_POINT_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Entry Point Parameter' class. + * + * + * @generated + * @ordered + */ + int ENTRY_POINT_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationArgumentsParameter() + * @generated + */ + int INITIALIZATION_ARGUMENTS_PARAMETER = 7; + + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_ARGUMENTS_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + + /** + * The number of structural features of the 'Initialization Arguments Parameter' class. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_ARGUMENTS_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Initialization Arguments Parameter' class. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_ARGUMENTS_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl Model Root Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelRootParameter() + * @generated + */ + int MODEL_ROOT_PARAMETER = 8; + + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int MODEL_ROOT_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + + /** + * The number of structural features of the 'Model Root Parameter' class. + * + * + * @generated + * @ordered + */ + int MODEL_ROOT_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Model Root Parameter' class. + * + * + * @generated + * @ordered + */ + int MODEL_ROOT_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl Initialization Method Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationMethodParameter() + * @generated + */ + int INITIALIZATION_METHOD_PARAMETER = 9; + + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_METHOD_PARAMETER__VALUE = LAUNCH_CONFIGURATION_PARAMETER__VALUE; + + /** + * The number of structural features of the 'Initialization Method Parameter' class. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_METHOD_PARAMETER_FEATURE_COUNT = LAUNCH_CONFIGURATION_PARAMETER_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Initialization Method Parameter' class. + * + * + * @generated + * @ordered + */ + int INITIALIZATION_METHOD_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; + + /** + * The meta object id for the 'ISerializable' data type. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getISerializable() + * @generated + */ + int ISERIALIZABLE = 10; + + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration Launch Configuration}'. + * + * + * @return the meta object for class 'Launch Configuration'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration + * @generated + */ + EClass getLaunchConfiguration(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getParameters Parameters}'. + * + * + * @return the meta object for the containment reference list 'Parameters'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getParameters() + * @see #getLaunchConfiguration() + * @generated + */ + EReference getLaunchConfiguration_Parameters(); + + /** + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getType Type}'. + * + * + * @return the meta object for the attribute 'Type'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getType() + * @see #getLaunchConfiguration() + * @generated + */ + EAttribute getLaunchConfiguration_Type(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter Launch Configuration Parameter}'. + * + * + * @return the meta object for class 'Launch Configuration Parameter'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter + * @generated + */ + EClass getLaunchConfigurationParameter(); + + /** + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue Value}'. + * + * + * @return the meta object for the attribute 'Value'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue() + * @see #getLaunchConfigurationParameter() + * @generated + */ + EAttribute getLaunchConfigurationParameter_Value(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter Language Name Parameter}'. + * + * + * @return the meta object for class 'Language Name Parameter'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter + * @generated + */ + EClass getLanguageNameParameter(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter Addon Extension Parameter}'. + * + * + * @return the meta object for class 'Addon Extension Parameter'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter + * @generated + */ + EClass getAddonExtensionParameter(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter Model URI Parameter}'. + * + * + * @return the meta object for class 'Model URI Parameter'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter + * @generated + */ + EClass getModelURIParameter(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter Animator URI Parameter}'. + * + * + * @return the meta object for class 'Animator URI Parameter'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter + * @generated + */ + EClass getAnimatorURIParameter(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter Entry Point Parameter}'. + * + * + * @return the meta object for class 'Entry Point Parameter'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter + * @generated + */ + EClass getEntryPointParameter(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter Initialization Arguments Parameter}'. + * + * + * @return the meta object for class 'Initialization Arguments Parameter'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter + * @generated + */ + EClass getInitializationArgumentsParameter(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter Model Root Parameter}'. + * + * + * @return the meta object for class 'Model Root Parameter'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter + * @generated + */ + EClass getModelRootParameter(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter Initialization Method Parameter}'. + * + * + * @return the meta object for class 'Initialization Method Parameter'. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter + * @generated + */ + EClass getInitializationMethodParameter(); + + /** + * Returns the meta object for data type 'ISerializable'. + * + * + * @return the meta object for data type 'ISerializable'. + * @model instanceClass="byte[]" + * @generated + */ + EDataType getISerializable(); + + /** + * Returns the factory that creates the instances of the model. + * + * + * @return the factory that creates the instances of the model. + * @generated + */ + LaunchconfigurationFactory getLaunchconfigurationFactory(); + + /** + * + * Defines literals for the meta objects that represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl Launch Configuration}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfiguration() + * @generated + */ + EClass LAUNCH_CONFIGURATION = eINSTANCE.getLaunchConfiguration(); + + /** + * The meta object literal for the 'Parameters' containment reference list feature. + * + * + * @generated + */ + EReference LAUNCH_CONFIGURATION__PARAMETERS = eINSTANCE.getLaunchConfiguration_Parameters(); + + /** + * The meta object literal for the 'Type' attribute feature. + * + * + * @generated + */ + EAttribute LAUNCH_CONFIGURATION__TYPE = eINSTANCE.getLaunchConfiguration_Type(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl Launch Configuration Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfigurationParameter() + * @generated + */ + EClass LAUNCH_CONFIGURATION_PARAMETER = eINSTANCE.getLaunchConfigurationParameter(); + + /** + * The meta object literal for the 'Value' attribute feature. + * + * + * @generated + */ + EAttribute LAUNCH_CONFIGURATION_PARAMETER__VALUE = eINSTANCE.getLaunchConfigurationParameter_Value(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl Language Name Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLanguageNameParameter() + * @generated + */ + EClass LANGUAGE_NAME_PARAMETER = eINSTANCE.getLanguageNameParameter(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAddonExtensionParameter() + * @generated + */ + EClass ADDON_EXTENSION_PARAMETER = eINSTANCE.getAddonExtensionParameter(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl Model URI Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelURIParameter() + * @generated + */ + EClass MODEL_URI_PARAMETER = eINSTANCE.getModelURIParameter(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl Animator URI Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAnimatorURIParameter() + * @generated + */ + EClass ANIMATOR_URI_PARAMETER = eINSTANCE.getAnimatorURIParameter(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl Entry Point Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getEntryPointParameter() + * @generated + */ + EClass ENTRY_POINT_PARAMETER = eINSTANCE.getEntryPointParameter(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationArgumentsParameter() + * @generated + */ + EClass INITIALIZATION_ARGUMENTS_PARAMETER = eINSTANCE.getInitializationArgumentsParameter(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl Model Root Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelRootParameter() + * @generated + */ + EClass MODEL_ROOT_PARAMETER = eINSTANCE.getModelRootParameter(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl Initialization Method Parameter}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationMethodParameter() + * @generated + */ + EClass INITIALIZATION_METHOD_PARAMETER = eINSTANCE.getInitializationMethodParameter(); + + /** + * The meta object literal for the 'ISerializable' data type. + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getISerializable() + * @generated + */ + EDataType ISERIALIZABLE = eINSTANCE.getISerializable(); + + } + +} //LaunchconfigurationPackage diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelRootParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelRootParameter.java new file mode 100644 index 000000000..bb90483df --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelRootParameter.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + + +/** + * + * A representation of the model object 'Model Root Parameter'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getModelRootParameter() + * @model + * @generated + */ +public interface ModelRootParameter extends LaunchConfigurationParameter { +} // ModelRootParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelURIParameter.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelURIParameter.java new file mode 100644 index 000000000..8633e500e --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelURIParameter.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration; + + +/** + * + * A representation of the model object 'Model URI Parameter'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getModelURIParameter() + * @model + * @generated + */ +public interface ModelURIParameter extends LaunchConfigurationParameter { +} // ModelURIParameter diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java new file mode 100644 index 000000000..fdbf92e9a --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Addon Extension Parameter'. + * + * + * @generated + */ +public class AddonExtensionParameterImpl extends LaunchConfigurationParameterImpl implements AddonExtensionParameter { + /** + * + * + * @generated + */ + protected AddonExtensionParameterImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LaunchconfigurationPackage.Literals.ADDON_EXTENSION_PARAMETER; + } + +} //AddonExtensionParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java new file mode 100644 index 000000000..5b0f506a7 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Animator URI Parameter'. + * + * + * @generated + */ +public class AnimatorURIParameterImpl extends LaunchConfigurationParameterImpl implements AnimatorURIParameter { + /** + * + * + * @generated + */ + protected AnimatorURIParameterImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LaunchconfigurationPackage.Literals.ANIMATOR_URI_PARAMETER; + } + +} //AnimatorURIParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java new file mode 100644 index 000000000..c79f3ad3b --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Entry Point Parameter'. + * + * + * @generated + */ +public class EntryPointParameterImpl extends LaunchConfigurationParameterImpl implements EntryPointParameter { + /** + * + * + * @generated + */ + protected EntryPointParameterImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LaunchconfigurationPackage.Literals.ENTRY_POINT_PARAMETER; + } + +} //EntryPointParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java new file mode 100644 index 000000000..5dc339144 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Initialization Arguments Parameter'. + * + * + * @generated + */ +public class InitializationArgumentsParameterImpl extends LaunchConfigurationParameterImpl implements InitializationArgumentsParameter { + /** + * + * + * @generated + */ + protected InitializationArgumentsParameterImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LaunchconfigurationPackage.Literals.INITIALIZATION_ARGUMENTS_PARAMETER; + } + +} //InitializationArgumentsParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java new file mode 100644 index 000000000..d6c030e42 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Initialization Method Parameter'. + * + * + * @generated + */ +public class InitializationMethodParameterImpl extends LaunchConfigurationParameterImpl implements InitializationMethodParameter { + /** + * + * + * @generated + */ + protected InitializationMethodParameterImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LaunchconfigurationPackage.Literals.INITIALIZATION_METHOD_PARAMETER; + } + +} //InitializationMethodParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java new file mode 100644 index 000000000..2a864539a --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Language Name Parameter'. + * + * + * @generated + */ +public class LanguageNameParameterImpl extends LaunchConfigurationParameterImpl implements LanguageNameParameter { + /** + * + * + * @generated + */ + protected LanguageNameParameterImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LaunchconfigurationPackage.Literals.LANGUAGE_NAME_PARAMETER; + } + +} //LanguageNameParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java new file mode 100644 index 000000000..bd1fda082 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java @@ -0,0 +1,222 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Launch Configuration'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl#getParameters Parameters}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl#getType Type}
    • + *
+ * + * @generated + */ +public class LaunchConfigurationImpl extends MinimalEObjectImpl.Container implements LaunchConfiguration { + /** + * The cached value of the '{@link #getParameters() Parameters}' containment reference list. + * + * + * @see #getParameters() + * @generated + * @ordered + */ + protected EList parameters; + + /** + * The default value of the '{@link #getType() Type}' attribute. + * + * + * @see #getType() + * @generated + * @ordered + */ + protected static final String TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getType() Type}' attribute. + * + * + * @see #getType() + * @generated + * @ordered + */ + protected String type = TYPE_EDEFAULT; + + /** + * + * + * @generated + */ + protected LaunchConfigurationImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LaunchconfigurationPackage.Literals.LAUNCH_CONFIGURATION; + } + + /** + * + * + * @generated + */ + public EList getParameters() { + if (parameters == null) { + parameters = new EObjectContainmentEList(LaunchConfigurationParameter.class, this, LaunchconfigurationPackage.LAUNCH_CONFIGURATION__PARAMETERS); + } + return parameters; + } + + /** + * + * + * @generated + */ + public String getType() { + return type; + } + + /** + * + * + * @generated + */ + public void setType(String newType) { + String oldType = type; + type = newType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LaunchconfigurationPackage.LAUNCH_CONFIGURATION__TYPE, oldType, type)); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION__PARAMETERS: + return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION__PARAMETERS: + return getParameters(); + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION__TYPE: + return getType(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION__PARAMETERS: + getParameters().clear(); + getParameters().addAll((Collection)newValue); + return; + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION__TYPE: + setType((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION__PARAMETERS: + getParameters().clear(); + return; + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION__TYPE: + setType(TYPE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION__PARAMETERS: + return parameters != null && !parameters.isEmpty(); + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION__TYPE: + return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (type: "); + result.append(type); + result.append(')'); + return result.toString(); + } + +} //LaunchConfigurationImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java new file mode 100644 index 000000000..f181c63ff --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java @@ -0,0 +1,163 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +/** + * + * An implementation of the model object 'Launch Configuration Parameter'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl#getValue Value}
    • + *
+ * + * @generated + */ +public abstract class LaunchConfigurationParameterImpl extends MinimalEObjectImpl.Container implements LaunchConfigurationParameter { + /** + * The default value of the '{@link #getValue() Value}' attribute. + * + * + * @see #getValue() + * @generated + * @ordered + */ + protected static final String VALUE_EDEFAULT = ""; + + /** + * The cached value of the '{@link #getValue() Value}' attribute. + * + * + * @see #getValue() + * @generated + * @ordered + */ + protected String value = VALUE_EDEFAULT; + + /** + * + * + * @generated + */ + protected LaunchConfigurationParameterImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LaunchconfigurationPackage.Literals.LAUNCH_CONFIGURATION_PARAMETER; + } + + /** + * + * + * @generated + */ + public String getValue() { + return value; + } + + /** + * + * + * @generated + */ + public void setValue(String newValue) { + String oldValue = value; + value = newValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, LaunchconfigurationPackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE, oldValue, value)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: + return getValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: + setValue((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: + setValue(VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION_PARAMETER__VALUE: + return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (value: "); + result.append(value); + result.append(')'); + return result.toString(); + } + +} //LaunchConfigurationParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java new file mode 100644 index 000000000..5f49902b4 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java @@ -0,0 +1,232 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.*; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; + +/** + * + * An implementation of the model Factory. + * + * @generated + */ +public class LaunchconfigurationFactoryImpl extends EFactoryImpl implements LaunchconfigurationFactory { + /** + * Creates the default factory implementation. + * + * + * @generated + */ + public static LaunchconfigurationFactory init() { + try { + LaunchconfigurationFactory theLaunchconfigurationFactory = (LaunchconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(LaunchconfigurationPackage.eNS_URI); + if (theLaunchconfigurationFactory != null) { + return theLaunchconfigurationFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new LaunchconfigurationFactoryImpl(); + } + + /** + * Creates an instance of the factory. + * + * + * @generated + */ + public LaunchconfigurationFactoryImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION: return createLaunchConfiguration(); + case LaunchconfigurationPackage.LANGUAGE_NAME_PARAMETER: return createLanguageNameParameter(); + case LaunchconfigurationPackage.ADDON_EXTENSION_PARAMETER: return createAddonExtensionParameter(); + case LaunchconfigurationPackage.MODEL_URI_PARAMETER: return createModelURIParameter(); + case LaunchconfigurationPackage.ANIMATOR_URI_PARAMETER: return createAnimatorURIParameter(); + case LaunchconfigurationPackage.ENTRY_POINT_PARAMETER: return createEntryPointParameter(); + case LaunchconfigurationPackage.INITIALIZATION_ARGUMENTS_PARAMETER: return createInitializationArgumentsParameter(); + case LaunchconfigurationPackage.MODEL_ROOT_PARAMETER: return createModelRootParameter(); + case LaunchconfigurationPackage.INITIALIZATION_METHOD_PARAMETER: return createInitializationMethodParameter(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + @Override + public Object createFromString(EDataType eDataType, String initialValue) { + switch (eDataType.getClassifierID()) { + case LaunchconfigurationPackage.ISERIALIZABLE: + return createISerializableFromString(eDataType, initialValue); + default: + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + @Override + public String convertToString(EDataType eDataType, Object instanceValue) { + switch (eDataType.getClassifierID()) { + case LaunchconfigurationPackage.ISERIALIZABLE: + return convertISerializableToString(eDataType, instanceValue); + default: + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + public LaunchConfiguration createLaunchConfiguration() { + LaunchConfigurationImpl launchConfiguration = new LaunchConfigurationImpl(); + return launchConfiguration; + } + + /** + * + * + * @generated + */ + public LanguageNameParameter createLanguageNameParameter() { + LanguageNameParameterImpl languageNameParameter = new LanguageNameParameterImpl(); + return languageNameParameter; + } + + /** + * + * + * @generated + */ + public AddonExtensionParameter createAddonExtensionParameter() { + AddonExtensionParameterImpl addonExtensionParameter = new AddonExtensionParameterImpl(); + return addonExtensionParameter; + } + + /** + * + * + * @generated + */ + public ModelURIParameter createModelURIParameter() { + ModelURIParameterImpl modelURIParameter = new ModelURIParameterImpl(); + return modelURIParameter; + } + + /** + * + * + * @generated + */ + public AnimatorURIParameter createAnimatorURIParameter() { + AnimatorURIParameterImpl animatorURIParameter = new AnimatorURIParameterImpl(); + return animatorURIParameter; + } + + /** + * + * + * @generated + */ + public EntryPointParameter createEntryPointParameter() { + EntryPointParameterImpl entryPointParameter = new EntryPointParameterImpl(); + return entryPointParameter; + } + + /** + * + * + * @generated + */ + public InitializationArgumentsParameter createInitializationArgumentsParameter() { + InitializationArgumentsParameterImpl initializationArgumentsParameter = new InitializationArgumentsParameterImpl(); + return initializationArgumentsParameter; + } + + /** + * + * + * @generated + */ + public ModelRootParameter createModelRootParameter() { + ModelRootParameterImpl modelRootParameter = new ModelRootParameterImpl(); + return modelRootParameter; + } + + /** + * + * + * @generated + */ + public InitializationMethodParameter createInitializationMethodParameter() { + InitializationMethodParameterImpl initializationMethodParameter = new InitializationMethodParameterImpl(); + return initializationMethodParameter; + } + + /** + * + * + * @generated + */ + public byte[] createISerializableFromString(EDataType eDataType, String initialValue) { + return (byte[])super.createFromString(initialValue); + } + + /** + * + * + * @generated + */ + public String convertISerializableToString(EDataType eDataType, Object instanceValue) { + return super.convertToString(instanceValue); + } + + /** + * + * + * @generated + */ + public LaunchconfigurationPackage getLaunchconfigurationPackage() { + return (LaunchconfigurationPackage)getEPackage(); + } + + /** + * + * + * @deprecated + * @generated + */ + @Deprecated + public static LaunchconfigurationPackage getPackage() { + return LaunchconfigurationPackage.eINSTANCE; + } + +} //LaunchconfigurationFactoryImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java new file mode 100644 index 000000000..aebc47ee2 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java @@ -0,0 +1,420 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationFactory; +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter; +import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +import org.eclipse.emf.ecore.impl.EPackageImpl; + +/** + * + * An implementation of the model Package. + * + * @generated + */ +public class LaunchconfigurationPackageImpl extends EPackageImpl implements LaunchconfigurationPackage { + /** + * + * + * @generated + */ + private EClass launchConfigurationEClass = null; + + /** + * + * + * @generated + */ + private EClass launchConfigurationParameterEClass = null; + + /** + * + * + * @generated + */ + private EClass languageNameParameterEClass = null; + + /** + * + * + * @generated + */ + private EClass addonExtensionParameterEClass = null; + + /** + * + * + * @generated + */ + private EClass modelURIParameterEClass = null; + + /** + * + * + * @generated + */ + private EClass animatorURIParameterEClass = null; + + /** + * + * + * @generated + */ + private EClass entryPointParameterEClass = null; + + /** + * + * + * @generated + */ + private EClass initializationArgumentsParameterEClass = null; + + /** + * + * + * @generated + */ + private EClass modelRootParameterEClass = null; + + /** + * + * + * @generated + */ + private EClass initializationMethodParameterEClass = null; + + /** + * + * + * @generated + */ + private EDataType iSerializableEDataType = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + *

Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * + * + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#eNS_URI + * @see #init() + * @generated + */ + private LaunchconfigurationPackageImpl() { + super(eNS_URI, LaunchconfigurationFactory.eINSTANCE); + } + + /** + * + * + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * + *

This method is used to initialize {@link LaunchconfigurationPackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * + * + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static LaunchconfigurationPackage init() { + if (isInited) return (LaunchconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(LaunchconfigurationPackage.eNS_URI); + + // Obtain or create and register package + LaunchconfigurationPackageImpl theLaunchconfigurationPackage = (LaunchconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LaunchconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LaunchconfigurationPackageImpl()); + + isInited = true; + + // Create package meta-data objects + theLaunchconfigurationPackage.createPackageContents(); + + // Initialize created meta-data + theLaunchconfigurationPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theLaunchconfigurationPackage.freeze(); + + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(LaunchconfigurationPackage.eNS_URI, theLaunchconfigurationPackage); + return theLaunchconfigurationPackage; + } + + /** + * + * + * @generated + */ + public EClass getLaunchConfiguration() { + return launchConfigurationEClass; + } + + /** + * + * + * @generated + */ + public EReference getLaunchConfiguration_Parameters() { + return (EReference)launchConfigurationEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EAttribute getLaunchConfiguration_Type() { + return (EAttribute)launchConfigurationEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EClass getLaunchConfigurationParameter() { + return launchConfigurationParameterEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getLaunchConfigurationParameter_Value() { + return (EAttribute)launchConfigurationParameterEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getLanguageNameParameter() { + return languageNameParameterEClass; + } + + /** + * + * + * @generated + */ + public EClass getAddonExtensionParameter() { + return addonExtensionParameterEClass; + } + + /** + * + * + * @generated + */ + public EClass getModelURIParameter() { + return modelURIParameterEClass; + } + + /** + * + * + * @generated + */ + public EClass getAnimatorURIParameter() { + return animatorURIParameterEClass; + } + + /** + * + * + * @generated + */ + public EClass getEntryPointParameter() { + return entryPointParameterEClass; + } + + /** + * + * + * @generated + */ + public EClass getInitializationArgumentsParameter() { + return initializationArgumentsParameterEClass; + } + + /** + * + * + * @generated + */ + public EClass getModelRootParameter() { + return modelRootParameterEClass; + } + + /** + * + * + * @generated + */ + public EClass getInitializationMethodParameter() { + return initializationMethodParameterEClass; + } + + /** + * + * + * @generated + */ + public EDataType getISerializable() { + return iSerializableEDataType; + } + + /** + * + * + * @generated + */ + public LaunchconfigurationFactory getLaunchconfigurationFactory() { + return (LaunchconfigurationFactory)getEFactoryInstance(); + } + + /** + * + * + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + launchConfigurationEClass = createEClass(LAUNCH_CONFIGURATION); + createEReference(launchConfigurationEClass, LAUNCH_CONFIGURATION__PARAMETERS); + createEAttribute(launchConfigurationEClass, LAUNCH_CONFIGURATION__TYPE); + + launchConfigurationParameterEClass = createEClass(LAUNCH_CONFIGURATION_PARAMETER); + createEAttribute(launchConfigurationParameterEClass, LAUNCH_CONFIGURATION_PARAMETER__VALUE); + + languageNameParameterEClass = createEClass(LANGUAGE_NAME_PARAMETER); + + addonExtensionParameterEClass = createEClass(ADDON_EXTENSION_PARAMETER); + + modelURIParameterEClass = createEClass(MODEL_URI_PARAMETER); + + animatorURIParameterEClass = createEClass(ANIMATOR_URI_PARAMETER); + + entryPointParameterEClass = createEClass(ENTRY_POINT_PARAMETER); + + initializationArgumentsParameterEClass = createEClass(INITIALIZATION_ARGUMENTS_PARAMETER); + + modelRootParameterEClass = createEClass(MODEL_ROOT_PARAMETER); + + initializationMethodParameterEClass = createEClass(INITIALIZATION_METHOD_PARAMETER); + + // Create data types + iSerializableEDataType = createEDataType(ISERIALIZABLE); + } + + /** + * + * + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Create type parameters + + // Set bounds for type parameters + + // Add supertypes to classes + languageNameParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + addonExtensionParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + modelURIParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + animatorURIParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + entryPointParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + initializationArgumentsParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + modelRootParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + initializationMethodParameterEClass.getESuperTypes().add(this.getLaunchConfigurationParameter()); + + // Initialize classes, features, and operations; add parameters + initEClass(launchConfigurationEClass, LaunchConfiguration.class, "LaunchConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getLaunchConfiguration_Parameters(), this.getLaunchConfigurationParameter(), null, "parameters", null, 0, -1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getLaunchConfiguration_Type(), ecorePackage.getEString(), "type", null, 1, 1, LaunchConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(launchConfigurationParameterEClass, LaunchConfigurationParameter.class, "LaunchConfigurationParameter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getLaunchConfigurationParameter_Value(), ecorePackage.getEString(), "value", "", 0, 1, LaunchConfigurationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(languageNameParameterEClass, LanguageNameParameter.class, "LanguageNameParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(addonExtensionParameterEClass, AddonExtensionParameter.class, "AddonExtensionParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(modelURIParameterEClass, ModelURIParameter.class, "ModelURIParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(animatorURIParameterEClass, AnimatorURIParameter.class, "AnimatorURIParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(entryPointParameterEClass, EntryPointParameter.class, "EntryPointParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(initializationArgumentsParameterEClass, InitializationArgumentsParameter.class, "InitializationArgumentsParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(modelRootParameterEClass, ModelRootParameter.class, "ModelRootParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(initializationMethodParameterEClass, InitializationMethodParameter.class, "InitializationMethodParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + // Initialize data types + initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); + + // Create resource + createResource(eNS_URI); + } + +} //LaunchconfigurationPackageImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java new file mode 100644 index 000000000..2aa0e22c1 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Model Root Parameter'. + * + * + * @generated + */ +public class ModelRootParameterImpl extends LaunchConfigurationParameterImpl implements ModelRootParameter { + /** + * + * + * @generated + */ + protected ModelRootParameterImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LaunchconfigurationPackage.Literals.MODEL_ROOT_PARAMETER; + } + +} //ModelRootParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java new file mode 100644 index 000000000..ceec204e2 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java @@ -0,0 +1,37 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Model URI Parameter'. + * + * + * @generated + */ +public class ModelURIParameterImpl extends LaunchConfigurationParameterImpl implements ModelURIParameter { + /** + * + * + * @generated + */ + protected ModelURIParameterImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return LaunchconfigurationPackage.Literals.MODEL_URI_PARAMETER; + } + +} //ModelURIParameterImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java new file mode 100644 index 000000000..a0dba4300 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java @@ -0,0 +1,282 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.util; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.*; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * The Adapter Factory for the model. + * It provides an adapter createXXX method for each class of the model. + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage + * @generated + */ +public class LaunchconfigurationAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + * + * + * @generated + */ + protected static LaunchconfigurationPackage modelPackage; + + /** + * Creates an instance of the adapter factory. + * + * + * @generated + */ + public LaunchconfigurationAdapterFactory() { + if (modelPackage == null) { + modelPackage = LaunchconfigurationPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + * + * This implementation returns true if the object is either the model's package or is an instance object of the model. + * + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the createXXX methods. + * + * + * @generated + */ + protected LaunchconfigurationSwitch modelSwitch = + new LaunchconfigurationSwitch() { + @Override + public Adapter caseLaunchConfiguration(LaunchConfiguration object) { + return createLaunchConfigurationAdapter(); + } + @Override + public Adapter caseLaunchConfigurationParameter(LaunchConfigurationParameter object) { + return createLaunchConfigurationParameterAdapter(); + } + @Override + public Adapter caseLanguageNameParameter(LanguageNameParameter object) { + return createLanguageNameParameterAdapter(); + } + @Override + public Adapter caseAddonExtensionParameter(AddonExtensionParameter object) { + return createAddonExtensionParameterAdapter(); + } + @Override + public Adapter caseModelURIParameter(ModelURIParameter object) { + return createModelURIParameterAdapter(); + } + @Override + public Adapter caseAnimatorURIParameter(AnimatorURIParameter object) { + return createAnimatorURIParameterAdapter(); + } + @Override + public Adapter caseEntryPointParameter(EntryPointParameter object) { + return createEntryPointParameterAdapter(); + } + @Override + public Adapter caseInitializationArgumentsParameter(InitializationArgumentsParameter object) { + return createInitializationArgumentsParameterAdapter(); + } + @Override + public Adapter caseModelRootParameter(ModelRootParameter object) { + return createModelRootParameterAdapter(); + } + @Override + public Adapter caseInitializationMethodParameter(InitializationMethodParameter object) { + return createInitializationMethodParameterAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the target. + * + * + * @param target the object to adapt. + * @return the adapter for the target. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration Launch Configuration}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration + * @generated + */ + public Adapter createLaunchConfigurationAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter Launch Configuration Parameter}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter + * @generated + */ + public Adapter createLaunchConfigurationParameterAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter Language Name Parameter}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter + * @generated + */ + public Adapter createLanguageNameParameterAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter Addon Extension Parameter}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter + * @generated + */ + public Adapter createAddonExtensionParameterAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter Model URI Parameter}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter + * @generated + */ + public Adapter createModelURIParameterAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter Animator URI Parameter}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter + * @generated + */ + public Adapter createAnimatorURIParameterAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter Entry Point Parameter}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter + * @generated + */ + public Adapter createEntryPointParameterAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter Initialization Arguments Parameter}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter + * @generated + */ + public Adapter createInitializationArgumentsParameterAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter Model Root Parameter}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter + * @generated + */ + public Adapter createModelRootParameterAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter Initialization Method Parameter}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter + * @generated + */ + public Adapter createInitializationMethodParameterAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + * + * This default implementation returns null. + * + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //LaunchconfigurationAdapterFactory diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java new file mode 100644 index 000000000..6ce972aec --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java @@ -0,0 +1,307 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.launchconfiguration.util; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.*; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; + +/** + * + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the caseXXX method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * + * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage + * @generated + */ +public class LaunchconfigurationSwitch extends Switch { + /** + * The cached model package + * + * + * @generated + */ + protected static LaunchconfigurationPackage modelPackage; + + /** + * Creates an instance of the switch. + * + * + * @generated + */ + public LaunchconfigurationSwitch() { + if (modelPackage == null) { + modelPackage = LaunchconfigurationPackage.eINSTANCE; + } + } + + /** + * Checks whether this is a switch for the given package. + * + * + * @param ePackage the package in question. + * @return whether this is a switch for the given package. + * @generated + */ + @Override + protected boolean isSwitchFor(EPackage ePackage) { + return ePackage == modelPackage; + } + + /** + * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * + * + * @return the first non-null result returned by a caseXXX call. + * @generated + */ + @Override + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION: { + LaunchConfiguration launchConfiguration = (LaunchConfiguration)theEObject; + T result = caseLaunchConfiguration(launchConfiguration); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LaunchconfigurationPackage.LAUNCH_CONFIGURATION_PARAMETER: { + LaunchConfigurationParameter launchConfigurationParameter = (LaunchConfigurationParameter)theEObject; + T result = caseLaunchConfigurationParameter(launchConfigurationParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LaunchconfigurationPackage.LANGUAGE_NAME_PARAMETER: { + LanguageNameParameter languageNameParameter = (LanguageNameParameter)theEObject; + T result = caseLanguageNameParameter(languageNameParameter); + if (result == null) result = caseLaunchConfigurationParameter(languageNameParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LaunchconfigurationPackage.ADDON_EXTENSION_PARAMETER: { + AddonExtensionParameter addonExtensionParameter = (AddonExtensionParameter)theEObject; + T result = caseAddonExtensionParameter(addonExtensionParameter); + if (result == null) result = caseLaunchConfigurationParameter(addonExtensionParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LaunchconfigurationPackage.MODEL_URI_PARAMETER: { + ModelURIParameter modelURIParameter = (ModelURIParameter)theEObject; + T result = caseModelURIParameter(modelURIParameter); + if (result == null) result = caseLaunchConfigurationParameter(modelURIParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LaunchconfigurationPackage.ANIMATOR_URI_PARAMETER: { + AnimatorURIParameter animatorURIParameter = (AnimatorURIParameter)theEObject; + T result = caseAnimatorURIParameter(animatorURIParameter); + if (result == null) result = caseLaunchConfigurationParameter(animatorURIParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LaunchconfigurationPackage.ENTRY_POINT_PARAMETER: { + EntryPointParameter entryPointParameter = (EntryPointParameter)theEObject; + T result = caseEntryPointParameter(entryPointParameter); + if (result == null) result = caseLaunchConfigurationParameter(entryPointParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LaunchconfigurationPackage.INITIALIZATION_ARGUMENTS_PARAMETER: { + InitializationArgumentsParameter initializationArgumentsParameter = (InitializationArgumentsParameter)theEObject; + T result = caseInitializationArgumentsParameter(initializationArgumentsParameter); + if (result == null) result = caseLaunchConfigurationParameter(initializationArgumentsParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LaunchconfigurationPackage.MODEL_ROOT_PARAMETER: { + ModelRootParameter modelRootParameter = (ModelRootParameter)theEObject; + T result = caseModelRootParameter(modelRootParameter); + if (result == null) result = caseLaunchConfigurationParameter(modelRootParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LaunchconfigurationPackage.INITIALIZATION_METHOD_PARAMETER: { + InitializationMethodParameter initializationMethodParameter = (InitializationMethodParameter)theEObject; + T result = caseInitializationMethodParameter(initializationMethodParameter); + if (result == null) result = caseLaunchConfigurationParameter(initializationMethodParameter); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'Launch Configuration'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Launch Configuration'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseLaunchConfiguration(LaunchConfiguration object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Launch Configuration Parameter'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Launch Configuration Parameter'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseLaunchConfigurationParameter(LaunchConfigurationParameter object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Language Name Parameter'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Language Name Parameter'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseLanguageNameParameter(LanguageNameParameter object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Addon Extension Parameter'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Addon Extension Parameter'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAddonExtensionParameter(AddonExtensionParameter object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Model URI Parameter'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Model URI Parameter'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseModelURIParameter(ModelURIParameter object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Animator URI Parameter'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Animator URI Parameter'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAnimatorURIParameter(AnimatorURIParameter object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Entry Point Parameter'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Entry Point Parameter'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseEntryPointParameter(EntryPointParameter object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Initialization Arguments Parameter'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Initialization Arguments Parameter'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseInitializationArgumentsParameter(InitializationArgumentsParameter object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Model Root Parameter'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Model Root Parameter'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseModelRootParameter(ModelRootParameter object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Initialization Method Parameter'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Initialization Method Parameter'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseInitializationMethodParameter(InitializationMethodParameter object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + @Override + public T defaultCase(EObject object) { + return null; + } + +} //LaunchconfigurationSwitch diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java new file mode 100644 index 000000000..0b0d58364 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java @@ -0,0 +1,39 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; + +/** + * + * A representation of the model object 'Big Step'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps Sub Steps}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getBigStep() + * @model abstract="true" + * @generated + */ +public interface BigStep, StateSubType extends State> extends Step { + /** + * Returns the value of the 'Sub Steps' containment reference list. + * + *

+ * If the meaning of the 'Sub Steps' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Sub Steps' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getBigStep_SubSteps() + * @model containment="true" + * @generated + */ + EList getSubSteps(); + +} // BigStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java new file mode 100644 index 000000000..5d22b289f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java @@ -0,0 +1,41 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Dimension'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Dimension#getValues Values}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getDimension() + * @model abstract="true" + * @generated + */ +public interface Dimension> extends EObject { + /** + * Returns the value of the 'Values' containment reference list. + * + *

+ * If the meaning of the 'Values' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Values' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getDimension_Values() + * @model containment="true" + * @generated + */ + EList getValues(); + +} // Dimension diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java new file mode 100644 index 000000000..4a9524377 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java @@ -0,0 +1,96 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EOperation; + +/** + * + * A representation of the model object 'Generic MSE'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericMSE() + * @model + * @generated + */ +public interface GenericMSE extends MSE { + /** + * Returns the value of the 'Caller Reference' reference. + * + *

+ * If the meaning of the 'Caller Reference' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Caller Reference' reference. + * @see #setCallerReference(EObject) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericMSE_CallerReference() + * @model + * @generated + */ + EObject getCallerReference(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}' reference. + * + * + * @param value the new value of the 'Caller Reference' reference. + * @see #getCallerReference() + * @generated + */ + void setCallerReference(EObject value); + + /** + * Returns the value of the 'Action Reference' reference. + * + *

+ * If the meaning of the 'Action Reference' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Action Reference' reference. + * @see #setActionReference(EOperation) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericMSE_ActionReference() + * @model + * @generated + */ + EOperation getActionReference(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}' reference. + * + * + * @param value the new value of the 'Action Reference' reference. + * @see #getActionReference() + * @generated + */ + void setActionReference(EOperation value); + + /** + * + * + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return callerReference;'" + * @generated + */ + EObject getCaller(); + + /** + * + * + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='return actionReference;'" + * @generated + */ + EOperation getAction(); + +} // GenericMSE diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java new file mode 100644 index 000000000..3cb6663af --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java @@ -0,0 +1,36 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.ecore.ENamedElement; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EOperation; + +/** + * + * A representation of the model object 'MSE'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSE() + * @model abstract="true" + * @generated + */ +public interface MSE extends ENamedElement { + /** + * + * + * @model kind="operation" + * @generated + */ + EObject getCaller(); + + /** + * + * + * @model kind="operation" + * @generated + */ + EOperation getAction(); + +} // MSE diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java new file mode 100644 index 000000000..e8dce1532 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java @@ -0,0 +1,42 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'MSE Model'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs Owned MS Es}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEModel() + * @model + * @generated + */ +public interface MSEModel extends EObject { + /** + * Returns the value of the 'Owned MS Es' containment reference list. + * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.MSE}. + * + *

+ * If the meaning of the 'Owned MS Es' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Owned MS Es' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEModel_OwnedMSEs() + * @model containment="true" + * @generated + */ + EList getOwnedMSEs(); + +} // MSEModel diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java new file mode 100644 index 000000000..4a1773fb2 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java @@ -0,0 +1,86 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'MSE Occurrence'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters Parameters}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult Result}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence() + * @model + * @generated + */ +public interface MSEOccurrence extends EObject { + /** + * Returns the value of the 'Mse' reference. + * + *

+ * If the meaning of the 'Mse' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Mse' reference. + * @see #setMse(MSE) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence_Mse() + * @model required="true" + * @generated + */ + MSE getMse(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}' reference. + * + * + * @param value the new value of the 'Mse' reference. + * @see #getMse() + * @generated + */ + void setMse(MSE value); + + /** + * Returns the value of the 'Parameters' attribute list. + * The list contents are of type {@link java.lang.Object}. + * + *

+ * If the meaning of the 'Parameters' attribute list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Parameters' attribute list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence_Parameters() + * @model + * @generated + */ + EList getParameters(); + + /** + * Returns the value of the 'Result' attribute list. + * The list contents are of type {@link java.lang.Object}. + * + *

+ * If the meaning of the 'Result' attribute list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Result' attribute list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence_Result() + * @model + * @generated + */ + EList getResult(); + +} // MSEOccurrence diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java new file mode 100644 index 000000000..194ee2dcc --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + + +/** + * + * A representation of the model object 'Parallel Step'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getParallelStep() + * @model abstract="true" + * @generated + */ +public interface ParallelStep, StateSubType extends State> extends BigStep { +} // ParallelStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java new file mode 100644 index 000000000..917b66595 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + + +/** + * + * A representation of the model object 'Sequential Step'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getSequentialStep() + * @model abstract="true" + * @generated + */ +public interface SequentialStep, StateSubType extends State> extends BigStep { +} // SequentialStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java new file mode 100644 index 000000000..4758d7752 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java @@ -0,0 +1,17 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + + +/** + * + * A representation of the model object 'Small Step'. + * + * + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getSmallStep() + * @model abstract="true" + * @generated + */ +public interface SmallStep> extends Step { +} // SmallStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java new file mode 100644 index 000000000..586e3ea1f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java @@ -0,0 +1,79 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'State'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.State#getValues Values}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState() + * @model abstract="true" + * @generated + */ +public interface State, ValueSubType extends Value> extends EObject { + /** + * Returns the value of the 'Started Steps' reference list. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}'. + * + *

+ * If the meaning of the 'Started Steps' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Started Steps' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_StartedSteps() + * @see fr.inria.diverse.trace.commons.model.trace.Step#getStartingState + * @model opposite="startingState" + * @generated + */ + EList getStartedSteps(); + + /** + * Returns the value of the 'Ended Steps' reference list. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}'. + * + *

+ * If the meaning of the 'Ended Steps' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Ended Steps' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_EndedSteps() + * @see fr.inria.diverse.trace.commons.model.trace.Step#getEndingState + * @model opposite="endingState" + * @generated + */ + EList getEndedSteps(); + + /** + * Returns the value of the 'Values' reference list. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Value#getStates States}'. + * + *

+ * If the meaning of the 'Values' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Values' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_Values() + * @see fr.inria.diverse.trace.commons.model.trace.Value#getStates + * @model opposite="states" + * @generated + */ + EList getValues(); + +} // State diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java new file mode 100644 index 000000000..130fe3b3e --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java @@ -0,0 +1,108 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Step'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep() + * @model abstract="true" + * @generated + */ +public interface Step> extends EObject { + /** + * Returns the value of the 'Mseoccurrence' containment reference. + * + *

+ * If the meaning of the 'Mseoccurrence' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Mseoccurrence' containment reference. + * @see #setMseoccurrence(MSEOccurrence) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_Mseoccurrence() + * @model containment="true" + * @generated + */ + MSEOccurrence getMseoccurrence(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}' containment reference. + * + * + * @param value the new value of the 'Mseoccurrence' containment reference. + * @see #getMseoccurrence() + * @generated + */ + void setMseoccurrence(MSEOccurrence value); + + /** + * Returns the value of the 'Starting State' reference. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}'. + * + *

+ * If the meaning of the 'Starting State' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Starting State' reference. + * @see #setStartingState(State) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_StartingState() + * @see fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps + * @model opposite="startedSteps" required="true" + * @generated + */ + StateSubType getStartingState(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}' reference. + * + * + * @param value the new value of the 'Starting State' reference. + * @see #getStartingState() + * @generated + */ + void setStartingState(StateSubType value); + + /** + * Returns the value of the 'Ending State' reference. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}'. + * + *

+ * If the meaning of the 'Ending State' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Ending State' reference. + * @see #setEndingState(State) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_EndingState() + * @see fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps + * @model opposite="endedSteps" + * @generated + */ + StateSubType getEndingState(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}' reference. + * + * + * @param value the new value of the 'Ending State' reference. + * @see #getEndingState() + * @generated + */ + void setEndingState(StateSubType value); + +} // Step diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java new file mode 100644 index 000000000..86daa787e --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java @@ -0,0 +1,113 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Trace'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects Traced Objects}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getStates States}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace() + * @model abstract="true" + * @generated + */ +public interface Trace, TracedObjectSubtype extends TracedObject, StateSubType extends State> extends EObject { + /** + * Returns the value of the 'Root Step' containment reference. + * + *

+ * If the meaning of the 'Root Step' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Root Step' containment reference. + * @see #setRootStep(Step) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_RootStep() + * @model containment="true" required="true" + * @generated + */ + StepSubType getRootStep(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}' containment reference. + * + * + * @param value the new value of the 'Root Step' containment reference. + * @see #getRootStep() + * @generated + */ + void setRootStep(StepSubType value); + + /** + * Returns the value of the 'Traced Objects' containment reference list. + * + *

+ * If the meaning of the 'Traced Objects' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Traced Objects' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_TracedObjects() + * @model containment="true" + * @generated + */ + EList getTracedObjects(); + + /** + * Returns the value of the 'States' containment reference list. + * + *

+ * If the meaning of the 'States' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'States' containment reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_States() + * @model containment="true" + * @generated + */ + EList getStates(); + + /** + * Returns the value of the 'Launchconfiguration' containment reference. + * + *

+ * If the meaning of the 'Launchconfiguration' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Launchconfiguration' containment reference. + * @see #setLaunchconfiguration(LaunchConfiguration) + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_Launchconfiguration() + * @model containment="true" required="true" + * @generated + */ + LaunchConfiguration getLaunchconfiguration(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}' containment reference. + * + * + * @param value the new value of the 'Launchconfiguration' containment reference. + * @see #getLaunchconfiguration() + * @generated + */ + void setLaunchconfiguration(LaunchConfiguration value); + +} // Trace diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java new file mode 100644 index 000000000..d1d92f0e6 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java @@ -0,0 +1,60 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.ecore.EFactory; + +/** + * + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage + * @generated + */ +public interface TraceFactory extends EFactory { + /** + * The singleton instance of the factory. + * + * + * @generated + */ + TraceFactory eINSTANCE = fr.inria.diverse.trace.commons.model.trace.impl.TraceFactoryImpl.init(); + + /** + * Returns a new object of class 'MSE Occurrence'. + * + * + * @return a new object of class 'MSE Occurrence'. + * @generated + */ + MSEOccurrence createMSEOccurrence(); + + /** + * Returns a new object of class 'MSE Model'. + * + * + * @return a new object of class 'MSE Model'. + * @generated + */ + MSEModel createMSEModel(); + + /** + * Returns a new object of class 'Generic MSE'. + * + * + * @return a new object of class 'Generic MSE'. + * @generated + */ + GenericMSE createGenericMSE(); + + /** + * Returns the package supported by this factory. + * + * + * @return the package supported by this factory. + * @generated + */ + TracePackage getTracePackage(); + +} //TraceFactory diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java new file mode 100644 index 000000000..451fff743 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java @@ -0,0 +1,1663 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EOperation; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.EcorePackage; + +/** + * + * The Package for the model. + * It contains accessors for the meta objects to represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TraceFactory + * @model kind="package" + * @generated + */ +public interface TracePackage extends EPackage { + /** + * The package name. + * + * + * @generated + */ + String eNAME = "trace"; + + /** + * The package namespace URI. + * + * + * @generated + */ + String eNS_URI = "http://www.gemoc.org/generic_trace"; + + /** + * The package namespace name. + * + * + * @generated + */ + String eNS_PREFIX = "trace"; + + /** + * The singleton instance of the package. + * + * + * @generated + */ + TracePackage eINSTANCE = fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl.init(); + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl MSE Occurrence}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEOccurrence() + * @generated + */ + int MSE_OCCURRENCE = 0; + + /** + * The feature id for the 'Mse' reference. + * + * + * @generated + * @ordered + */ + int MSE_OCCURRENCE__MSE = 0; + + /** + * The feature id for the 'Parameters' attribute list. + * + * + * @generated + * @ordered + */ + int MSE_OCCURRENCE__PARAMETERS = 1; + + /** + * The feature id for the 'Result' attribute list. + * + * + * @generated + * @ordered + */ + int MSE_OCCURRENCE__RESULT = 2; + + /** + * The number of structural features of the 'MSE Occurrence' class. + * + * + * @generated + * @ordered + */ + int MSE_OCCURRENCE_FEATURE_COUNT = 3; + + /** + * The number of operations of the 'MSE Occurrence' class. + * + * + * @generated + * @ordered + */ + int MSE_OCCURRENCE_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl MSE}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSE() + * @generated + */ + int MSE = 1; + + /** + * The feature id for the 'EAnnotations' containment reference list. + * + * + * @generated + * @ordered + */ + int MSE__EANNOTATIONS = EcorePackage.ENAMED_ELEMENT__EANNOTATIONS; + + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + int MSE__NAME = EcorePackage.ENAMED_ELEMENT__NAME; + + /** + * The number of structural features of the 'MSE' class. + * + * + * @generated + * @ordered + */ + int MSE_FEATURE_COUNT = EcorePackage.ENAMED_ELEMENT_FEATURE_COUNT + 0; + + /** + * The operation id for the 'Get EAnnotation' operation. + * + * + * @generated + * @ordered + */ + int MSE___GET_EANNOTATION__STRING = EcorePackage.ENAMED_ELEMENT___GET_EANNOTATION__STRING; + + /** + * The operation id for the 'Get Caller' operation. + * + * + * @generated + * @ordered + */ + int MSE___GET_CALLER = EcorePackage.ENAMED_ELEMENT_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Get Action' operation. + * + * + * @generated + * @ordered + */ + int MSE___GET_ACTION = EcorePackage.ENAMED_ELEMENT_OPERATION_COUNT + 1; + + /** + * The number of operations of the 'MSE' class. + * + * + * @generated + * @ordered + */ + int MSE_OPERATION_COUNT = EcorePackage.ENAMED_ELEMENT_OPERATION_COUNT + 2; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl MSE Model}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEModel() + * @generated + */ + int MSE_MODEL = 2; + + /** + * The feature id for the 'Owned MS Es' containment reference list. + * + * + * @generated + * @ordered + */ + int MSE_MODEL__OWNED_MS_ES = 0; + + /** + * The number of structural features of the 'MSE Model' class. + * + * + * @generated + * @ordered + */ + int MSE_MODEL_FEATURE_COUNT = 1; + + /** + * The number of operations of the 'MSE Model' class. + * + * + * @generated + * @ordered + */ + int MSE_MODEL_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl Generic MSE}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericMSE() + * @generated + */ + int GENERIC_MSE = 3; + + /** + * The feature id for the 'EAnnotations' containment reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_MSE__EANNOTATIONS = MSE__EANNOTATIONS; + + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + int GENERIC_MSE__NAME = MSE__NAME; + + /** + * The feature id for the 'Caller Reference' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_MSE__CALLER_REFERENCE = MSE_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Action Reference' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_MSE__ACTION_REFERENCE = MSE_FEATURE_COUNT + 1; + + /** + * The number of structural features of the 'Generic MSE' class. + * + * + * @generated + * @ordered + */ + int GENERIC_MSE_FEATURE_COUNT = MSE_FEATURE_COUNT + 2; + + /** + * The operation id for the 'Get EAnnotation' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_MSE___GET_EANNOTATION__STRING = MSE___GET_EANNOTATION__STRING; + + /** + * The operation id for the 'Get Caller' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_MSE___GET_CALLER = MSE_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Get Action' operation. + * + * + * @generated + * @ordered + */ + int GENERIC_MSE___GET_ACTION = MSE_OPERATION_COUNT + 1; + + /** + * The number of operations of the 'Generic MSE' class. + * + * + * @generated + * @ordered + */ + int GENERIC_MSE_OPERATION_COUNT = MSE_OPERATION_COUNT + 2; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.StepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getStep() + * @generated + */ + int STEP = 4; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int STEP__MSEOCCURRENCE = 0; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int STEP__STARTING_STATE = 1; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int STEP__ENDING_STATE = 2; + + /** + * The number of structural features of the 'Step' class. + * + * + * @generated + * @ordered + */ + int STEP_FEATURE_COUNT = 3; + + /** + * The number of operations of the 'Step' class. + * + * + * @generated + * @ordered + */ + int STEP_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl Big Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getBigStep() + * @generated + */ + int BIG_STEP = 5; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int BIG_STEP__MSEOCCURRENCE = STEP__MSEOCCURRENCE; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int BIG_STEP__STARTING_STATE = STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int BIG_STEP__ENDING_STATE = STEP__ENDING_STATE; + + /** + * The feature id for the 'Sub Steps' containment reference list. + * + * + * @generated + * @ordered + */ + int BIG_STEP__SUB_STEPS = STEP_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Big Step' class. + * + * + * @generated + * @ordered + */ + int BIG_STEP_FEATURE_COUNT = STEP_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Big Step' class. + * + * + * @generated + * @ordered + */ + int BIG_STEP_OPERATION_COUNT = STEP_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl Small Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSmallStep() + * @generated + */ + int SMALL_STEP = 6; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int SMALL_STEP__MSEOCCURRENCE = STEP__MSEOCCURRENCE; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int SMALL_STEP__STARTING_STATE = STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int SMALL_STEP__ENDING_STATE = STEP__ENDING_STATE; + + /** + * The number of structural features of the 'Small Step' class. + * + * + * @generated + * @ordered + */ + int SMALL_STEP_FEATURE_COUNT = STEP_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Small Step' class. + * + * + * @generated + * @ordered + */ + int SMALL_STEP_OPERATION_COUNT = STEP_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl Sequential Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSequentialStep() + * @generated + */ + int SEQUENTIAL_STEP = 7; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int SEQUENTIAL_STEP__MSEOCCURRENCE = BIG_STEP__MSEOCCURRENCE; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int SEQUENTIAL_STEP__STARTING_STATE = BIG_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int SEQUENTIAL_STEP__ENDING_STATE = BIG_STEP__ENDING_STATE; + + /** + * The feature id for the 'Sub Steps' containment reference list. + * + * + * @generated + * @ordered + */ + int SEQUENTIAL_STEP__SUB_STEPS = BIG_STEP__SUB_STEPS; + + /** + * The number of structural features of the 'Sequential Step' class. + * + * + * @generated + * @ordered + */ + int SEQUENTIAL_STEP_FEATURE_COUNT = BIG_STEP_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Sequential Step' class. + * + * + * @generated + * @ordered + */ + int SEQUENTIAL_STEP_OPERATION_COUNT = BIG_STEP_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl Parallel Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getParallelStep() + * @generated + */ + int PARALLEL_STEP = 8; + + /** + * The feature id for the 'Mseoccurrence' containment reference. + * + * + * @generated + * @ordered + */ + int PARALLEL_STEP__MSEOCCURRENCE = BIG_STEP__MSEOCCURRENCE; + + /** + * The feature id for the 'Starting State' reference. + * + * + * @generated + * @ordered + */ + int PARALLEL_STEP__STARTING_STATE = BIG_STEP__STARTING_STATE; + + /** + * The feature id for the 'Ending State' reference. + * + * + * @generated + * @ordered + */ + int PARALLEL_STEP__ENDING_STATE = BIG_STEP__ENDING_STATE; + + /** + * The feature id for the 'Sub Steps' containment reference list. + * + * + * @generated + * @ordered + */ + int PARALLEL_STEP__SUB_STEPS = BIG_STEP__SUB_STEPS; + + /** + * The number of structural features of the 'Parallel Step' class. + * + * + * @generated + * @ordered + */ + int PARALLEL_STEP_FEATURE_COUNT = BIG_STEP_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Parallel Step' class. + * + * + * @generated + * @ordered + */ + int PARALLEL_STEP_OPERATION_COUNT = BIG_STEP_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl Trace}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTrace() + * @generated + */ + int TRACE = 9; + + /** + * The feature id for the 'Root Step' containment reference. + * + * + * @generated + * @ordered + */ + int TRACE__ROOT_STEP = 0; + + /** + * The feature id for the 'Traced Objects' containment reference list. + * + * + * @generated + * @ordered + */ + int TRACE__TRACED_OBJECTS = 1; + + /** + * The feature id for the 'States' containment reference list. + * + * + * @generated + * @ordered + */ + int TRACE__STATES = 2; + + /** + * The feature id for the 'Launchconfiguration' containment reference. + * + * + * @generated + * @ordered + */ + int TRACE__LAUNCHCONFIGURATION = 3; + + /** + * The number of structural features of the 'Trace' class. + * + * + * @generated + * @ordered + */ + int TRACE_FEATURE_COUNT = 4; + + /** + * The number of operations of the 'Trace' class. + * + * + * @generated + * @ordered + */ + int TRACE_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl Traced Object}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTracedObject() + * @generated + */ + int TRACED_OBJECT = 10; + + /** + * The feature id for the 'Dimensions' reference list. + * + * + * @generated + * @ordered + */ + int TRACED_OBJECT__DIMENSIONS = 0; + + /** + * The number of structural features of the 'Traced Object' class. + * + * + * @generated + * @ordered + */ + int TRACED_OBJECT_FEATURE_COUNT = 1; + + /** + * The operation id for the 'Get Dimensions Internal' operation. + * + * + * @generated + * @ordered + */ + int TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = 0; + + /** + * The number of operations of the 'Traced Object' class. + * + * + * @generated + * @ordered + */ + int TRACED_OBJECT_OPERATION_COUNT = 1; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getDimension() + * @generated + */ + int DIMENSION = 11; + + /** + * The feature id for the 'Values' containment reference list. + * + * + * @generated + * @ordered + */ + int DIMENSION__VALUES = 0; + + /** + * The number of structural features of the 'Dimension' class. + * + * + * @generated + * @ordered + */ + int DIMENSION_FEATURE_COUNT = 1; + + /** + * The number of operations of the 'Dimension' class. + * + * + * @generated + * @ordered + */ + int DIMENSION_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getValue() + * @generated + */ + int VALUE = 12; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int VALUE__STATES = 0; + + /** + * The number of structural features of the 'Value' class. + * + * + * @generated + * @ordered + */ + int VALUE_FEATURE_COUNT = 1; + + /** + * The number of operations of the 'Value' class. + * + * + * @generated + * @ordered + */ + int VALUE_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.StateImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getState() + * @generated + */ + int STATE = 13; + + /** + * The feature id for the 'Started Steps' reference list. + * + * + * @generated + * @ordered + */ + int STATE__STARTED_STEPS = 0; + + /** + * The feature id for the 'Ended Steps' reference list. + * + * + * @generated + * @ordered + */ + int STATE__ENDED_STEPS = 1; + + /** + * The feature id for the 'Values' reference list. + * + * + * @generated + * @ordered + */ + int STATE__VALUES = 2; + + /** + * The number of structural features of the 'State' class. + * + * + * @generated + * @ordered + */ + int STATE_FEATURE_COUNT = 3; + + /** + * The number of operations of the 'State' class. + * + * + * @generated + * @ordered + */ + int STATE_OPERATION_COUNT = 0; + + /** + * The meta object id for the 'ISerializable' data type. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() + * @generated + */ + int ISERIALIZABLE = 14; + + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence MSE Occurrence}'. + * + * + * @return the meta object for class 'MSE Occurrence'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence + * @generated + */ + EClass getMSEOccurrence(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}'. + * + * + * @return the meta object for the reference 'Mse'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse() + * @see #getMSEOccurrence() + * @generated + */ + EReference getMSEOccurrence_Mse(); + + /** + * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters Parameters}'. + * + * + * @return the meta object for the attribute list 'Parameters'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters() + * @see #getMSEOccurrence() + * @generated + */ + EAttribute getMSEOccurrence_Parameters(); + + /** + * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult Result}'. + * + * + * @return the meta object for the attribute list 'Result'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult() + * @see #getMSEOccurrence() + * @generated + */ + EAttribute getMSEOccurrence_Result(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSE MSE}'. + * + * + * @return the meta object for class 'MSE'. + * @see fr.inria.diverse.trace.commons.model.trace.MSE + * @generated + */ + EClass getMSE(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.MSE#getCaller() Get Caller}' operation. + * + * + * @return the meta object for the 'Get Caller' operation. + * @see fr.inria.diverse.trace.commons.model.trace.MSE#getCaller() + * @generated + */ + EOperation getMSE__GetCaller(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.MSE#getAction() Get Action}' operation. + * + * + * @return the meta object for the 'Get Action' operation. + * @see fr.inria.diverse.trace.commons.model.trace.MSE#getAction() + * @generated + */ + EOperation getMSE__GetAction(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel MSE Model}'. + * + * + * @return the meta object for class 'MSE Model'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEModel + * @generated + */ + EClass getMSEModel(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs Owned MS Es}'. + * + * + * @return the meta object for the containment reference list 'Owned MS Es'. + * @see fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs() + * @see #getMSEModel() + * @generated + */ + EReference getMSEModel_OwnedMSEs(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE Generic MSE}'. + * + * + * @return the meta object for class 'Generic MSE'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE + * @generated + */ + EClass getGenericMSE(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}'. + * + * + * @return the meta object for the reference 'Caller Reference'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference() + * @see #getGenericMSE() + * @generated + */ + EReference getGenericMSE_CallerReference(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}'. + * + * + * @return the meta object for the reference 'Action Reference'. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference() + * @see #getGenericMSE() + * @generated + */ + EReference getGenericMSE_ActionReference(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCaller() Get Caller}' operation. + * + * + * @return the meta object for the 'Get Caller' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCaller() + * @generated + */ + EOperation getGenericMSE__GetCaller(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getAction() Get Action}' operation. + * + * + * @return the meta object for the 'Get Action' operation. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getAction() + * @generated + */ + EOperation getGenericMSE__GetAction(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. + * + * + * @return the meta object for class 'Step'. + * @see fr.inria.diverse.trace.commons.model.trace.Step + * @generated + */ + EClass getStep(); + + /** + * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}'. + * + * + * @return the meta object for the containment reference 'Mseoccurrence'. + * @see fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence() + * @see #getStep() + * @generated + */ + EReference getStep_Mseoccurrence(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}'. + * + * + * @return the meta object for the reference 'Starting State'. + * @see fr.inria.diverse.trace.commons.model.trace.Step#getStartingState() + * @see #getStep() + * @generated + */ + EReference getStep_StartingState(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}'. + * + * + * @return the meta object for the reference 'Ending State'. + * @see fr.inria.diverse.trace.commons.model.trace.Step#getEndingState() + * @see #getStep() + * @generated + */ + EReference getStep_EndingState(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. + * + * + * @return the meta object for class 'Big Step'. + * @see fr.inria.diverse.trace.commons.model.trace.BigStep + * @generated + */ + EClass getBigStep(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps Sub Steps}'. + * + * + * @return the meta object for the containment reference list 'Sub Steps'. + * @see fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps() + * @see #getBigStep() + * @generated + */ + EReference getBigStep_SubSteps(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. + * + * + * @return the meta object for class 'Small Step'. + * @see fr.inria.diverse.trace.commons.model.trace.SmallStep + * @generated + */ + EClass getSmallStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. + * + * + * @return the meta object for class 'Sequential Step'. + * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep + * @generated + */ + EClass getSequentialStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.ParallelStep Parallel Step}'. + * + * + * @return the meta object for class 'Parallel Step'. + * @see fr.inria.diverse.trace.commons.model.trace.ParallelStep + * @generated + */ + EClass getParallelStep(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. + * + * + * @return the meta object for class 'Trace'. + * @see fr.inria.diverse.trace.commons.model.trace.Trace + * @generated + */ + EClass getTrace(); + + /** + * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}'. + * + * + * @return the meta object for the containment reference 'Root Step'. + * @see fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep() + * @see #getTrace() + * @generated + */ + EReference getTrace_RootStep(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects Traced Objects}'. + * + * + * @return the meta object for the containment reference list 'Traced Objects'. + * @see fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects() + * @see #getTrace() + * @generated + */ + EReference getTrace_TracedObjects(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getStates States}'. + * + * + * @return the meta object for the containment reference list 'States'. + * @see fr.inria.diverse.trace.commons.model.trace.Trace#getStates() + * @see #getTrace() + * @generated + */ + EReference getTrace_States(); + + /** + * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}'. + * + * + * @return the meta object for the containment reference 'Launchconfiguration'. + * @see fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration() + * @see #getTrace() + * @generated + */ + EReference getTrace_Launchconfiguration(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. + * + * + * @return the meta object for class 'Traced Object'. + * @see fr.inria.diverse.trace.commons.model.trace.TracedObject + * @generated + */ + EClass getTracedObject(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions Dimensions}'. + * + * + * @return the meta object for the reference list 'Dimensions'. + * @see fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions() + * @see #getTracedObject() + * @generated + */ + EReference getTracedObject_Dimensions(); + + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensionsInternal() Get Dimensions Internal}' operation. + * + * + * @return the meta object for the 'Get Dimensions Internal' operation. + * @see fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensionsInternal() + * @generated + */ + EOperation getTracedObject__GetDimensionsInternal(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. + * + * + * @return the meta object for class 'Dimension'. + * @see fr.inria.diverse.trace.commons.model.trace.Dimension + * @generated + */ + EClass getDimension(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Dimension#getValues Values}'. + * + * + * @return the meta object for the containment reference list 'Values'. + * @see fr.inria.diverse.trace.commons.model.trace.Dimension#getValues() + * @see #getDimension() + * @generated + */ + EReference getDimension_Values(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. + * + * + * @return the meta object for class 'Value'. + * @see fr.inria.diverse.trace.commons.model.trace.Value + * @generated + */ + EClass getValue(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.Value#getStates States}'. + * + * + * @return the meta object for the reference list 'States'. + * @see fr.inria.diverse.trace.commons.model.trace.Value#getStates() + * @see #getValue() + * @generated + */ + EReference getValue_States(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. + * + * + * @return the meta object for class 'State'. + * @see fr.inria.diverse.trace.commons.model.trace.State + * @generated + */ + EClass getState(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}'. + * + * + * @return the meta object for the reference list 'Started Steps'. + * @see fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps() + * @see #getState() + * @generated + */ + EReference getState_StartedSteps(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}'. + * + * + * @return the meta object for the reference list 'Ended Steps'. + * @see fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps() + * @see #getState() + * @generated + */ + EReference getState_EndedSteps(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getValues Values}'. + * + * + * @return the meta object for the reference list 'Values'. + * @see fr.inria.diverse.trace.commons.model.trace.State#getValues() + * @see #getState() + * @generated + */ + EReference getState_Values(); + + /** + * Returns the meta object for data type 'ISerializable'. + * + * + * @return the meta object for data type 'ISerializable'. + * @model instanceClass="byte[]" + * @generated + */ + EDataType getISerializable(); + + /** + * Returns the factory that creates the instances of the model. + * + * + * @return the factory that creates the instances of the model. + * @generated + */ + TraceFactory getTraceFactory(); + + /** + * + * Defines literals for the meta objects that represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl MSE Occurrence}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEOccurrence() + * @generated + */ + EClass MSE_OCCURRENCE = eINSTANCE.getMSEOccurrence(); + + /** + * The meta object literal for the 'Mse' reference feature. + * + * + * @generated + */ + EReference MSE_OCCURRENCE__MSE = eINSTANCE.getMSEOccurrence_Mse(); + + /** + * The meta object literal for the 'Parameters' attribute list feature. + * + * + * @generated + */ + EAttribute MSE_OCCURRENCE__PARAMETERS = eINSTANCE.getMSEOccurrence_Parameters(); + + /** + * The meta object literal for the 'Result' attribute list feature. + * + * + * @generated + */ + EAttribute MSE_OCCURRENCE__RESULT = eINSTANCE.getMSEOccurrence_Result(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl MSE}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSE() + * @generated + */ + EClass MSE = eINSTANCE.getMSE(); + + /** + * The meta object literal for the 'Get Caller' operation. + * + * + * @generated + */ + EOperation MSE___GET_CALLER = eINSTANCE.getMSE__GetCaller(); + + /** + * The meta object literal for the 'Get Action' operation. + * + * + * @generated + */ + EOperation MSE___GET_ACTION = eINSTANCE.getMSE__GetAction(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl MSE Model}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEModel() + * @generated + */ + EClass MSE_MODEL = eINSTANCE.getMSEModel(); + + /** + * The meta object literal for the 'Owned MS Es' containment reference list feature. + * + * + * @generated + */ + EReference MSE_MODEL__OWNED_MS_ES = eINSTANCE.getMSEModel_OwnedMSEs(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl Generic MSE}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericMSE() + * @generated + */ + EClass GENERIC_MSE = eINSTANCE.getGenericMSE(); + + /** + * The meta object literal for the 'Caller Reference' reference feature. + * + * + * @generated + */ + EReference GENERIC_MSE__CALLER_REFERENCE = eINSTANCE.getGenericMSE_CallerReference(); + + /** + * The meta object literal for the 'Action Reference' reference feature. + * + * + * @generated + */ + EReference GENERIC_MSE__ACTION_REFERENCE = eINSTANCE.getGenericMSE_ActionReference(); + + /** + * The meta object literal for the 'Get Caller' operation. + * + * + * @generated + */ + EOperation GENERIC_MSE___GET_CALLER = eINSTANCE.getGenericMSE__GetCaller(); + + /** + * The meta object literal for the 'Get Action' operation. + * + * + * @generated + */ + EOperation GENERIC_MSE___GET_ACTION = eINSTANCE.getGenericMSE__GetAction(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.StepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getStep() + * @generated + */ + EClass STEP = eINSTANCE.getStep(); + + /** + * The meta object literal for the 'Mseoccurrence' containment reference feature. + * + * + * @generated + */ + EReference STEP__MSEOCCURRENCE = eINSTANCE.getStep_Mseoccurrence(); + + /** + * The meta object literal for the 'Starting State' reference feature. + * + * + * @generated + */ + EReference STEP__STARTING_STATE = eINSTANCE.getStep_StartingState(); + + /** + * The meta object literal for the 'Ending State' reference feature. + * + * + * @generated + */ + EReference STEP__ENDING_STATE = eINSTANCE.getStep_EndingState(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl Big Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getBigStep() + * @generated + */ + EClass BIG_STEP = eINSTANCE.getBigStep(); + + /** + * The meta object literal for the 'Sub Steps' containment reference list feature. + * + * + * @generated + */ + EReference BIG_STEP__SUB_STEPS = eINSTANCE.getBigStep_SubSteps(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl Small Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSmallStep() + * @generated + */ + EClass SMALL_STEP = eINSTANCE.getSmallStep(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl Sequential Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSequentialStep() + * @generated + */ + EClass SEQUENTIAL_STEP = eINSTANCE.getSequentialStep(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl Parallel Step}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getParallelStep() + * @generated + */ + EClass PARALLEL_STEP = eINSTANCE.getParallelStep(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl Trace}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTrace() + * @generated + */ + EClass TRACE = eINSTANCE.getTrace(); + + /** + * The meta object literal for the 'Root Step' containment reference feature. + * + * + * @generated + */ + EReference TRACE__ROOT_STEP = eINSTANCE.getTrace_RootStep(); + + /** + * The meta object literal for the 'Traced Objects' containment reference list feature. + * + * + * @generated + */ + EReference TRACE__TRACED_OBJECTS = eINSTANCE.getTrace_TracedObjects(); + + /** + * The meta object literal for the 'States' containment reference list feature. + * + * + * @generated + */ + EReference TRACE__STATES = eINSTANCE.getTrace_States(); + + /** + * The meta object literal for the 'Launchconfiguration' containment reference feature. + * + * + * @generated + */ + EReference TRACE__LAUNCHCONFIGURATION = eINSTANCE.getTrace_Launchconfiguration(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl Traced Object}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTracedObject() + * @generated + */ + EClass TRACED_OBJECT = eINSTANCE.getTracedObject(); + + /** + * The meta object literal for the 'Dimensions' reference list feature. + * + * + * @generated + */ + EReference TRACED_OBJECT__DIMENSIONS = eINSTANCE.getTracedObject_Dimensions(); + + /** + * The meta object literal for the 'Get Dimensions Internal' operation. + * + * + * @generated + */ + EOperation TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = eINSTANCE.getTracedObject__GetDimensionsInternal(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getDimension() + * @generated + */ + EClass DIMENSION = eINSTANCE.getDimension(); + + /** + * The meta object literal for the 'Values' containment reference list feature. + * + * + * @generated + */ + EReference DIMENSION__VALUES = eINSTANCE.getDimension_Values(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getValue() + * @generated + */ + EClass VALUE = eINSTANCE.getValue(); + + /** + * The meta object literal for the 'States' reference list feature. + * + * + * @generated + */ + EReference VALUE__STATES = eINSTANCE.getValue_States(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.StateImpl + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getState() + * @generated + */ + EClass STATE = eINSTANCE.getState(); + + /** + * The meta object literal for the 'Started Steps' reference list feature. + * + * + * @generated + */ + EReference STATE__STARTED_STEPS = eINSTANCE.getState_StartedSteps(); + + /** + * The meta object literal for the 'Ended Steps' reference list feature. + * + * + * @generated + */ + EReference STATE__ENDED_STEPS = eINSTANCE.getState_EndedSteps(); + + /** + * The meta object literal for the 'Values' reference list feature. + * + * + * @generated + */ + EReference STATE__VALUES = eINSTANCE.getState_Values(); + + /** + * The meta object literal for the 'ISerializable' data type. + * + * + * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() + * @generated + */ + EDataType ISERIALIZABLE = eINSTANCE.getISerializable(); + + } + +} //TracePackage diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java new file mode 100644 index 000000000..a7b2f4d73 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java @@ -0,0 +1,51 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Traced Object'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions Dimensions}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTracedObject() + * @model abstract="true" + * @generated + */ +public interface TracedObject> extends EObject { + /** + * Returns the value of the 'Dimensions' reference list. + * + *

+ * If the meaning of the 'Dimensions' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Dimensions' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTracedObject_Dimensions() + * @model transient="true" volatile="true" + * annotation="http://www.eclipse.org/emf/2002/GenModel get='return getDimensionsInternal();'" + * @generated + */ + EList getDimensions(); + + /** + * + * + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='// Default implementation, returning empty list.\nfinal EList result = new org.eclipse.emf.ecore.util.BasicInternalEList(Object.class);\nreturn result;'" + * @generated + */ + EList getDimensionsInternal(); + +} // TracedObject diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java new file mode 100644 index 000000000..75292c194 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java @@ -0,0 +1,43 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.Value#getStates States}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue() + * @model abstract="true" + * @generated + */ +public interface Value> extends EObject { + /** + * Returns the value of the 'States' reference list. + * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getValues Values}'. + * + *

+ * If the meaning of the 'States' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'States' reference list. + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue_States() + * @see fr.inria.diverse.trace.commons.model.trace.State#getValues + * @model opposite="values" + * @generated + */ + EList getStates(); + +} // Value diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java new file mode 100644 index 000000000..b317200b9 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java @@ -0,0 +1,151 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Big Step'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl#getSubSteps Sub Steps}
    • + *
+ * + * @generated + */ +public abstract class BigStepImpl, StateSubType extends State> extends StepImpl implements BigStep { + /** + * The cached value of the '{@link #getSubSteps() Sub Steps}' containment reference list. + * + * + * @see #getSubSteps() + * @generated + * @ordered + */ + protected EList subSteps; + + /** + * + * + * @generated + */ + protected BigStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.BIG_STEP; + } + + /** + * + * + * @generated + */ + public EList getSubSteps() { + if (subSteps == null) { + subSteps = new EObjectContainmentEList(Step.class, this, TracePackage.BIG_STEP__SUB_STEPS); + } + return subSteps; + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.BIG_STEP__SUB_STEPS: + return ((InternalEList)getSubSteps()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.BIG_STEP__SUB_STEPS: + return getSubSteps(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.BIG_STEP__SUB_STEPS: + getSubSteps().clear(); + getSubSteps().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.BIG_STEP__SUB_STEPS: + getSubSteps().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.BIG_STEP__SUB_STEPS: + return subSteps != null && !subSteps.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //BigStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java new file mode 100644 index 000000000..76aefb7b9 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java @@ -0,0 +1,152 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.Value; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Dimension'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl#getValues Values}
    • + *
+ * + * @generated + */ +public abstract class DimensionImpl> extends MinimalEObjectImpl.Container implements Dimension { + /** + * The cached value of the '{@link #getValues() Values}' containment reference list. + * + * + * @see #getValues() + * @generated + * @ordered + */ + protected EList values; + + /** + * + * + * @generated + */ + protected DimensionImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.DIMENSION; + } + + /** + * + * + * @generated + */ + public EList getValues() { + if (values == null) { + values = new EObjectContainmentEList(Value.class, this, TracePackage.DIMENSION__VALUES); + } + return values; + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.DIMENSION__VALUES: + return ((InternalEList)getValues()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.DIMENSION__VALUES: + return getValues(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.DIMENSION__VALUES: + getValues().clear(); + getValues().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.DIMENSION__VALUES: + getValues().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.DIMENSION__VALUES: + return values != null && !values.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //DimensionImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java new file mode 100644 index 000000000..b6555ea3e --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java @@ -0,0 +1,255 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.GenericMSE; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EOperation; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Generic MSE'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl#getCallerReference Caller Reference}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl#getActionReference Action Reference}
    • + *
+ * + * @generated + */ +public class GenericMSEImpl extends MSEImpl implements GenericMSE { + /** + * The cached value of the '{@link #getCallerReference() Caller Reference}' reference. + * + * + * @see #getCallerReference() + * @generated + * @ordered + */ + protected EObject callerReference; + + /** + * The cached value of the '{@link #getActionReference() Action Reference}' reference. + * + * + * @see #getActionReference() + * @generated + * @ordered + */ + protected EOperation actionReference; + + /** + * + * + * @generated + */ + protected GenericMSEImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.GENERIC_MSE; + } + + /** + * + * + * @generated + */ + public EObject getCallerReference() { + if (callerReference != null && callerReference.eIsProxy()) { + InternalEObject oldCallerReference = (InternalEObject)callerReference; + callerReference = eResolveProxy(oldCallerReference); + if (callerReference != oldCallerReference) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_MSE__CALLER_REFERENCE, oldCallerReference, callerReference)); + } + } + return callerReference; + } + + /** + * + * + * @generated + */ + public EObject basicGetCallerReference() { + return callerReference; + } + + /** + * + * + * @generated + */ + public void setCallerReference(EObject newCallerReference) { + EObject oldCallerReference = callerReference; + callerReference = newCallerReference; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_MSE__CALLER_REFERENCE, oldCallerReference, callerReference)); + } + + /** + * + * + * @generated + */ + public EOperation getActionReference() { + if (actionReference != null && actionReference.eIsProxy()) { + InternalEObject oldActionReference = (InternalEObject)actionReference; + actionReference = (EOperation)eResolveProxy(oldActionReference); + if (actionReference != oldActionReference) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.GENERIC_MSE__ACTION_REFERENCE, oldActionReference, actionReference)); + } + } + return actionReference; + } + + /** + * + * + * @generated + */ + public EOperation basicGetActionReference() { + return actionReference; + } + + /** + * + * + * @generated + */ + public void setActionReference(EOperation newActionReference) { + EOperation oldActionReference = actionReference; + actionReference = newActionReference; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.GENERIC_MSE__ACTION_REFERENCE, oldActionReference, actionReference)); + } + + /** + * + * + * @generated + */ + public EObject getCaller() { + return callerReference; + } + + /** + * + * + * @generated + */ + public EOperation getAction() { + return actionReference; + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.GENERIC_MSE__CALLER_REFERENCE: + if (resolve) return getCallerReference(); + return basicGetCallerReference(); + case TracePackage.GENERIC_MSE__ACTION_REFERENCE: + if (resolve) return getActionReference(); + return basicGetActionReference(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.GENERIC_MSE__CALLER_REFERENCE: + setCallerReference((EObject)newValue); + return; + case TracePackage.GENERIC_MSE__ACTION_REFERENCE: + setActionReference((EOperation)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_MSE__CALLER_REFERENCE: + setCallerReference((EObject)null); + return; + case TracePackage.GENERIC_MSE__ACTION_REFERENCE: + setActionReference((EOperation)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.GENERIC_MSE__CALLER_REFERENCE: + return callerReference != null; + case TracePackage.GENERIC_MSE__ACTION_REFERENCE: + return actionReference != null; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case TracePackage.GENERIC_MSE___GET_CALLER: + return getCaller(); + case TracePackage.GENERIC_MSE___GET_ACTION: + return getAction(); + } + return super.eInvoke(operationID, arguments); + } + +} //GenericMSEImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java new file mode 100644 index 000000000..7be75fa67 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java @@ -0,0 +1,83 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.MSE; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EOperation; + +import org.eclipse.emf.ecore.impl.ENamedElementImpl; + +/** + * + * An implementation of the model object 'MSE'. + * + * + * @generated + */ +public abstract class MSEImpl extends ENamedElementImpl implements MSE { + /** + * + * + * @generated + */ + protected MSEImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.MSE; + } + + /** + * + * + * @generated + */ + public EObject getCaller() { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * + * + * @generated + */ + public EOperation getAction() { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case TracePackage.MSE___GET_CALLER: + return getCaller(); + case TracePackage.MSE___GET_ACTION: + return getAction(); + } + return super.eInvoke(operationID, arguments); + } + +} //MSEImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java new file mode 100644 index 000000000..4b5ca8752 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java @@ -0,0 +1,152 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.MSE; +import fr.inria.diverse.trace.commons.model.trace.MSEModel; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'MSE Model'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl#getOwnedMSEs Owned MS Es}
    • + *
+ * + * @generated + */ +public class MSEModelImpl extends MinimalEObjectImpl.Container implements MSEModel { + /** + * The cached value of the '{@link #getOwnedMSEs() Owned MS Es}' containment reference list. + * + * + * @see #getOwnedMSEs() + * @generated + * @ordered + */ + protected EList ownedMSEs; + + /** + * + * + * @generated + */ + protected MSEModelImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.MSE_MODEL; + } + + /** + * + * + * @generated + */ + public EList getOwnedMSEs() { + if (ownedMSEs == null) { + ownedMSEs = new EObjectContainmentEList(MSE.class, this, TracePackage.MSE_MODEL__OWNED_MS_ES); + } + return ownedMSEs; + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.MSE_MODEL__OWNED_MS_ES: + return ((InternalEList)getOwnedMSEs()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.MSE_MODEL__OWNED_MS_ES: + return getOwnedMSEs(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.MSE_MODEL__OWNED_MS_ES: + getOwnedMSEs().clear(); + getOwnedMSEs().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.MSE_MODEL__OWNED_MS_ES: + getOwnedMSEs().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.MSE_MODEL__OWNED_MS_ES: + return ownedMSEs != null && !ownedMSEs.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //MSEModelImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java new file mode 100644 index 000000000..11e20adba --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java @@ -0,0 +1,250 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.MSE; +import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; + +/** + * + * An implementation of the model object 'MSE Occurrence'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl#getMse Mse}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl#getParameters Parameters}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl#getResult Result}
    • + *
+ * + * @generated + */ +public class MSEOccurrenceImpl extends MinimalEObjectImpl.Container implements MSEOccurrence { + /** + * The cached value of the '{@link #getMse() Mse}' reference. + * + * + * @see #getMse() + * @generated + * @ordered + */ + protected MSE mse; + + /** + * The cached value of the '{@link #getParameters() Parameters}' attribute list. + * + * + * @see #getParameters() + * @generated + * @ordered + */ + protected EList parameters; + + /** + * The cached value of the '{@link #getResult() Result}' attribute list. + * + * + * @see #getResult() + * @generated + * @ordered + */ + protected EList result; + + /** + * + * + * @generated + */ + protected MSEOccurrenceImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.MSE_OCCURRENCE; + } + + /** + * + * + * @generated + */ + public MSE getMse() { + if (mse != null && mse.eIsProxy()) { + InternalEObject oldMse = (InternalEObject)mse; + mse = (MSE)eResolveProxy(oldMse); + if (mse != oldMse) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.MSE_OCCURRENCE__MSE, oldMse, mse)); + } + } + return mse; + } + + /** + * + * + * @generated + */ + public MSE basicGetMse() { + return mse; + } + + /** + * + * + * @generated + */ + public void setMse(MSE newMse) { + MSE oldMse = mse; + mse = newMse; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.MSE_OCCURRENCE__MSE, oldMse, mse)); + } + + /** + * + * + * @generated + */ + public EList getParameters() { + if (parameters == null) { + parameters = new EDataTypeUniqueEList(Object.class, this, TracePackage.MSE_OCCURRENCE__PARAMETERS); + } + return parameters; + } + + /** + * + * + * @generated + */ + public EList getResult() { + if (result == null) { + result = new EDataTypeUniqueEList(Object.class, this, TracePackage.MSE_OCCURRENCE__RESULT); + } + return result; + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.MSE_OCCURRENCE__MSE: + if (resolve) return getMse(); + return basicGetMse(); + case TracePackage.MSE_OCCURRENCE__PARAMETERS: + return getParameters(); + case TracePackage.MSE_OCCURRENCE__RESULT: + return getResult(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.MSE_OCCURRENCE__MSE: + setMse((MSE)newValue); + return; + case TracePackage.MSE_OCCURRENCE__PARAMETERS: + getParameters().clear(); + getParameters().addAll((Collection)newValue); + return; + case TracePackage.MSE_OCCURRENCE__RESULT: + getResult().clear(); + getResult().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.MSE_OCCURRENCE__MSE: + setMse((MSE)null); + return; + case TracePackage.MSE_OCCURRENCE__PARAMETERS: + getParameters().clear(); + return; + case TracePackage.MSE_OCCURRENCE__RESULT: + getResult().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.MSE_OCCURRENCE__MSE: + return mse != null; + case TracePackage.MSE_OCCURRENCE__PARAMETERS: + return parameters != null && !parameters.isEmpty(); + case TracePackage.MSE_OCCURRENCE__RESULT: + return result != null && !result.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (parameters: "); + result.append(parameters); + result.append(", result: "); + result.append(result); + result.append(')'); + return result.toString(); + } + +} //MSEOccurrenceImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java new file mode 100644 index 000000000..937c9f2b7 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java @@ -0,0 +1,39 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.ParallelStep; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Parallel Step'. + * + * + * @generated + */ +public abstract class ParallelStepImpl, StateSubType extends State> extends BigStepImpl implements ParallelStep { + /** + * + * + * @generated + */ + protected ParallelStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.PARALLEL_STEP; + } + +} //ParallelStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java new file mode 100644 index 000000000..73100df30 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java @@ -0,0 +1,39 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Sequential Step'. + * + * + * @generated + */ +public abstract class SequentialStepImpl, StateSubType extends State> extends BigStepImpl implements SequentialStep { + /** + * + * + * @generated + */ + protected SequentialStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.SEQUENTIAL_STEP; + } + +} //SequentialStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java new file mode 100644 index 000000000..368c9512f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java @@ -0,0 +1,38 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.SmallStep; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * + * An implementation of the model object 'Small Step'. + * + * + * @generated + */ +public abstract class SmallStepImpl> extends StepImpl implements SmallStep { + /** + * + * + * @generated + */ + protected SmallStepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.SMALL_STEP; + } + +} //SmallStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java new file mode 100644 index 000000000..b57fb28f4 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java @@ -0,0 +1,244 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.Value; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'State'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getStartedSteps Started Steps}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getEndedSteps Ended Steps}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getValues Values}
    • + *
+ * + * @generated + */ +public abstract class StateImpl, ValueSubType extends Value> extends MinimalEObjectImpl.Container implements State { + /** + * The cached value of the '{@link #getStartedSteps() Started Steps}' reference list. + * + * + * @see #getStartedSteps() + * @generated + * @ordered + */ + protected EList startedSteps; + + /** + * The cached value of the '{@link #getEndedSteps() Ended Steps}' reference list. + * + * + * @see #getEndedSteps() + * @generated + * @ordered + */ + protected EList endedSteps; + + /** + * The cached value of the '{@link #getValues() Values}' reference list. + * + * + * @see #getValues() + * @generated + * @ordered + */ + protected EList values; + + /** + * + * + * @generated + */ + protected StateImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.STATE; + } + + /** + * + * + * @generated + */ + public EList getStartedSteps() { + if (startedSteps == null) { + startedSteps = new EObjectWithInverseResolvingEList(Step.class, this, TracePackage.STATE__STARTED_STEPS, TracePackage.STEP__STARTING_STATE); + } + return startedSteps; + } + + /** + * + * + * @generated + */ + public EList getEndedSteps() { + if (endedSteps == null) { + endedSteps = new EObjectWithInverseResolvingEList(Step.class, this, TracePackage.STATE__ENDED_STEPS, TracePackage.STEP__ENDING_STATE); + } + return endedSteps; + } + + /** + * + * + * @generated + */ + public EList getValues() { + if (values == null) { + values = new EObjectWithInverseResolvingEList.ManyInverse(Value.class, this, TracePackage.STATE__VALUES, TracePackage.VALUE__STATES); + } + return values; + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + return ((InternalEList)(InternalEList)getStartedSteps()).basicAdd(otherEnd, msgs); + case TracePackage.STATE__ENDED_STEPS: + return ((InternalEList)(InternalEList)getEndedSteps()).basicAdd(otherEnd, msgs); + case TracePackage.STATE__VALUES: + return ((InternalEList)(InternalEList)getValues()).basicAdd(otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + return ((InternalEList)getStartedSteps()).basicRemove(otherEnd, msgs); + case TracePackage.STATE__ENDED_STEPS: + return ((InternalEList)getEndedSteps()).basicRemove(otherEnd, msgs); + case TracePackage.STATE__VALUES: + return ((InternalEList)getValues()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + return getStartedSteps(); + case TracePackage.STATE__ENDED_STEPS: + return getEndedSteps(); + case TracePackage.STATE__VALUES: + return getValues(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + getStartedSteps().clear(); + getStartedSteps().addAll((Collection)newValue); + return; + case TracePackage.STATE__ENDED_STEPS: + getEndedSteps().clear(); + getEndedSteps().addAll((Collection)newValue); + return; + case TracePackage.STATE__VALUES: + getValues().clear(); + getValues().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + getStartedSteps().clear(); + return; + case TracePackage.STATE__ENDED_STEPS: + getEndedSteps().clear(); + return; + case TracePackage.STATE__VALUES: + getValues().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.STATE__STARTED_STEPS: + return startedSteps != null && !startedSteps.isEmpty(); + case TracePackage.STATE__ENDED_STEPS: + return endedSteps != null && !endedSteps.isEmpty(); + case TracePackage.STATE__VALUES: + return values != null && !values.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //StateImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java new file mode 100644 index 000000000..39e4fca5c --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java @@ -0,0 +1,369 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +/** + * + * An implementation of the model object 'Step'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getMseoccurrence Mseoccurrence}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getStartingState Starting State}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getEndingState Ending State}
    • + *
+ * + * @generated + */ +public abstract class StepImpl> extends MinimalEObjectImpl.Container implements Step { + /** + * The cached value of the '{@link #getMseoccurrence() Mseoccurrence}' containment reference. + * + * + * @see #getMseoccurrence() + * @generated + * @ordered + */ + protected MSEOccurrence mseoccurrence; + + /** + * The cached value of the '{@link #getStartingState() Starting State}' reference. + * + * + * @see #getStartingState() + * @generated + * @ordered + */ + protected StateSubType startingState; + + /** + * The cached value of the '{@link #getEndingState() Ending State}' reference. + * + * + * @see #getEndingState() + * @generated + * @ordered + */ + protected StateSubType endingState; + + /** + * + * + * @generated + */ + protected StepImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.STEP; + } + + /** + * + * + * @generated + */ + public MSEOccurrence getMseoccurrence() { + return mseoccurrence; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetMseoccurrence(MSEOccurrence newMseoccurrence, NotificationChain msgs) { + MSEOccurrence oldMseoccurrence = mseoccurrence; + mseoccurrence = newMseoccurrence; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.STEP__MSEOCCURRENCE, oldMseoccurrence, newMseoccurrence); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setMseoccurrence(MSEOccurrence newMseoccurrence) { + if (newMseoccurrence != mseoccurrence) { + NotificationChain msgs = null; + if (mseoccurrence != null) + msgs = ((InternalEObject)mseoccurrence).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TracePackage.STEP__MSEOCCURRENCE, null, msgs); + if (newMseoccurrence != null) + msgs = ((InternalEObject)newMseoccurrence).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TracePackage.STEP__MSEOCCURRENCE, null, msgs); + msgs = basicSetMseoccurrence(newMseoccurrence, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STEP__MSEOCCURRENCE, newMseoccurrence, newMseoccurrence)); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + public StateSubType getStartingState() { + if (startingState != null && startingState.eIsProxy()) { + InternalEObject oldStartingState = (InternalEObject)startingState; + startingState = (StateSubType)eResolveProxy(oldStartingState); + if (startingState != oldStartingState) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.STEP__STARTING_STATE, oldStartingState, startingState)); + } + } + return startingState; + } + + /** + * + * + * @generated + */ + public StateSubType basicGetStartingState() { + return startingState; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetStartingState(StateSubType newStartingState, NotificationChain msgs) { + StateSubType oldStartingState = startingState; + startingState = newStartingState; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.STEP__STARTING_STATE, oldStartingState, newStartingState); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setStartingState(StateSubType newStartingState) { + if (newStartingState != startingState) { + NotificationChain msgs = null; + if (startingState != null) + msgs = ((InternalEObject)startingState).eInverseRemove(this, TracePackage.STATE__STARTED_STEPS, State.class, msgs); + if (newStartingState != null) + msgs = ((InternalEObject)newStartingState).eInverseAdd(this, TracePackage.STATE__STARTED_STEPS, State.class, msgs); + msgs = basicSetStartingState(newStartingState, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STEP__STARTING_STATE, newStartingState, newStartingState)); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + public StateSubType getEndingState() { + if (endingState != null && endingState.eIsProxy()) { + InternalEObject oldEndingState = (InternalEObject)endingState; + endingState = (StateSubType)eResolveProxy(oldEndingState); + if (endingState != oldEndingState) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TracePackage.STEP__ENDING_STATE, oldEndingState, endingState)); + } + } + return endingState; + } + + /** + * + * + * @generated + */ + public StateSubType basicGetEndingState() { + return endingState; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetEndingState(StateSubType newEndingState, NotificationChain msgs) { + StateSubType oldEndingState = endingState; + endingState = newEndingState; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.STEP__ENDING_STATE, oldEndingState, newEndingState); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setEndingState(StateSubType newEndingState) { + if (newEndingState != endingState) { + NotificationChain msgs = null; + if (endingState != null) + msgs = ((InternalEObject)endingState).eInverseRemove(this, TracePackage.STATE__ENDED_STEPS, State.class, msgs); + if (newEndingState != null) + msgs = ((InternalEObject)newEndingState).eInverseAdd(this, TracePackage.STATE__ENDED_STEPS, State.class, msgs); + msgs = basicSetEndingState(newEndingState, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.STEP__ENDING_STATE, newEndingState, newEndingState)); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.STEP__STARTING_STATE: + if (startingState != null) + msgs = ((InternalEObject)startingState).eInverseRemove(this, TracePackage.STATE__STARTED_STEPS, State.class, msgs); + return basicSetStartingState((StateSubType)otherEnd, msgs); + case TracePackage.STEP__ENDING_STATE: + if (endingState != null) + msgs = ((InternalEObject)endingState).eInverseRemove(this, TracePackage.STATE__ENDED_STEPS, State.class, msgs); + return basicSetEndingState((StateSubType)otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.STEP__MSEOCCURRENCE: + return basicSetMseoccurrence(null, msgs); + case TracePackage.STEP__STARTING_STATE: + return basicSetStartingState(null, msgs); + case TracePackage.STEP__ENDING_STATE: + return basicSetEndingState(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.STEP__MSEOCCURRENCE: + return getMseoccurrence(); + case TracePackage.STEP__STARTING_STATE: + if (resolve) return getStartingState(); + return basicGetStartingState(); + case TracePackage.STEP__ENDING_STATE: + if (resolve) return getEndingState(); + return basicGetEndingState(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.STEP__MSEOCCURRENCE: + setMseoccurrence((MSEOccurrence)newValue); + return; + case TracePackage.STEP__STARTING_STATE: + setStartingState((StateSubType)newValue); + return; + case TracePackage.STEP__ENDING_STATE: + setEndingState((StateSubType)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.STEP__MSEOCCURRENCE: + setMseoccurrence((MSEOccurrence)null); + return; + case TracePackage.STEP__STARTING_STATE: + setStartingState((StateSubType)null); + return; + case TracePackage.STEP__ENDING_STATE: + setEndingState((StateSubType)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.STEP__MSEOCCURRENCE: + return mseoccurrence != null; + case TracePackage.STEP__STARTING_STATE: + return startingState != null; + case TracePackage.STEP__ENDING_STATE: + return endingState != null; + } + return super.eIsSet(featureID); + } + +} //StepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java new file mode 100644 index 000000000..ad935fbbc --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java @@ -0,0 +1,166 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.*; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; + +/** + * + * An implementation of the model Factory. + * + * @generated + */ +public class TraceFactoryImpl extends EFactoryImpl implements TraceFactory { + /** + * Creates the default factory implementation. + * + * + * @generated + */ + public static TraceFactory init() { + try { + TraceFactory theTraceFactory = (TraceFactory)EPackage.Registry.INSTANCE.getEFactory(TracePackage.eNS_URI); + if (theTraceFactory != null) { + return theTraceFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new TraceFactoryImpl(); + } + + /** + * Creates an instance of the factory. + * + * + * @generated + */ + public TraceFactoryImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case TracePackage.MSE_OCCURRENCE: return createMSEOccurrence(); + case TracePackage.MSE_MODEL: return createMSEModel(); + case TracePackage.GENERIC_MSE: return createGenericMSE(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + @Override + public Object createFromString(EDataType eDataType, String initialValue) { + switch (eDataType.getClassifierID()) { + case TracePackage.ISERIALIZABLE: + return createISerializableFromString(eDataType, initialValue); + default: + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + @Override + public String convertToString(EDataType eDataType, Object instanceValue) { + switch (eDataType.getClassifierID()) { + case TracePackage.ISERIALIZABLE: + return convertISerializableToString(eDataType, instanceValue); + default: + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + public MSEOccurrence createMSEOccurrence() { + MSEOccurrenceImpl mseOccurrence = new MSEOccurrenceImpl(); + return mseOccurrence; + } + + /** + * + * + * @generated + */ + public MSEModel createMSEModel() { + MSEModelImpl mseModel = new MSEModelImpl(); + return mseModel; + } + + /** + * + * + * @generated + */ + public GenericMSE createGenericMSE() { + GenericMSEImpl genericMSE = new GenericMSEImpl(); + return genericMSE; + } + + /** + * + * + * @generated + */ + public byte[] createISerializableFromString(EDataType eDataType, String initialValue) { + return (byte[])super.createFromString(initialValue); + } + + /** + * + * + * @generated + */ + public String convertISerializableToString(EDataType eDataType, Object instanceValue) { + return super.convertToString(instanceValue); + } + + /** + * + * + * @generated + */ + public TracePackage getTracePackage() { + return (TracePackage)getEPackage(); + } + + /** + * + * + * @deprecated + * @generated + */ + @Deprecated + public static TracePackage getPackage() { + return TracePackage.eINSTANCE; + } + +} //TraceFactoryImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java new file mode 100644 index 000000000..2b9d2321b --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java @@ -0,0 +1,326 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; + +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Trace'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getRootStep Root Step}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getTracedObjects Traced Objects}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getStates States}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getLaunchconfiguration Launchconfiguration}
    • + *
+ * + * @generated + */ +public abstract class TraceImpl, TracedObjectSubtype extends TracedObject, StateSubType extends State> extends MinimalEObjectImpl.Container implements Trace { + /** + * The cached value of the '{@link #getRootStep() Root Step}' containment reference. + * + * + * @see #getRootStep() + * @generated + * @ordered + */ + protected StepSubType rootStep; + + /** + * The cached value of the '{@link #getTracedObjects() Traced Objects}' containment reference list. + * + * + * @see #getTracedObjects() + * @generated + * @ordered + */ + protected EList tracedObjects; + + /** + * The cached value of the '{@link #getStates() States}' containment reference list. + * + * + * @see #getStates() + * @generated + * @ordered + */ + protected EList states; + + /** + * The cached value of the '{@link #getLaunchconfiguration() Launchconfiguration}' containment reference. + * + * + * @see #getLaunchconfiguration() + * @generated + * @ordered + */ + protected LaunchConfiguration launchconfiguration; + + /** + * + * + * @generated + */ + protected TraceImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.TRACE; + } + + /** + * + * + * @generated + */ + public StepSubType getRootStep() { + return rootStep; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetRootStep(StepSubType newRootStep, NotificationChain msgs) { + StepSubType oldRootStep = rootStep; + rootStep = newRootStep; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.TRACE__ROOT_STEP, oldRootStep, newRootStep); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setRootStep(StepSubType newRootStep) { + if (newRootStep != rootStep) { + NotificationChain msgs = null; + if (rootStep != null) + msgs = ((InternalEObject)rootStep).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TracePackage.TRACE__ROOT_STEP, null, msgs); + if (newRootStep != null) + msgs = ((InternalEObject)newRootStep).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TracePackage.TRACE__ROOT_STEP, null, msgs); + msgs = basicSetRootStep(newRootStep, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.TRACE__ROOT_STEP, newRootStep, newRootStep)); + } + + /** + * + * + * @generated + */ + public EList getTracedObjects() { + if (tracedObjects == null) { + tracedObjects = new EObjectContainmentEList(TracedObject.class, this, TracePackage.TRACE__TRACED_OBJECTS); + } + return tracedObjects; + } + + /** + * + * + * @generated + */ + public EList getStates() { + if (states == null) { + states = new EObjectContainmentEList(State.class, this, TracePackage.TRACE__STATES); + } + return states; + } + + /** + * + * + * @generated + */ + public LaunchConfiguration getLaunchconfiguration() { + return launchconfiguration; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetLaunchconfiguration(LaunchConfiguration newLaunchconfiguration, NotificationChain msgs) { + LaunchConfiguration oldLaunchconfiguration = launchconfiguration; + launchconfiguration = newLaunchconfiguration; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TracePackage.TRACE__LAUNCHCONFIGURATION, oldLaunchconfiguration, newLaunchconfiguration); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setLaunchconfiguration(LaunchConfiguration newLaunchconfiguration) { + if (newLaunchconfiguration != launchconfiguration) { + NotificationChain msgs = null; + if (launchconfiguration != null) + msgs = ((InternalEObject)launchconfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TracePackage.TRACE__LAUNCHCONFIGURATION, null, msgs); + if (newLaunchconfiguration != null) + msgs = ((InternalEObject)newLaunchconfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TracePackage.TRACE__LAUNCHCONFIGURATION, null, msgs); + msgs = basicSetLaunchconfiguration(newLaunchconfiguration, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.TRACE__LAUNCHCONFIGURATION, newLaunchconfiguration, newLaunchconfiguration)); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.TRACE__ROOT_STEP: + return basicSetRootStep(null, msgs); + case TracePackage.TRACE__TRACED_OBJECTS: + return ((InternalEList)getTracedObjects()).basicRemove(otherEnd, msgs); + case TracePackage.TRACE__STATES: + return ((InternalEList)getStates()).basicRemove(otherEnd, msgs); + case TracePackage.TRACE__LAUNCHCONFIGURATION: + return basicSetLaunchconfiguration(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.TRACE__ROOT_STEP: + return getRootStep(); + case TracePackage.TRACE__TRACED_OBJECTS: + return getTracedObjects(); + case TracePackage.TRACE__STATES: + return getStates(); + case TracePackage.TRACE__LAUNCHCONFIGURATION: + return getLaunchconfiguration(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.TRACE__ROOT_STEP: + setRootStep((StepSubType)newValue); + return; + case TracePackage.TRACE__TRACED_OBJECTS: + getTracedObjects().clear(); + getTracedObjects().addAll((Collection)newValue); + return; + case TracePackage.TRACE__STATES: + getStates().clear(); + getStates().addAll((Collection)newValue); + return; + case TracePackage.TRACE__LAUNCHCONFIGURATION: + setLaunchconfiguration((LaunchConfiguration)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.TRACE__ROOT_STEP: + setRootStep((StepSubType)null); + return; + case TracePackage.TRACE__TRACED_OBJECTS: + getTracedObjects().clear(); + return; + case TracePackage.TRACE__STATES: + getStates().clear(); + return; + case TracePackage.TRACE__LAUNCHCONFIGURATION: + setLaunchconfiguration((LaunchConfiguration)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.TRACE__ROOT_STEP: + return rootStep != null; + case TracePackage.TRACE__TRACED_OBJECTS: + return tracedObjects != null && !tracedObjects.isEmpty(); + case TracePackage.TRACE__STATES: + return states != null && !states.isEmpty(); + case TracePackage.TRACE__LAUNCHCONFIGURATION: + return launchconfiguration != null; + } + return super.eIsSet(featureID); + } + +} //TraceImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java new file mode 100644 index 000000000..ce20edc95 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java @@ -0,0 +1,886 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; + +import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.GenericMSE; +import fr.inria.diverse.trace.commons.model.trace.MSEModel; +import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import fr.inria.diverse.trace.commons.model.trace.ParallelStep; +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.SmallStep; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TraceFactory; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EGenericType; +import org.eclipse.emf.ecore.EOperation; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.ETypeParameter; +import org.eclipse.emf.ecore.EcorePackage; + +import org.eclipse.emf.ecore.impl.EPackageImpl; + +/** + * + * An implementation of the model Package. + * + * @generated + */ +public class TracePackageImpl extends EPackageImpl implements TracePackage { + /** + * + * + * @generated + */ + private EClass mseOccurrenceEClass = null; + + /** + * + * + * @generated + */ + private EClass mseEClass = null; + + /** + * + * + * @generated + */ + private EClass mseModelEClass = null; + + /** + * + * + * @generated + */ + private EClass genericMSEEClass = null; + + /** + * + * + * @generated + */ + private EClass stepEClass = null; + + /** + * + * + * @generated + */ + private EClass bigStepEClass = null; + + /** + * + * + * @generated + */ + private EClass smallStepEClass = null; + + /** + * + * + * @generated + */ + private EClass sequentialStepEClass = null; + + /** + * + * + * @generated + */ + private EClass parallelStepEClass = null; + + /** + * + * + * @generated + */ + private EClass traceEClass = null; + + /** + * + * + * @generated + */ + private EClass tracedObjectEClass = null; + + /** + * + * + * @generated + */ + private EClass dimensionEClass = null; + + /** + * + * + * @generated + */ + private EClass valueEClass = null; + + /** + * + * + * @generated + */ + private EClass stateEClass = null; + + /** + * + * + * @generated + */ + private EDataType iSerializableEDataType = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + *

Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * + * + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#eNS_URI + * @see #init() + * @generated + */ + private TracePackageImpl() { + super(eNS_URI, TraceFactory.eINSTANCE); + } + + /** + * + * + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * + *

This method is used to initialize {@link TracePackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * + * + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static TracePackage init() { + if (isInited) return (TracePackage)EPackage.Registry.INSTANCE.getEPackage(TracePackage.eNS_URI); + + // Obtain or create and register package + TracePackageImpl theTracePackage = (TracePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TracePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TracePackageImpl()); + + isInited = true; + + // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); + LaunchconfigurationPackage.eINSTANCE.eClass(); + + // Create package meta-data objects + theTracePackage.createPackageContents(); + + // Initialize created meta-data + theTracePackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theTracePackage.freeze(); + + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(TracePackage.eNS_URI, theTracePackage); + return theTracePackage; + } + + /** + * + * + * @generated + */ + public EClass getMSEOccurrence() { + return mseOccurrenceEClass; + } + + /** + * + * + * @generated + */ + public EReference getMSEOccurrence_Mse() { + return (EReference)mseOccurrenceEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EAttribute getMSEOccurrence_Parameters() { + return (EAttribute)mseOccurrenceEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EAttribute getMSEOccurrence_Result() { + return (EAttribute)mseOccurrenceEClass.getEStructuralFeatures().get(2); + } + + /** + * + * + * @generated + */ + public EClass getMSE() { + return mseEClass; + } + + /** + * + * + * @generated + */ + public EOperation getMSE__GetCaller() { + return mseEClass.getEOperations().get(0); + } + + /** + * + * + * @generated + */ + public EOperation getMSE__GetAction() { + return mseEClass.getEOperations().get(1); + } + + /** + * + * + * @generated + */ + public EClass getMSEModel() { + return mseModelEClass; + } + + /** + * + * + * @generated + */ + public EReference getMSEModel_OwnedMSEs() { + return (EReference)mseModelEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getGenericMSE() { + return genericMSEEClass; + } + + /** + * + * + * @generated + */ + public EReference getGenericMSE_CallerReference() { + return (EReference)genericMSEEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getGenericMSE_ActionReference() { + return (EReference)genericMSEEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EOperation getGenericMSE__GetCaller() { + return genericMSEEClass.getEOperations().get(0); + } + + /** + * + * + * @generated + */ + public EOperation getGenericMSE__GetAction() { + return genericMSEEClass.getEOperations().get(1); + } + + /** + * + * + * @generated + */ + public EClass getStep() { + return stepEClass; + } + + /** + * + * + * @generated + */ + public EReference getStep_Mseoccurrence() { + return (EReference)stepEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getStep_StartingState() { + return (EReference)stepEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EReference getStep_EndingState() { + return (EReference)stepEClass.getEStructuralFeatures().get(2); + } + + /** + * + * + * @generated + */ + public EClass getBigStep() { + return bigStepEClass; + } + + /** + * + * + * @generated + */ + public EReference getBigStep_SubSteps() { + return (EReference)bigStepEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getSmallStep() { + return smallStepEClass; + } + + /** + * + * + * @generated + */ + public EClass getSequentialStep() { + return sequentialStepEClass; + } + + /** + * + * + * @generated + */ + public EClass getParallelStep() { + return parallelStepEClass; + } + + /** + * + * + * @generated + */ + public EClass getTrace() { + return traceEClass; + } + + /** + * + * + * @generated + */ + public EReference getTrace_RootStep() { + return (EReference)traceEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getTrace_TracedObjects() { + return (EReference)traceEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EReference getTrace_States() { + return (EReference)traceEClass.getEStructuralFeatures().get(2); + } + + /** + * + * + * @generated + */ + public EReference getTrace_Launchconfiguration() { + return (EReference)traceEClass.getEStructuralFeatures().get(3); + } + + /** + * + * + * @generated + */ + public EClass getTracedObject() { + return tracedObjectEClass; + } + + /** + * + * + * @generated + */ + public EReference getTracedObject_Dimensions() { + return (EReference)tracedObjectEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EOperation getTracedObject__GetDimensionsInternal() { + return tracedObjectEClass.getEOperations().get(0); + } + + /** + * + * + * @generated + */ + public EClass getDimension() { + return dimensionEClass; + } + + /** + * + * + * @generated + */ + public EReference getDimension_Values() { + return (EReference)dimensionEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getValue() { + return valueEClass; + } + + /** + * + * + * @generated + */ + public EReference getValue_States() { + return (EReference)valueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getState() { + return stateEClass; + } + + /** + * + * + * @generated + */ + public EReference getState_StartedSteps() { + return (EReference)stateEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getState_EndedSteps() { + return (EReference)stateEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EReference getState_Values() { + return (EReference)stateEClass.getEStructuralFeatures().get(2); + } + + /** + * + * + * @generated + */ + public EDataType getISerializable() { + return iSerializableEDataType; + } + + /** + * + * + * @generated + */ + public TraceFactory getTraceFactory() { + return (TraceFactory)getEFactoryInstance(); + } + + /** + * + * + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + mseOccurrenceEClass = createEClass(MSE_OCCURRENCE); + createEReference(mseOccurrenceEClass, MSE_OCCURRENCE__MSE); + createEAttribute(mseOccurrenceEClass, MSE_OCCURRENCE__PARAMETERS); + createEAttribute(mseOccurrenceEClass, MSE_OCCURRENCE__RESULT); + + mseEClass = createEClass(MSE); + createEOperation(mseEClass, MSE___GET_CALLER); + createEOperation(mseEClass, MSE___GET_ACTION); + + mseModelEClass = createEClass(MSE_MODEL); + createEReference(mseModelEClass, MSE_MODEL__OWNED_MS_ES); + + genericMSEEClass = createEClass(GENERIC_MSE); + createEReference(genericMSEEClass, GENERIC_MSE__CALLER_REFERENCE); + createEReference(genericMSEEClass, GENERIC_MSE__ACTION_REFERENCE); + createEOperation(genericMSEEClass, GENERIC_MSE___GET_CALLER); + createEOperation(genericMSEEClass, GENERIC_MSE___GET_ACTION); + + stepEClass = createEClass(STEP); + createEReference(stepEClass, STEP__MSEOCCURRENCE); + createEReference(stepEClass, STEP__STARTING_STATE); + createEReference(stepEClass, STEP__ENDING_STATE); + + bigStepEClass = createEClass(BIG_STEP); + createEReference(bigStepEClass, BIG_STEP__SUB_STEPS); + + smallStepEClass = createEClass(SMALL_STEP); + + sequentialStepEClass = createEClass(SEQUENTIAL_STEP); + + parallelStepEClass = createEClass(PARALLEL_STEP); + + traceEClass = createEClass(TRACE); + createEReference(traceEClass, TRACE__ROOT_STEP); + createEReference(traceEClass, TRACE__TRACED_OBJECTS); + createEReference(traceEClass, TRACE__STATES); + createEReference(traceEClass, TRACE__LAUNCHCONFIGURATION); + + tracedObjectEClass = createEClass(TRACED_OBJECT); + createEReference(tracedObjectEClass, TRACED_OBJECT__DIMENSIONS); + createEOperation(tracedObjectEClass, TRACED_OBJECT___GET_DIMENSIONS_INTERNAL); + + dimensionEClass = createEClass(DIMENSION); + createEReference(dimensionEClass, DIMENSION__VALUES); + + valueEClass = createEClass(VALUE); + createEReference(valueEClass, VALUE__STATES); + + stateEClass = createEClass(STATE); + createEReference(stateEClass, STATE__STARTED_STEPS); + createEReference(stateEClass, STATE__ENDED_STEPS); + createEReference(stateEClass, STATE__VALUES); + + // Create data types + iSerializableEDataType = createEDataType(ISERIALIZABLE); + } + + /** + * + * + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); + LaunchconfigurationPackage theLaunchconfigurationPackage = (LaunchconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(LaunchconfigurationPackage.eNS_URI); + + // Create type parameters + ETypeParameter stepEClass_StateSubType = addETypeParameter(stepEClass, "StateSubType"); + ETypeParameter bigStepEClass_StepSubtype = addETypeParameter(bigStepEClass, "StepSubtype"); + ETypeParameter bigStepEClass_StateSubType = addETypeParameter(bigStepEClass, "StateSubType"); + ETypeParameter smallStepEClass_StateSubType = addETypeParameter(smallStepEClass, "StateSubType"); + ETypeParameter sequentialStepEClass_StepSubtype = addETypeParameter(sequentialStepEClass, "StepSubtype"); + ETypeParameter sequentialStepEClass_StateSubType = addETypeParameter(sequentialStepEClass, "StateSubType"); + ETypeParameter parallelStepEClass_StepSubtype = addETypeParameter(parallelStepEClass, "StepSubtype"); + ETypeParameter parallelStepEClass_StateSubType = addETypeParameter(parallelStepEClass, "StateSubType"); + ETypeParameter traceEClass_StepSubType = addETypeParameter(traceEClass, "StepSubType"); + ETypeParameter traceEClass_TracedObjectSubtype = addETypeParameter(traceEClass, "TracedObjectSubtype"); + ETypeParameter traceEClass_StateSubType = addETypeParameter(traceEClass, "StateSubType"); + ETypeParameter tracedObjectEClass_DimensionSubType = addETypeParameter(tracedObjectEClass, "DimensionSubType"); + ETypeParameter dimensionEClass_ValueSubType = addETypeParameter(dimensionEClass, "ValueSubType"); + ETypeParameter valueEClass_StateSubType = addETypeParameter(valueEClass, "StateSubType"); + ETypeParameter stateEClass_StepSubType = addETypeParameter(stateEClass, "StepSubType"); + ETypeParameter stateEClass_ValueSubType = addETypeParameter(stateEClass, "ValueSubType"); + + // Set bounds for type parameters + EGenericType g1 = createEGenericType(this.getState()); + EGenericType g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + stepEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(bigStepEClass_StateSubType); + g1.getETypeArguments().add(g2); + bigStepEClass_StepSubtype.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + bigStepEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + smallStepEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(sequentialStepEClass_StateSubType); + g1.getETypeArguments().add(g2); + sequentialStepEClass_StepSubtype.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + sequentialStepEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(parallelStepEClass_StateSubType); + g1.getETypeArguments().add(g2); + parallelStepEClass_StepSubtype.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(parallelStepEClass_StepSubtype); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + parallelStepEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + traceEClass_StepSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getTracedObject()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + traceEClass_TracedObjectSubtype.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + traceEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getDimension()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + tracedObjectEClass_DimensionSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getValue()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + dimensionEClass_ValueSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getState()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + valueEClass_StateSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + stateEClass_StepSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getValue()); + g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + stateEClass_ValueSubType.getEBounds().add(g1); + + // Add supertypes to classes + mseEClass.getESuperTypes().add(theEcorePackage.getENamedElement()); + genericMSEEClass.getESuperTypes().add(this.getMSE()); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(bigStepEClass_StateSubType); + g1.getETypeArguments().add(g2); + bigStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(this.getStep()); + g2 = createEGenericType(smallStepEClass_StateSubType); + g1.getETypeArguments().add(g2); + smallStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(this.getBigStep()); + g2 = createEGenericType(sequentialStepEClass_StepSubtype); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(sequentialStepEClass_StateSubType); + g1.getETypeArguments().add(g2); + sequentialStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(this.getBigStep()); + g2 = createEGenericType(parallelStepEClass_StepSubtype); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(parallelStepEClass_StateSubType); + g1.getETypeArguments().add(g2); + parallelStepEClass.getEGenericSuperTypes().add(g1); + + // Initialize classes, features, and operations; add parameters + initEClass(mseOccurrenceEClass, MSEOccurrence.class, "MSEOccurrence", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getMSEOccurrence_Mse(), this.getMSE(), null, "mse", null, 1, 1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMSEOccurrence_Parameters(), ecorePackage.getEJavaObject(), "parameters", null, 0, -1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMSEOccurrence_Result(), ecorePackage.getEJavaObject(), "result", null, 0, -1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(mseEClass, fr.inria.diverse.trace.commons.model.trace.MSE.class, "MSE", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEOperation(getMSE__GetCaller(), theEcorePackage.getEObject(), "getCaller", 0, 1, IS_UNIQUE, IS_ORDERED); + + initEOperation(getMSE__GetAction(), theEcorePackage.getEOperation(), "getAction", 0, 1, IS_UNIQUE, IS_ORDERED); + + initEClass(mseModelEClass, MSEModel.class, "MSEModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getMSEModel_OwnedMSEs(), this.getMSE(), null, "ownedMSEs", null, 0, -1, MSEModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(genericMSEEClass, GenericMSE.class, "GenericMSE", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getGenericMSE_CallerReference(), theEcorePackage.getEObject(), null, "callerReference", null, 0, 1, GenericMSE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGenericMSE_ActionReference(), theEcorePackage.getEOperation(), null, "actionReference", null, 0, 1, GenericMSE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEOperation(getGenericMSE__GetCaller(), theEcorePackage.getEObject(), "getCaller", 0, 1, IS_UNIQUE, IS_ORDERED); + + initEOperation(getGenericMSE__GetAction(), theEcorePackage.getEOperation(), "getAction", 0, 1, IS_UNIQUE, IS_ORDERED); + + initEClass(stepEClass, Step.class, "Step", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getStep_Mseoccurrence(), this.getMSEOccurrence(), null, "mseoccurrence", null, 0, 1, Step.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(stepEClass_StateSubType); + initEReference(getStep_StartingState(), g1, this.getState_StartedSteps(), "startingState", null, 1, 1, Step.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(stepEClass_StateSubType); + initEReference(getStep_EndingState(), g1, this.getState_EndedSteps(), "endingState", null, 0, 1, Step.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(bigStepEClass, BigStep.class, "BigStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + g1 = createEGenericType(bigStepEClass_StepSubtype); + initEReference(getBigStep_SubSteps(), g1, null, "subSteps", null, 0, -1, BigStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(smallStepEClass, SmallStep.class, "SmallStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(sequentialStepEClass, SequentialStep.class, "SequentialStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(parallelStepEClass, ParallelStep.class, "ParallelStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(traceEClass, Trace.class, "Trace", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + g1 = createEGenericType(traceEClass_StepSubType); + initEReference(getTrace_RootStep(), g1, null, "rootStep", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(traceEClass_TracedObjectSubtype); + initEReference(getTrace_TracedObjects(), g1, null, "tracedObjects", null, 0, -1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(traceEClass_StateSubType); + initEReference(getTrace_States(), g1, null, "states", null, 0, -1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTrace_Launchconfiguration(), theLaunchconfigurationPackage.getLaunchConfiguration(), null, "launchconfiguration", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(tracedObjectEClass, TracedObject.class, "TracedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + g1 = createEGenericType(tracedObjectEClass_DimensionSubType); + initEReference(getTracedObject_Dimensions(), g1, null, "dimensions", null, 0, -1, TracedObject.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + EOperation op = initEOperation(getTracedObject__GetDimensionsInternal(), null, "getDimensionsInternal", 0, -1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(tracedObjectEClass_DimensionSubType); + initEOperation(op, g1); + + initEClass(dimensionEClass, Dimension.class, "Dimension", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + g1 = createEGenericType(dimensionEClass_ValueSubType); + initEReference(getDimension_Values(), g1, null, "values", null, 0, -1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(valueEClass, Value.class, "Value", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + g1 = createEGenericType(valueEClass_StateSubType); + initEReference(getValue_States(), g1, this.getState_Values(), "states", null, 0, -1, Value.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(stateEClass, State.class, "State", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + g1 = createEGenericType(stateEClass_StepSubType); + initEReference(getState_StartedSteps(), g1, this.getStep_StartingState(), "startedSteps", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(stateEClass_StepSubType); + initEReference(getState_EndedSteps(), g1, this.getStep_EndingState(), "endedSteps", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + g1 = createEGenericType(stateEClass_ValueSubType); + initEReference(getState_Values(), g1, this.getValue_States(), "values", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Initialize data types + initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); + + // Create resource + createResource(eNS_URI); + } + +} //TracePackageImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java new file mode 100644 index 000000000..165e415be --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java @@ -0,0 +1,143 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; + +import java.lang.reflect.InvocationTargetException; +import java.util.Collection; +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +/** + * + * An implementation of the model object 'Traced Object'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl#getDimensions Dimensions}
    • + *
+ * + * @generated + */ +public abstract class TracedObjectImpl> extends MinimalEObjectImpl.Container implements TracedObject { + /** + * + * + * @generated + */ + protected TracedObjectImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.TRACED_OBJECT; + } + + /** + * + * + * @generated + */ + public EList getDimensions() { + return getDimensionsInternal(); + } + + /** + * + * + * @generated + */ + public EList getDimensionsInternal() { + // Default implementation, returning empty list. + final EList result = new org.eclipse.emf.ecore.util.BasicInternalEList(Object.class); + return result; + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.TRACED_OBJECT__DIMENSIONS: + return getDimensions(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.TRACED_OBJECT__DIMENSIONS: + getDimensions().clear(); + getDimensions().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.TRACED_OBJECT__DIMENSIONS: + getDimensions().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.TRACED_OBJECT__DIMENSIONS: + return !getDimensions().isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case TracePackage.TRACED_OBJECT___GET_DIMENSIONS_INTERNAL: + return getDimensionsInternal(); + } + return super.eInvoke(operationID, arguments); + } + +} //TracedObjectImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java new file mode 100644 index 000000000..784c5cc7b --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java @@ -0,0 +1,167 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.impl; + +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.Value; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl#getStates States}
    • + *
+ * + * @generated + */ +public abstract class ValueImpl> extends MinimalEObjectImpl.Container implements Value { + /** + * The cached value of the '{@link #getStates() States}' reference list. + * + * + * @see #getStates() + * @generated + * @ordered + */ + protected EList states; + + /** + * + * + * @generated + */ + protected ValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return TracePackage.Literals.VALUE; + } + + /** + * + * + * @generated + */ + public EList getStates() { + if (states == null) { + states = new EObjectWithInverseResolvingEList.ManyInverse(State.class, this, TracePackage.VALUE__STATES, TracePackage.STATE__VALUES); + } + return states; + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.VALUE__STATES: + return ((InternalEList)(InternalEList)getStates()).basicAdd(otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case TracePackage.VALUE__STATES: + return ((InternalEList)getStates()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case TracePackage.VALUE__STATES: + return getStates(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case TracePackage.VALUE__STATES: + getStates().clear(); + getStates().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case TracePackage.VALUE__STATES: + getStates().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case TracePackage.VALUE__STATES: + return states != null && !states.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //ValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java new file mode 100644 index 000000000..43d3cb3ef --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java @@ -0,0 +1,392 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.util; + +import fr.inria.diverse.trace.commons.model.trace.*; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EModelElement; +import org.eclipse.emf.ecore.ENamedElement; +import org.eclipse.emf.ecore.EObject; + +/** + * + * The Adapter Factory for the model. + * It provides an adapter createXXX method for each class of the model. + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage + * @generated + */ +public class TraceAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + * + * + * @generated + */ + protected static TracePackage modelPackage; + + /** + * Creates an instance of the adapter factory. + * + * + * @generated + */ + public TraceAdapterFactory() { + if (modelPackage == null) { + modelPackage = TracePackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + * + * This implementation returns true if the object is either the model's package or is an instance object of the model. + * + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the createXXX methods. + * + * + * @generated + */ + protected TraceSwitch modelSwitch = + new TraceSwitch() { + @Override + public Adapter caseMSEOccurrence(MSEOccurrence object) { + return createMSEOccurrenceAdapter(); + } + @Override + public Adapter caseMSE(MSE object) { + return createMSEAdapter(); + } + @Override + public Adapter caseMSEModel(MSEModel object) { + return createMSEModelAdapter(); + } + @Override + public Adapter caseGenericMSE(GenericMSE object) { + return createGenericMSEAdapter(); + } + @Override + public > Adapter caseStep(Step object) { + return createStepAdapter(); + } + @Override + public , StateSubType extends State> Adapter caseBigStep(BigStep object) { + return createBigStepAdapter(); + } + @Override + public > Adapter caseSmallStep(SmallStep object) { + return createSmallStepAdapter(); + } + @Override + public , StateSubType extends State> Adapter caseSequentialStep(SequentialStep object) { + return createSequentialStepAdapter(); + } + @Override + public , StateSubType extends State> Adapter caseParallelStep(ParallelStep object) { + return createParallelStepAdapter(); + } + @Override + public , TracedObjectSubtype extends TracedObject, StateSubType extends State> Adapter caseTrace(Trace object) { + return createTraceAdapter(); + } + @Override + public > Adapter caseTracedObject(TracedObject object) { + return createTracedObjectAdapter(); + } + @Override + public > Adapter caseDimension(Dimension object) { + return createDimensionAdapter(); + } + @Override + public > Adapter caseValue(Value object) { + return createValueAdapter(); + } + @Override + public , ValueSubType extends Value> Adapter caseState(State object) { + return createStateAdapter(); + } + @Override + public Adapter caseEModelElement(EModelElement object) { + return createEModelElementAdapter(); + } + @Override + public Adapter caseENamedElement(ENamedElement object) { + return createENamedElementAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the target. + * + * + * @param target the object to adapt. + * @return the adapter for the target. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence MSE Occurrence}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence + * @generated + */ + public Adapter createMSEOccurrenceAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.MSE MSE}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.MSE + * @generated + */ + public Adapter createMSEAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel MSE Model}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.MSEModel + * @generated + */ + public Adapter createMSEModelAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE Generic MSE}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE + * @generated + */ + public Adapter createGenericMSEAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Step + * @generated + */ + public Adapter createStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.BigStep + * @generated + */ + public Adapter createBigStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.SmallStep + * @generated + */ + public Adapter createSmallStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep + * @generated + */ + public Adapter createSequentialStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ParallelStep Parallel Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.ParallelStep + * @generated + */ + public Adapter createParallelStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Trace + * @generated + */ + public Adapter createTraceAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.TracedObject + * @generated + */ + public Adapter createTracedObjectAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Dimension + * @generated + */ + public Adapter createDimensionAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.Value + * @generated + */ + public Adapter createValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.State + * @generated + */ + public Adapter createStateAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement EModel Element}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.emf.ecore.EModelElement + * @generated + */ + public Adapter createEModelElementAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.ENamedElement ENamed Element}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.emf.ecore.ENamedElement + * @generated + */ + public Adapter createENamedElementAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + * + * This default implementation returns null. + * + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //TraceAdapterFactory diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java new file mode 100644 index 000000000..2a1515946 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java @@ -0,0 +1,426 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.trace.util; + +import fr.inria.diverse.trace.commons.model.trace.*; + +import org.eclipse.emf.ecore.EModelElement; +import org.eclipse.emf.ecore.ENamedElement; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; + +/** + * + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the caseXXX method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * + * @see fr.inria.diverse.trace.commons.model.trace.TracePackage + * @generated + */ +public class TraceSwitch extends Switch { + /** + * The cached model package + * + * + * @generated + */ + protected static TracePackage modelPackage; + + /** + * Creates an instance of the switch. + * + * + * @generated + */ + public TraceSwitch() { + if (modelPackage == null) { + modelPackage = TracePackage.eINSTANCE; + } + } + + /** + * Checks whether this is a switch for the given package. + * + * + * @param ePackage the package in question. + * @return whether this is a switch for the given package. + * @generated + */ + @Override + protected boolean isSwitchFor(EPackage ePackage) { + return ePackage == modelPackage; + } + + /** + * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * + * + * @return the first non-null result returned by a caseXXX call. + * @generated + */ + @Override + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case TracePackage.MSE_OCCURRENCE: { + MSEOccurrence mseOccurrence = (MSEOccurrence)theEObject; + T result = caseMSEOccurrence(mseOccurrence); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.MSE: { + MSE mse = (MSE)theEObject; + T result = caseMSE(mse); + if (result == null) result = caseENamedElement(mse); + if (result == null) result = caseEModelElement(mse); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.MSE_MODEL: { + MSEModel mseModel = (MSEModel)theEObject; + T result = caseMSEModel(mseModel); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.GENERIC_MSE: { + GenericMSE genericMSE = (GenericMSE)theEObject; + T result = caseGenericMSE(genericMSE); + if (result == null) result = caseMSE(genericMSE); + if (result == null) result = caseENamedElement(genericMSE); + if (result == null) result = caseEModelElement(genericMSE); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.STEP: { + Step step = (Step)theEObject; + T result = caseStep(step); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.BIG_STEP: { + BigStep bigStep = (BigStep)theEObject; + T result = caseBigStep(bigStep); + if (result == null) result = caseStep(bigStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.SMALL_STEP: { + SmallStep smallStep = (SmallStep)theEObject; + T result = caseSmallStep(smallStep); + if (result == null) result = caseStep(smallStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.SEQUENTIAL_STEP: { + SequentialStep sequentialStep = (SequentialStep)theEObject; + T result = caseSequentialStep(sequentialStep); + if (result == null) result = caseBigStep(sequentialStep); + if (result == null) result = caseStep(sequentialStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.PARALLEL_STEP: { + ParallelStep parallelStep = (ParallelStep)theEObject; + T result = caseParallelStep(parallelStep); + if (result == null) result = caseBigStep(parallelStep); + if (result == null) result = caseStep(parallelStep); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.TRACE: { + Trace trace = (Trace)theEObject; + T result = caseTrace(trace); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.TRACED_OBJECT: { + TracedObject tracedObject = (TracedObject)theEObject; + T result = caseTracedObject(tracedObject); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.DIMENSION: { + Dimension dimension = (Dimension)theEObject; + T result = caseDimension(dimension); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.VALUE: { + Value value = (Value)theEObject; + T result = caseValue(value); + if (result == null) result = defaultCase(theEObject); + return result; + } + case TracePackage.STATE: { + State state = (State)theEObject; + T result = caseState(state); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'MSE Occurrence'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'MSE Occurrence'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseMSEOccurrence(MSEOccurrence object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'MSE'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'MSE'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseMSE(MSE object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'MSE Model'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'MSE Model'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseMSEModel(MSEModel object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Generic MSE'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Generic MSE'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGenericMSE(GenericMSE object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public > T caseStep(Step object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Big Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Big Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , StateSubType extends State> T caseBigStep(BigStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Small Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Small Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public > T caseSmallStep(SmallStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Sequential Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Sequential Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , StateSubType extends State> T caseSequentialStep(SequentialStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Parallel Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Parallel Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , StateSubType extends State> T caseParallelStep(ParallelStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Trace'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Trace'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , TracedObjectSubtype extends TracedObject, StateSubType extends State> T caseTrace(Trace object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Traced Object'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Traced Object'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public > T caseTracedObject(TracedObject object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Dimension'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Dimension'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public > T caseDimension(Dimension object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public > T caseValue(Value object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'State'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'State'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , ValueSubType extends Value> T caseState(State object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EModel Element'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EModel Element'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseEModelElement(EModelElement object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'ENamed Element'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'ENamed Element'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseENamedElement(ENamedElement object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + @Override + public T defaultCase(EObject object) { + return null; + } + +} //TraceSwitch diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java index aed24790d..caa96593d 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java @@ -122,6 +122,15 @@ public interface ITraceExtractor, StateSubType exten */ int getValueLastStateIndex(ValueSubType value); + /** + * + * @param dimension + * @param idxFrom + * @param idxTo + * @return The list of values + */ + List getValuesForStates(DimensionSubType dimension, int idxFrom, int idxTo); + /** * Returns a description of the value. * @param value The value diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.project b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.project index ee8d1d290..57803987f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.project +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.project @@ -25,16 +25,10 @@ - - net.sf.eclipsecs.core.CheckstyleBuilder - - - org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature - net.sf.eclipsecs.core.CheckstyleNature diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java index a6937315c..d3affd8ed 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java @@ -244,18 +244,18 @@ private void computeExplorerState(List> stepPath) { } private void goTo(State state) { - assert state != null; - if (stateManager != null) { + if (state != null && stateManager != null) { stateManager.restoreState(state); } } private void jumpBeforeStep(Step step) { - assert step != null; - final State state = step.getStartingState(); - currentState = state; - goTo(currentState); - updateCallStack(step); + if (step != null) { + final State state = step.getStartingState(); + currentState = state; + goTo(currentState); + updateCallStack(step); + } } @Override @@ -289,20 +289,22 @@ public Step getCurrentBigStep() { @Override public void jump(State state) { - assert state != null; - currentState = state; - goTo(currentState); - final List> steps = currentState.getStartedSteps(); - final Step step = steps.isEmpty() ? null : steps.get(0); - updateCallStack(step); + if (state != null) { + currentState = state; + goTo(currentState); + final List> steps = currentState.getStartedSteps(); + final Step step = steps.isEmpty() ? null : steps.get(0); + updateCallStack(step); + } } @Override public void jump(Value value) { - assert value != null; - List> states = value.getStates(); - if (!states.isEmpty()) { - jump(states.get(0)); + if (value != null) { + List> states = value.getStates(); + if (!states.isEmpty()) { + jump(states.get(0)); + } } } @@ -404,6 +406,9 @@ public boolean stepBackOut() { } private Value getCurrentValue(Dimension dimension) { + if (currentState == null) { + return null; + } return currentState.getValues().stream() .filter(v -> v.eContainer() == dimension) .findFirst().orElse(null); @@ -489,6 +494,7 @@ public void updateCallStack(Step step) { newPath.add(0, (Step) container); container = container.eContainer(); } + currentState = step.getStartingState(); } computeExplorerState(newPath); notifyListeners(); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index e42227ab0..6f30823d9 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -42,7 +42,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.util.EcoreEList; import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; @@ -429,7 +428,7 @@ public int getValueFirstStateIndex(Value value) { @Override public int getValueLastStateIndex(Value value) { List> states = value.getStates(); - return trace.getStates().indexOf(states.get(states.size())); + return trace.getStates().indexOf(states.get(states.size() - 1)); } private String getValueName(Value value) { @@ -467,10 +466,22 @@ private String getObjectDescription(Object object) { } return object.toString(); } + + public List> getValuesForStates(Dimension dimension, int from, int to) { + final List> values = dimension.getValues().stream().filter(v -> { + final List> states = v.getStates(); + final State firstState = states.get(0); + final State lastState = states.get(states.size() - 1); + return getStateIndex(firstState) < to && getStateIndex(lastState) > from; + }).collect(Collectors.toList()); + return values; + } @Override public String getValueDescription(Value value) { - assert value != null; + if (value == null) { + return ""; + } String description = getDimensionLabel((Dimension)value.eContainer()) + " : "; final String attributeName = getValueName(value); if (attributeName.length() > 0) { @@ -488,43 +499,29 @@ private Object getOriginalObject(EObject eObject) { return eObject.eClass().getEAllReferences().stream().filter(r -> r.getName().startsWith("originalObject")) .findFirst().map(r -> eObject.eGet(r)).orElse(null); } + + private Map, String> dimensionToLabel = new HashMap<>(); @Override public String getDimensionLabel(Dimension dimension) { - String attributeName = ""; - final List> valueTrace = dimension.getValues(); - if (valueTrace.isEmpty()) { - return ""; - } - if (valueTrace instanceof EcoreEList) { - final EcoreEList eList = (EcoreEList) valueTrace; - final EObject owner = eList.getEObject(); - final List attributes = owner.eClass().getEAllReferences().stream() - .filter(r -> r.getName().endsWith("Sequence")) - .map(r -> r.getName().substring(0, r.getName().length() - 8)).collect(Collectors.toList()); - final Object originalObject = getOriginalObject(owner); - if (!attributes.isEmpty()) { - String n = eList.data().getClass().getComponentType().getName(); - attributeName = attributes.stream().filter(s -> n.contains("_" + s + "_")).findFirst().orElse(""); - } - if (originalObject != null) { - if (originalObject instanceof EObject) { - final EObject eObject = (EObject) originalObject; - if (eObject.eIsProxy()) { - final String proxyToString = eObject.toString(); - final int idx = proxyToString.indexOf("eProxyURI: ") + 11; - final String s = proxyToString.substring(idx, proxyToString.length() - 1); - return attributeName + " (" + s + ")"; - } - final QualifiedName qname = nameProvider.getFullyQualifiedName(eObject); - if (qname != null) { - return attributeName + " (" + qname.toString() + " :" + eObject.eClass().getName() + ")"; - } + return dimensionToLabel.computeIfAbsent(dimension, d -> { + EObject container = dimension.eContainer(); + final String modelElement; + if (container != null) { + Object originalObject = getOriginalObject(container); + if (originalObject != null) { + modelElement = nameProvider.getFullyQualifiedName((EObject) originalObject).getLastSegment() + "."; + } else { + modelElement = ""; } - return attributeName + " (" + originalObject.toString() + ")"; + } else { + modelElement = ""; } - } - return attributeName; + final String dimensionName = dimension.eClass().getName(); + final String tmp = dimensionName.substring(0, dimensionName.indexOf("_Dimension")); + final String result = tmp.substring(tmp.lastIndexOf("_") + 1); + return modelElement + result; + }); } @Override @@ -556,24 +553,22 @@ public void valuesAdded(List> values) { @Override public void dimensionsAdded(List> addedDimensions) { - if (!addedDimensions.isEmpty()) { - cachedMaskedStateEquivalenceClasses.clear(); - cachedDimensions.clear(); - final List> dimensions = getDimensions(); - final List insertedTracesIndexes = new ArrayList<>(); - for (Dimension dimension : addedDimensions) { - final int i = dimensions.indexOf(dimension); - insertedTracesIndexes.add(i); - } - Collections.sort(insertedTracesIndexes); - final List> keys = new ArrayList<>(stateEquivalenceClasses.keySet()); - for (List key : keys) { - List> states = stateEquivalenceClasses.remove(key); - for (Integer i : insertedTracesIndexes) { - key.add(i, -1); - } - stateEquivalenceClasses.put(key, states); + cachedMaskedStateEquivalenceClasses.clear(); + cachedDimensions.clear(); + final List> dimensions = getDimensions(); + final List insertedTracesIndexes = new ArrayList<>(); + for (Dimension dimension : addedDimensions) { + final int i = dimensions.indexOf(dimension); + insertedTracesIndexes.add(i); + } + Collections.sort(insertedTracesIndexes); + final List> keys = new ArrayList<>(stateEquivalenceClasses.keySet()); + for (List key : keys) { + List> states = stateEquivalenceClasses.remove(key); + for (Integer i : insertedTracesIndexes) { + key.add(i, -1); } + stateEquivalenceClasses.put(key, states); } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java index b01ff36a8..6aaa93124 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java @@ -64,15 +64,25 @@ public void notifyListener(ITraceListener listener) { newStates.add(newState); endedSteps.addAll(newState.getEndedSteps()); } else if (o instanceof TracedObject) { - ((TracedObject) o).getDimensions(); + newDimensions.addAll(((TracedObject) o).getDimensions()); } } }); - listener.valuesAdded(newValues); - listener.dimensionsAdded(newDimensions); - listener.statesAdded(newStates); - listener.stepsStarted(startedSteps); - listener.stepsEnded(endedSteps); + if (!newValues.isEmpty()) { + listener.valuesAdded(newValues); + } + if (!newDimensions.isEmpty()) { + listener.dimensionsAdded(newDimensions); + } + if (!newStates.isEmpty()) { + listener.statesAdded(newStates); + } + if (!startedSteps.isEmpty()) { + listener.stepsStarted(startedSteps); + } + if (!endedSteps.isEmpty()) { + listener.stepsEnded(endedSteps); + } } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird index 0dd2d5f97..c2909ddc0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird @@ -42,15 +42,6 @@ - - - - - - - - - @@ -58,15 +49,11 @@ - - - - - + @@ -224,6 +211,10 @@ + + + + @@ -398,17 +389,17 @@ - + - + - + - + @@ -664,14 +655,6 @@ - - - - - - - - @@ -876,12 +859,12 @@ - + - - - + + + @@ -939,13 +922,21 @@ + + + + + + + + - + - - - + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore index 2c59641dd..89e02f9fb 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore @@ -2,17 +2,6 @@ - - - - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java index a6792b831..75456ea51 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java @@ -5,7 +5,6 @@ import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; /** @@ -112,15 +111,6 @@ public interface BasePackage extends EPackage { */ int SPECIFIC_TRACE_FEATURE_COUNT = TracePackage.TRACE_FEATURE_COUNT + 0; - /** - * The operation id for the 'Get Traced Objects' operation. - * - * - * @generated - * @ordered - */ - int SPECIFIC_TRACE___GET_TRACED_OBJECTS = TracePackage.TRACE_OPERATION_COUNT + 0; - /** * The number of operations of the 'Specific Trace' class. * @@ -128,7 +118,7 @@ public interface BasePackage extends EPackage { * @generated * @ordered */ - int SPECIFIC_TRACE_OPERATION_COUNT = TracePackage.TRACE_OPERATION_COUNT + 1; + int SPECIFIC_TRACE_OPERATION_COUNT = TracePackage.TRACE_OPERATION_COUNT + 0; /** @@ -141,16 +131,6 @@ public interface BasePackage extends EPackage { */ EClass getSpecificTrace(); - /** - * Returns the meta object for the '{@link base.SpecificTrace#getTracedObjects() Get Traced Objects}' operation. - * - * - * @return the meta object for the 'Get Traced Objects' operation. - * @see base.SpecificTrace#getTracedObjects() - * @generated - */ - EOperation getSpecificTrace__GetTracedObjects(); - /** * Returns the factory that creates the instances of the model. * @@ -184,14 +164,6 @@ interface Literals { */ EClass SPECIFIC_TRACE = eINSTANCE.getSpecificTrace(); - /** - * The meta object literal for the 'Get Traced Objects' operation. - * - * - * @generated - */ - EOperation SPECIFIC_TRACE___GET_TRACED_OBJECTS = eINSTANCE.getSpecificTrace__GetTracedObjects(); - } } //BasePackage diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java index ee9604a37..5048b6f6e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java @@ -12,8 +12,6 @@ import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.Trace; -import org.eclipse.emf.common.util.EList; - /** * * A representation of the model object 'Specific Trace'. @@ -25,12 +23,5 @@ * @generated */ public interface SpecificTrace extends Trace, SpecificTracedObject>, SpecificState> { - /** - * - * - * @model kind="operation" - * @generated - */ - EList>> getTracedObjects(); } // SpecificTrace diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java index 4f5f3ad10..28dc64f6d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java @@ -233,7 +233,7 @@ public interface StatesPackage extends EPackage { int SPECIFIC_TRACED_OBJECT = 3; /** - * The feature id for the 'Dimensions' containment reference list. + * The feature id for the 'Dimensions' reference list. * * * @generated @@ -250,6 +250,15 @@ public interface StatesPackage extends EPackage { */ int SPECIFIC_TRACED_OBJECT_FEATURE_COUNT = TracePackage.TRACED_OBJECT_FEATURE_COUNT + 0; + /** + * The operation id for the 'Get Dimensions Internal' operation. + * + * + * @generated + * @ordered + */ + int SPECIFIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = TracePackage.TRACED_OBJECT___GET_DIMENSIONS_INTERNAL; + /** * The number of operations of the 'Specific Traced Object' class. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java index b48bd285d..604cc5f1b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java @@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; -import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -118,15 +117,6 @@ public EClass getSpecificTrace() { return specificTraceEClass; } - /** - * - * - * @generated - */ - public EOperation getSpecificTrace__GetTracedObjects() { - return specificTraceEClass.getEOperations().get(0); - } - /** * * @@ -156,7 +146,6 @@ public void createPackageContents() { // Create classes and their features specificTraceEClass = createEClass(SPECIFIC_TRACE); - createEOperation(specificTraceEClass, SPECIFIC_TRACE___GET_TRACED_OBJECTS); } /** @@ -224,18 +213,6 @@ public void initializePackageContents() { // Initialize classes, features, and operations; add parameters initEClass(specificTraceEClass, SpecificTrace.class, "SpecificTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - EOperation op = initEOperation(getSpecificTrace__GetTracedObjects(), null, "getTracedObjects", 0, -1, IS_UNIQUE, IS_ORDERED); - g1 = createEGenericType(theStatesPackage.getSpecificTracedObject()); - g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - g3 = createEGenericType(theStatesPackage.getSpecificDimension()); - g2.setEUpperBound(g3); - g4 = createEGenericType(); - g3.getETypeArguments().add(g4); - g5 = createEGenericType(theStatesPackage.getSpecificValue()); - g4.setEUpperBound(g5); - initEOperation(op, g1); - // Create resource createResource(eNS_URI); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java index 0440971c6..f980c7aac 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java @@ -61,6 +61,20 @@ public NotificationChain basicSetRootStep(SequentialStep + * + * This is specialized for the more specific element type known in this context. + * @generated + */ + @Override + public EList>> getTracedObjects() { + if (tracedObjects == null) { + tracedObjects = new EObjectContainmentEList>>(SpecificTracedObject.class, this, BasePackage.SPECIFIC_TRACE__TRACED_OBJECTS); + } + return tracedObjects; + } + /** * * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index 610840886..77399d065 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -17,7 +17,6 @@ import fr.inria.diverse.trace.commons.ExecutionMetamodelTraceability import java.util.ArrayList import java.util.HashMap import java.util.HashSet -import java.util.List import java.util.Map import java.util.Set import org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage @@ -29,7 +28,6 @@ import org.eclipse.emf.ecore.EcoreFactory import org.eclipse.emf.ecore.util.EcoreUtil import static fr.inria.diverse.trace.commons.EcoreCraftingUtil.* -import org.eclipse.emf.ecore.EGenericType class TraceMMGeneratorStates { @@ -51,7 +49,6 @@ class TraceMMGeneratorStates { private val Set allNewEClasses private val Map runtimeClass2ClassExtension = new HashMap private val Set multipleOrig = new HashSet - private val List tracedClassGetters = new ArrayList new(Ecorext mmext, EPackage mm, TraceMMGenerationTraceability traceability, TraceMMExplorer traceMMExplorer, String languageName, EPackage tracemmresult, boolean gemoc) { @@ -370,26 +367,29 @@ class TraceMMGeneratorStates { traceability.putDimensionRef(runtimeProperty, dimensionRef) traceability.putValueClass(runtimeProperty, valueClass) - -// // Link State -> Value class -// val refState2Value = addReferenceToClass(traceMMExplorer.specificStateClass, -// TraceMMStrings.ref_createGlobalToState(valueClass), valueClass) -// refState2Value.ordered = false -// refState2Value.unique = true -// refState2Value.upperBound = -1 -// refState2Value.lowerBound = 0 -// valuesGetters.add(EcoreCraftingUtil.stringGetter(refState2Value)) -// -// traceability.putStateClassToValueClass(runtimeProperty, refState2Value) -// -// // Link Value class -> State (bidirectional) -// val refState2Global = addReferenceToClass(valueClass, TraceMMStrings.ref_ValueToStates, -// traceMMExplorer.specificStateClass) -// refState2Global.upperBound = -1 -// refState2Global.lowerBound = 1 -// refState2Global.EOpposite = refState2Value -// refState2Value.EOpposite = refState2Global } + val getDimensionsInternal = EcoreFactory.eINSTANCE.createEOperation + val getDimensionsAnnotation = EcoreFactory.eINSTANCE.createEAnnotation + getDimensionsInternal.EAnnotations.add(getDimensionsAnnotation) + getDimensionsInternal.name = "getDimensionsInternal" + getDimensionsInternal.lowerBound = 0 + getDimensionsInternal.upperBound = -1 + val dimensionGenericSuperType = EcoreFactory.eINSTANCE.createEGenericType + dimensionGenericSuperType.EClassifier = traceMMExplorer.specificDimensionClass + val dimensionTypeBinding = EcoreFactory.eINSTANCE.createEGenericType + dimensionGenericSuperType.ETypeArguments.add(dimensionTypeBinding) + getDimensionsInternal.EGenericType = dimensionGenericSuperType + getDimensionsAnnotation.source = GenModelPackage.eNS_URI + getDimensionsAnnotation.details.put("body", ''' + final EList> result = new org.eclipse.emf.ecore.util.BasicInternalEList>(Object.class); + result.addAll(super.getDimensionsInternal()); + «FOR getter : dimensionsGetters» + result.add(«getter»); + «ENDFOR» + return result; + ''') + tracedClass.EOperations.add(getDimensionsInternal) + return tracedClass } else { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 785ecc321..b018f61f8 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -450,67 +450,66 @@ class TraceConstructorGeneratorJava { traceRoot.getTracedObjects().add(tracedObject); «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» - «val EClass pdimensionClass = traceability.getDimensionClass(p)» - «val EClass valueClass = traceability.getValueClass(p)» - «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» - - // Creation of the dimension corresponding to the field «p.name» - final «getJavaFQN(pdimensionClass)» dimension = EcoreCraftingUtil.stringCreate(pdimensionClass) - tracedObject.getDimensions().add(dimension); - // Creation of the first value of the field «p.name» - «getJavaFQN(valueClass)» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(valueClass)»; - - «IF p.many» - - «IF p instanceof EReference» - - - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» - for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)aValue, newState); - } - «ENDIF» - - firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll - ( - (Collection) - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» - «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState) - «ELSE» - o_cast.«EcoreCraftingUtil.stringGetter(p)» - «ENDIF» - ); - «ELSE» ««« If attribute - firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» ««« End IF EReference - - - «ELSE» ««« If !many - - «IF p instanceof EReference» - «val realMutableType = traceability.getRealMutableClass(p.EType)» - if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { - «IF traceability.allMutableClasses.contains(realMutableType)» - addNewObjectToState((«getJavaFQN(realMutableType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); - firstValue_«p.name».«stringSetter(valueProperty,stringGetterTracedValue("o_cast", p))»; - «ELSE» - firstValue_«p.name».«stringSetter(valueProperty,"o_cast."+EcoreCraftingUtil.stringGetter(p))»; - «ENDIF» ««« End IF traceability.isSomehowMutable(p.EType) - } else { - firstValue_«p.name».«stringSetter(valueProperty,"null")»; + «val EClass pdimensionClass = traceability.getDimensionClass(p)» + «val EReference pdimensionRef = traceability.getDimensionRef(p)» + «val EClass valueClass = traceability.getValueClass(p)» + «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» + + // Creation of the dimension corresponding to the field «p.name» + tracedObject.«EcoreCraftingUtil.stringSetter(pdimensionRef, EcoreCraftingUtil.stringCreate(pdimensionClass))»; + // Creation of the first value of the field «p.name» + «getJavaFQN(valueClass)» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(valueClass)»; + + «IF p.many» + + «IF p instanceof EReference» + + + «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { + addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)aValue, newState); } - - «ELSE» ««« If attribute + «ENDIF» + + firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll + ( + (Collection) + «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState) + «ELSE» + o_cast.«EcoreCraftingUtil.stringGetter(p)» + «ENDIF» + ); + «ELSE» ««« If attribute + firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll + ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); + «ENDIF» ««« End IF EReference + + + «ELSE» ««« If !many + + «IF p instanceof EReference» + «val realMutableType = traceability.getRealMutableClass(p.EType)» + if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { + «IF traceability.allMutableClasses.contains(realMutableType)» + addNewObjectToState((«getJavaFQN(realMutableType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); + firstValue_«p.name».«stringSetter(valueProperty,stringGetterTracedValue("o_cast", p))»; + «ELSE» firstValue_«p.name».«stringSetter(valueProperty,"o_cast."+EcoreCraftingUtil.stringGetter(p))»; - «ENDIF» ««« End IF EReference - «ENDIF» ««« End IF p.many - - dimension.getValues().add(firstValue_«p.name»); -««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(firstValue_«p.name»); - newState.getValues().add(firstValue_«p.name»); - - «ENDFOR» ««« End FOR p : getAllMutableProperties + «ENDIF» ««« End IF traceability.isSomehowMutable(p.EType) + } else { + firstValue_«p.name».«stringSetter(valueProperty,"null")»; + } + + «ELSE» ««« If attribute + firstValue_«p.name».«stringSetter(valueProperty,"o_cast."+EcoreCraftingUtil.stringGetter(p))»; + «ENDIF» ««« End IF EReference + «ENDIF» ««« End IF p.many + + tracedObject.«EcoreCraftingUtil.stringGetter(pdimensionRef)».getValues().add(firstValue_«p.name»); + newState.getValues().add(firstValue_«p.name»); + + «ENDFOR» ««« End FOR p : getAllMutableProperties } // end if (!exeToTraced.containsKey «ENDIF» ««« End IF ! c.abstract» return added; @@ -679,7 +678,6 @@ private def String generateAddStateUsingListenerMethods() { «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val EReference pdimension = traceability.getDimensionRef(p)» if (p.getFeatureID() == «stringFeatureID(p)») { - «getJavaFQN(pdimension.EType)» // We compare the last collection in the value sequence, and the current one in the potentially changed object List<«getJavaFQN(valueClass)»> valueSequence = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues(); «getJavaFQN(valueClass)» previousValue = null; diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index 48741d165..49d04a618 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -512,8 +512,7 @@ private void fillStateLine(HBox line, List> states, int selectedState } private void fillValueLine(HBox line, Dimension dimension, int start, int end, int selectedState) { - final List> values = new ArrayList<>(); - dimension.getValues().subList(start, end).forEach(v -> values.add(v)); + final List> values = traceExtractor.getValuesForStates(dimension, start, end); final Color currentColor = Color.DARKORANGE; final Color otherColor = Color.DARKBLUE; final int height = V_HEIGHT; @@ -529,9 +528,9 @@ private void fillValueLine(HBox line, Dimension dimension, int start, int end line.setTranslateX(-(UNIT * diff)); } - for (Value valueWrapper : values) { - final int firstStateIndex = traceExtractor.getValueFirstStateIndex(valueWrapper); - final int lastStateIndex = traceExtractor.getValueLastStateIndex(valueWrapper); + for (Value value : values) { + final int firstStateIndex = traceExtractor.getValueFirstStateIndex(value); + final int lastStateIndex = traceExtractor.getValueLastStateIndex(value); if (firstStateIndex > stateIndex) { @@ -552,16 +551,16 @@ private void fillValueLine(HBox line, Dimension dimension, int start, int end } rectangle.setArcHeight(height); rectangle.setArcWidth(DIAMETER / 2); - rectangle.setUserData(valueWrapper); + rectangle.setUserData(value); rectangle.addEventHandler(MouseEvent.MOUSE_CLICKED, (e) -> { if (e.getClickCount() > 1 && e.getButton() == MouseButton.PRIMARY) { - traceExplorer.jump(valueWrapper); + traceExplorer.jump(value); } }); displayGridBinding = displayGridBinding.or(rectangle.hoverProperty()); - final String s = traceExtractor.getValueDescription(valueWrapper); + final String s = traceExtractor.getValueDescription(value); final Tooltip t = new Tooltip(s); Tooltip.install(rectangle, t); line.getChildren().add(rectangle); @@ -634,18 +633,20 @@ private NumberExpression createSteps(Step stepWrapper, int depth, int current private void sortValueLines() { final Map, Node> map = new HashMap<>(); List lines = valuesLines.getChildren(); - final List nodes = new ArrayList<>(lines); - nodes.forEach(n -> map.put((Dimension) n.getUserData(), n)); + final List nodes = new ArrayList<>(); + final List hiddenNodes = new ArrayList<>(); + lines.forEach(n -> map.put((Dimension) n.getUserData(), n)); lines.clear(); traceExtractor.getDimensions().forEach(d -> { - if (!traceExtractor.isDimensionIgnored(d)) { - final Node n = map.get(d); - nodes.remove(n); + final Node n = map.get(d); + if (traceExtractor.isDimensionIgnored(d)) { + hiddenNodes.add(n); + } else { nodes.add(n); - lines.add(n); } }); lines.addAll(nodes); + lines.addAll(hiddenNodes); } public void refresh() { @@ -661,7 +662,7 @@ public void refresh() { isInReplayMode.set(traceExplorer.isInReplayMode()); final int currentStateStartIndex = Math.max(0, currentState.intValue()); - final int currentStateEndIndex = currentStateStartIndex + nbDisplayableStates.intValue(); + final int currentStateEndIndex = Math.min(currentStateStartIndex + nbDisplayableStates.intValue(), traceExtractor.getStatesTraceLength()); final int selectedStateIndex = traceExtractor.getStateIndex(traceExplorer.getCurrentState()); @@ -679,9 +680,10 @@ protected boolean computeValue() { selectedStateIndex); } - for (Dimension dimension : traceExtractor.getDimensions()) { + final List> dimensions = new ArrayList<>(traceExtractor.getDimensions()); + for (Dimension dimension : dimensions) { final HBox hBox = createValueTraceLine(dimension); - fillValueLine(hBox, dimension, currentStateStartIndex - 1, currentStateEndIndex + 1, selectedStateIndex); + fillValueLine(hBox, dimension, currentStateStartIndex, currentStateEndIndex + 1, selectedStateIndex); } sortValueLines(); From 1a5be44873cf850e2b82ff7753bfad8d4766f696 Mon Sep 17 00:00:00 2001 From: d-leroy Date: Tue, 7 Feb 2017 10:59:23 +0100 Subject: [PATCH 102/267] Added missing derived to metamodel and updated state graph and timeline diff viewer to the new generic API --- .../AbstractGemocAnimatorServices.java | 10 +- .../sirius/services/IModelAnimator.java | 2 +- .../services/AbstractDSLDebuggerServices.java | 950 +++++++++--------- .../model/GenericTrace.aird | 240 +---- .../model/GenericTrace.ecore | 2 +- .../trace/gemoc/api/ITraceExtractor.java | 2 + .../traceaddon/GenericTraceExtractor.java | 134 +-- .../META-INF/MANIFEST.MF | 3 +- .../diffviewer/logic/DiffComputer.java | 115 +-- .../views/TimelineDiffViewerRenderer.java | 292 +++--- .../MultidimensionalTimelineRenderer.java | 133 ++- .../stategraph/logic/StateGraph.java | 105 +- 12 files changed, 903 insertions(+), 1085 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index a36f3a6f0..4330af98d 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -281,14 +281,14 @@ public void addRepresentationToRefresh(String representationID, } @Override - public void activate(Object context, Step step) { + public void activate(Object context, Step step) { final Set instructionURIs = new HashSet(); MSEOccurrence mseOccurrence = step.getMseoccurrence(); if (mseOccurrence != null && mseOccurrence.getMse() != null && mseOccurrence.getMse().getCaller() != null) { instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse().getCaller())); } if(step instanceof ParallelStep){ - for(Step substep: ((ParallelStep)step).getSubSteps()){ + for(Step substep: ((ParallelStep)step).getSubSteps()){ if (substep.getMseoccurrence() != null && substep.getMseoccurrence().getMse() != null && substep.getMseoccurrence().getMse().getCaller() != null) { @@ -388,18 +388,18 @@ public void aboutToSelectStep(IExecutionEngine engine, Collection logicalS } @Override - public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) { + public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) { } @Override - public void aboutToExecuteStep(IExecutionEngine engine, Step stepToExecute) { + public void aboutToExecuteStep(IExecutionEngine engine, Step stepToExecute) { if(!(stepToExecute.eContainer() instanceof ParallelStep)){ activate(engine, stepToExecute); } } @Override - public void stepExecuted(IExecutionEngine engine, Step stepExecuted) { + public void stepExecuted(IExecutionEngine engine, Step stepExecuted) { } } diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java index 7895062d2..d52c23427 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java @@ -30,7 +30,7 @@ public interface IModelAnimator extends IEngineAddon { * @param context * the context {@link Object} */ - void activate(Object context, Step step); + void activate(Object context, Step step); /** * Clears {@link IModelAnimator#activate(LogicalStep) activated} diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java index a4610efb3..79fbef0a9 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java @@ -63,46 +63,46 @@ public abstract class AbstractDSLDebuggerServices { */ public static final class StringCouple { - /** - * The first string of the couple. - */ - private final String first; + /** + * The first string of the couple. + */ + private final String first; - /** - * The second string of the couple. - */ - private final String second; + /** + * The second string of the couple. + */ + private final String second; - /** - * Constructor. - * - * @param first - * the first string of the couple - * @param second - * the second string of the couple - */ - public StringCouple(String first, String second) { - this.first = first; - this.second = second; - } + /** + * Constructor. + * + * @param first + * the first string of the couple + * @param second + * the second string of the couple + */ + public StringCouple(String first, String second) { + this.first = first; + this.second = second; + } - /** - * Gets the first string of the couple. - * - * @return the first string of the couple - */ - public String getFirst() { - return first; - } + /** + * Gets the first string of the couple. + * + * @return the first string of the couple + */ + public String getFirst() { + return first; + } - /** - * Gets the second string of the couple. - * - * @return the second string of the couple - */ - public String getSecond() { - return second; - } + /** + * Gets the second string of the couple. + * + * @return the second string of the couple + */ + public String getSecond() { + return second; + } } /** @@ -112,415 +112,414 @@ public String getSecond() { */ public static final class BreakpointListener implements IBreakpointListener, IDSLCurrentInstructionListener { - /** - * Any layer {@link Set}, means always refresh the given {@link DRepresentation} no matter what its - * layer are. It should be used for trees and tables since they don't have layers. - */ - private static final Set ANY_LAYER = new HashSet(); - - /** - * Mapping of the {@link RepresentationDescription#getName() representation identifier} to a - * {@link Layer#getName() layer identifier} or {@link BreakpointListener#ANY_LAYER any layer}. - */ - private final Map>> representationToRefresh = new HashMap>>(); - - /** - * The current {@link StackFrame}. - */ - private StackFrame currentFrame; - - public BreakpointListener() { - install(); - } - - /** - * Installs this {@link IBreakpointListener}. - */ - public void install() { - DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this); - for (IBreakpoint breakpoint : DebugPlugin.getDefault().getBreakpointManager() - .getBreakpoints()) { - if (breakpoint instanceof DSLBreakpoint) { - addBreakpoint((DSLBreakpoint)breakpoint); - } + /** + * Any layer {@link Set}, means always refresh the given {@link DRepresentation} no matter what its + * layer are. It should be used for trees and tables since they don't have layers. + */ + private static final Set ANY_LAYER = new HashSet(); + + /** + * Mapping of the {@link RepresentationDescription#getName() representation identifier} to a + * {@link Layer#getName() layer identifier} or {@link BreakpointListener#ANY_LAYER any layer}. + */ + private final Map>> representationToRefresh = new HashMap>>(); + + /** + * The current {@link StackFrame}. + */ + private StackFrame currentFrame; + + public BreakpointListener() { + install(); + } + + /** + * Installs this {@link IBreakpointListener}. + */ + public void install() { + DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this); + for (IBreakpoint breakpoint : DebugPlugin.getDefault().getBreakpointManager().getBreakpoints()) { + if (breakpoint instanceof DSLBreakpoint) { + addBreakpoint((DSLBreakpoint)breakpoint); + } + } } - } - - /** - * Uninstalls this {@link IBreakpointListener}. - */ - public void uninstall() { - DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this); - } - /** - * {@inheritDoc} - * - * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint) - */ - public void breakpointAdded(IBreakpoint breakpoint) { - if (breakpoint instanceof DSLBreakpoint) { - addBreakpoint((DSLBreakpoint)breakpoint); - final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; - final Set instructionURIs = new HashSet(); - instructionURIs.add(dslBreakpoint.getURI()); - notifySirius(instructionURIs, dslBreakpoint.getModelIdentifier()); - } - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, - * org.eclipse.core.resources.IMarkerDelta) - */ - public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) { - if (breakpoint instanceof DSLBreakpoint) { - removeBreakpoint((DSLBreakpoint)breakpoint); - final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; - final Set instructionURIs = new HashSet(); - instructionURIs.add(dslBreakpoint.getURI()); - notifySirius(instructionURIs, dslBreakpoint.getModelIdentifier()); + /** + * Uninstalls this {@link IBreakpointListener}. + */ + public void uninstall() { + DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint) + */ + public void breakpointAdded(IBreakpoint breakpoint) { + if (breakpoint instanceof DSLBreakpoint) { + addBreakpoint((DSLBreakpoint)breakpoint); + final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; + final Set instructionURIs = new HashSet(); + instructionURIs.add(dslBreakpoint.getURI()); + notifySirius(instructionURIs, dslBreakpoint.getModelIdentifier()); + } } - } - /** - * {@inheritDoc} - * - * @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, - * org.eclipse.core.resources.IMarkerDelta) - */ - public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) { - try { - if (breakpoint instanceof DSLBreakpoint && delta.getAttribute(IBreakpoint.ENABLED) != null - && breakpoint.isEnabled() != ((Boolean)delta.getAttribute(IBreakpoint.ENABLED)) - .booleanValue()) { - final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; - final Set instructionURIs = new HashSet(); - instructionURIs.add(dslBreakpoint.getURI()); - notifySirius(instructionURIs, dslBreakpoint.getModelIdentifier()); - } - } catch (CoreException e) { - // ignore + /** + * {@inheritDoc} + * + * @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, + * org.eclipse.core.resources.IMarkerDelta) + */ + public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) { + if (breakpoint instanceof DSLBreakpoint) { + removeBreakpoint((DSLBreakpoint)breakpoint); + final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; + final Set instructionURIs = new HashSet(); + instructionURIs.add(dslBreakpoint.getURI()); + notifySirius(instructionURIs, dslBreakpoint.getModelIdentifier()); + } } - } - /** - * Adds the given {@link DSLBreakpoint}. - * - * @param breakpoint - * the {@link DSLBreakpoint} - */ - protected void addBreakpoint(DSLBreakpoint breakpoint) { - Set brkps = BREAKPOINTS.get(breakpoint.getURI()); - if (brkps == null) { - brkps = new HashSet(); - BREAKPOINTS.put(breakpoint.getURI(), brkps); + /** + * {@inheritDoc} + * + * @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, + * org.eclipse.core.resources.IMarkerDelta) + */ + public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) { + try { + if (breakpoint instanceof DSLBreakpoint && delta.getAttribute(IBreakpoint.ENABLED) != null + && breakpoint.isEnabled() != ((Boolean)delta.getAttribute(IBreakpoint.ENABLED)) + .booleanValue()) { + final DSLBreakpoint dslBreakpoint = (DSLBreakpoint)breakpoint; + final Set instructionURIs = new HashSet(); + instructionURIs.add(dslBreakpoint.getURI()); + notifySirius(instructionURIs, dslBreakpoint.getModelIdentifier()); + } + } catch (CoreException e) { + // ignore + } } - brkps.add(breakpoint); - } - /** - * Removes the given {@link DSLBreakpoint}. - * - * @param breakpoint - * the {@link DSLBreakpoint} - */ - protected void removeBreakpoint(DSLBreakpoint breakpoint) { - Set brkps = BREAKPOINTS.get(breakpoint.getURI()); - if (brkps != null) { - brkps.remove(breakpoint); + /** + * Adds the given {@link DSLBreakpoint}. + * + * @param breakpoint + * the {@link DSLBreakpoint} + */ + protected void addBreakpoint(DSLBreakpoint breakpoint) { + Set brkps = BREAKPOINTS.get(breakpoint.getURI()); + if (brkps == null) { + brkps = new HashSet(); + BREAKPOINTS.put(breakpoint.getURI(), brkps); + } + brkps.add(breakpoint); + } + + /** + * Removes the given {@link DSLBreakpoint}. + * + * @param breakpoint + * the {@link DSLBreakpoint} + */ + protected void removeBreakpoint(DSLBreakpoint breakpoint) { + Set brkps = BREAKPOINTS.get(breakpoint.getURI()); + if (brkps != null) { + brkps.remove(breakpoint); + } } - } - /** - * Notifies Sirius about a change in the given {@link DSLBreakpoint}. - * - * @param instructionUri - * the {@link URI} of the instruction to refresh. - * @param debugModelID - * the debug model identifier - */ - public void notifySirius(Set instructionUris, String debugModelID) { - Map> toRefresh = representationToRefresh.get(debugModelID); - if (toRefresh != null) { - for (IEditingSession session : SessionUIManager.INSTANCE.getUISessions()) { - final TransactionalEditingDomain transactionalEditingDomain = session.getSession() - .getTransactionalEditingDomain(); - final boolean instructionPresent = isOneInstructionPresent(instructionUris, - transactionalEditingDomain.getResourceSet()); - if (instructionPresent) { - final List representations = getRepresentationsToRefresh(toRefresh, - session); - refreshRepresentations(transactionalEditingDomain, representations); + /** + * Notifies Sirius about a change in the given {@link DSLBreakpoint}. + * + * @param instructionUri + * the {@link URI} of the instruction to refresh. + * @param debugModelID + * the debug model identifier + */ + public void notifySirius(Set instructionUris, String debugModelID) { + Map> toRefresh = representationToRefresh.get(debugModelID); + if (toRefresh != null) { + for (IEditingSession session : SessionUIManager.INSTANCE.getUISessions()) { + final TransactionalEditingDomain transactionalEditingDomain = session.getSession() + .getTransactionalEditingDomain(); + final boolean instructionPresent = isOneInstructionPresent(instructionUris, + transactionalEditingDomain.getResourceSet()); + if (instructionPresent) { + final List representations = getRepresentationsToRefresh(toRefresh, + session); + refreshRepresentations(transactionalEditingDomain, representations); + } + } } } - } - } - /** - * Refreshes given {@link DRepresentation} in the given {@link TransactionalEditingDomain}. - * - * @param transactionalEditingDomain - * the {@link TransactionalEditingDomain} - * @param representations - * the {@link List} of {@link DRepresentation} to refresh - */ - public void refreshRepresentations(final TransactionalEditingDomain transactionalEditingDomain, - final List representations) { - // TODO prevent the editors from getting dirty - if (representations.size() != 0) { - final RefreshRepresentationsCommand refresh = new RefreshRepresentationsCommand( - transactionalEditingDomain, new NullProgressMonitor(), representations); - - try { - transactionalEditingDomain.getCommandStack().execute(refresh); - } catch (Exception e) { - String repString = representations.stream().map(r -> r.getName()).collect(Collectors - .joining(", ")); - DebugSiriusIdeUiPlugin.getPlugin().getLog().log(new Status(IStatus.WARNING, - DebugSiriusIdeUiPlugin.ID, "Failed to refresh Sirius representation(s)[" - + repString + "], we hope to be able to do it later", e)); - } + /** + * Refreshes given {@link DRepresentation} in the given {@link TransactionalEditingDomain}. + * + * @param transactionalEditingDomain + * the {@link TransactionalEditingDomain} + * @param representations + * the {@link List} of {@link DRepresentation} to refresh + */ + public void refreshRepresentations(final TransactionalEditingDomain transactionalEditingDomain, + final List representations) { + // TODO prevent the editors from getting dirty + if (representations.size() != 0) { + final RefreshRepresentationsCommand refresh = new RefreshRepresentationsCommand( + transactionalEditingDomain, new NullProgressMonitor(), representations); + + try { + transactionalEditingDomain.getCommandStack().execute(refresh); + } catch (Exception e) { + String repString = representations.stream().map(r -> r.getName()).collect(Collectors + .joining(", ")); + DebugSiriusIdeUiPlugin.getPlugin().getLog().log(new Status(IStatus.WARNING, + DebugSiriusIdeUiPlugin.ID, "Failed to refresh Sirius representation(s)[" + + repString + "], we hope to be able to do it later", e)); + } + } } - } - /** - * Gets the {@link List} of {@link DRepresentation} to refresh in the given {@link IEditingSession}. - * - * @param toRefresh - * the representation names and layers to refresh - * @param session - * the {@link IEditingSession} - * @return the {@link List} of {@link DRepresentation} to refresh in the given {@link IEditingSession} - */ - private List getRepresentationsToRefresh(Map> toRefresh, - IEditingSession session) { - final List representations = new ArrayList(); - for (DialectEditor editor : session.getEditors()) { - final DRepresentation representation = editor.getRepresentation(); - if (representation == null) { - System.out.println("Dammit"); - } else { - final RepresentationDescription description = DialectManager.INSTANCE.getDescription( - representation); - if (description != null) { - final String representationId = description.getName(); - final Set layerIDs = toRefresh.get(representationId); - if (layerIDs == ANY_LAYER) { - representations.add(representation); - } else if (layerIDs != null && representation instanceof DDiagram && isActiveLayer( - (DDiagram)representation, layerIDs)) { - representations.add(representation); + /** + * Gets the {@link List} of {@link DRepresentation} to refresh in the given {@link IEditingSession}. + * + * @param toRefresh + * the representation names and layers to refresh + * @param session + * the {@link IEditingSession} + * @return the {@link List} of {@link DRepresentation} to refresh in the given {@link IEditingSession} + */ + private List getRepresentationsToRefresh(Map> toRefresh, + IEditingSession session) { + final List representations = new ArrayList(); + for (DialectEditor editor : session.getEditors()) { + final DRepresentation representation = editor.getRepresentation(); + if (representation == null) { + System.out.println("Dammit"); + } else { + final RepresentationDescription description = DialectManager.INSTANCE.getDescription( + representation); + if (description != null) { + final String representationId = description.getName(); + final Set layerIDs = toRefresh.get(representationId); + if (layerIDs == ANY_LAYER) { + representations.add(representation); + } else if (layerIDs != null && representation instanceof DDiagram && isActiveLayer( + (DDiagram)representation, layerIDs)) { + representations.add(representation); + } + } + } } + return representations; + } + + /** + * Tells if at least one of the given instruction {@link URI} is present in the given + * {@link ResourceSet}. + * + * @param instructionUris + * the {@link Set} of instructions {@link URI} + * @param resourceSet + * the {@link ResourceSet} + * @return true if at least one of the given instruction {@link URI} is present in the + * given {@link ResourceSet}, false otherwise + */ + private static boolean isOneInstructionPresent(Set instructionUris, + final ResourceSet resourceSet) { + boolean instructionPresent = false; + for (URI instructionUri : instructionUris) { + if (resourceSet.getEObject(instructionUri, false) != null) { + instructionPresent = true; + break; + } + } + return instructionPresent; + } + + /** + * Tells if any of the given {@link Layer#getName() layer identifier} is active for the given + * {@link DDiagram}. + * + * @param diagram + * the {@link DDiagram} + * @param layerIDs + * the {@link Set} of {@link Layer#getName() layer identifiers} + * @return true if any of the given {@link Layer#getName() layer identifier} is active + * for the given {@link DDiagram}, false otherwise + */ + private boolean isActiveLayer(DDiagram diagram, Set layerIDs) { + boolean res = false; + + for (Layer layer : diagram.getActivatedLayers()) { + if (layerIDs.contains(layer.getName())) { + res = true; + break; + } } - } - } - return representations; - } - - /** - * Tells if at least one of the given instruction {@link URI} is present in the given - * {@link ResourceSet}. - * - * @param instructionUris - * the {@link Set} of instructions {@link URI} - * @param resourceSet - * the {@link ResourceSet} - * @return true if at least one of the given instruction {@link URI} is present in the - * given {@link ResourceSet}, false otherwise - */ - private static boolean isOneInstructionPresent(Set instructionUris, - final ResourceSet resourceSet) { - boolean instructionPresent = false; - for (URI instructionUri : instructionUris) { - if (resourceSet.getEObject(instructionUri, false) != null) { - instructionPresent = true; - break; - } - } - return instructionPresent; - } - - /** - * Tells if any of the given {@link Layer#getName() layer identifier} is active for the given - * {@link DDiagram}. - * - * @param diagram - * the {@link DDiagram} - * @param layerIDs - * the {@link Set} of {@link Layer#getName() layer identifiers} - * @return true if any of the given {@link Layer#getName() layer identifier} is active - * for the given {@link DDiagram}, false otherwise - */ - private boolean isActiveLayer(DDiagram diagram, Set layerIDs) { - boolean res = false; - for (Layer layer : diagram.getActivatedLayers()) { - if (layerIDs.contains(layer.getName())) { - res = true; - break; - } + return res; + } + + /** + * Add the given {@link RepresentationDescription#getName() representation identifier} for + * {@link DRepresentation} refresh. + * + * @param debugModelID + * the debug model identifier + * @param representationID + * the {@link RepresentationDescription#getName() representation identifier} + */ + public void addRepresentationToRefresh(String debugModelID, String representationID) { + Map> toRefresh = representationToRefresh.get(debugModelID); + if (toRefresh == null) { + toRefresh = new HashMap>(); + representationToRefresh.put(debugModelID, toRefresh); + } + toRefresh.put(representationID, ANY_LAYER); + } + + /** + * Add the given {@link RepresentationDescription#getName() representation identifier} and + * {@link Layer#getName() layer identifier} for {@link DRepresentation} refresh. + * + * @param debugModelID + * the debug model identifier + * @param representationID + * the {@link RepresentationDescription#getName() representation identifier} + * @param layerID + * the {@link Layer#getName() layer identifier} + */ + public void addRepresentationToRefresh(String debugModelID, String representationID, String layerID) { + Map> toRefresh = representationToRefresh.get(debugModelID); + if (toRefresh == null) { + toRefresh = new HashMap>(); + representationToRefresh.put(debugModelID, toRefresh); + } + Set layerIDs = toRefresh.get(representationID); + if (layerIDs != ANY_LAYER) { + if (layerIDs == null) { + layerIDs = new HashSet(); + toRefresh.put(representationID, layerIDs); + } + layerIDs.add(layerID); + } } - return res; - } - - /** - * Add the given {@link RepresentationDescription#getName() representation identifier} for - * {@link DRepresentation} refresh. - * - * @param debugModelID - * the debug model identifier - * @param representationID - * the {@link RepresentationDescription#getName() representation identifier} - */ - public void addRepresentationToRefresh(String debugModelID, String representationID) { - Map> toRefresh = representationToRefresh.get(debugModelID); - if (toRefresh == null) { - toRefresh = new HashMap>(); - representationToRefresh.put(debugModelID, toRefresh); - } - toRefresh.put(representationID, ANY_LAYER); - } + /** + * {@inheritDoc} + * + * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#currentInstructionChanged(String, + * fr.obeo.dsl.debug.StackFrame)) + */ + public void currentInstructionChanged(String debugModelID, StackFrame frame) { + EObject currentInstruction = frame.getCurrentInstruction(); + final Set instructionURIs = new HashSet(); - /** - * Add the given {@link RepresentationDescription#getName() representation identifier} and - * {@link Layer#getName() layer identifier} for {@link DRepresentation} refresh. - * - * @param debugModelID - * the debug model identifier - * @param representationID - * the {@link RepresentationDescription#getName() representation identifier} - * @param layerID - * the {@link Layer#getName() layer identifier} - */ - public void addRepresentationToRefresh(String debugModelID, String representationID, String layerID) { - Map> toRefresh = representationToRefresh.get(debugModelID); - if (toRefresh == null) { - toRefresh = new HashMap>(); - representationToRefresh.put(debugModelID, toRefresh); - } - Set layerIDs = toRefresh.get(representationID); - if (layerIDs != ANY_LAYER) { - if (layerIDs == null) { - layerIDs = new HashSet(); - toRefresh.put(representationID, layerIDs); - } - layerIDs.add(layerID); + if (currentInstruction instanceof ParallelStep) { + addMseOccurenceAndCallerToInstructionsURIs(instructionURIs, + ((ParallelStep)currentInstruction).getMseoccurrence()); + for (Step step : ((ParallelStep)currentInstruction).getSubSteps()) { + addMseOccurenceAndCallerToInstructionsURIs(instructionURIs, step.getMseoccurrence()); + } + } else if (currentInstruction instanceof Step) { + if (!(currentInstruction.eContainer() instanceof ParallelStep)) { + // do not show internal step of parallel step, because they are already shown as a + // parallel + addMseOccurenceAndCallerToInstructionsURIs(instructionURIs, ((Step)currentInstruction) + .getMseoccurrence()); + } + } else { + instructionURIs.add(EcoreUtil.getURI(currentInstruction)); + } + final Set lastInstructions = CURRENT_INSTRUCTIONS_PER_FRAME.remove(frame); + if (lastInstructions != null) { + notifySirius(lastInstructions, debugModelID); + } + CURRENT_INSTRUCTIONS_PER_FRAME.put(frame, instructionURIs); + notifySirius(instructionURIs, debugModelID); } - } - /** - * {@inheritDoc} - * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#currentInstructionChanged(String, - * fr.obeo.dsl.debug.StackFrame)) - */ - public void currentInstructionChanged(String debugModelID, StackFrame frame) { - EObject currentInstruction = frame.getCurrentInstruction(); - final Set instructionURIs = new HashSet(); - - if (currentInstruction instanceof ParallelStep) { - addMseOccurenceAndCallerToInstructionsURIs(instructionURIs, - ((ParallelStep)currentInstruction).getMseoccurrence()); - for (Step step : ((ParallelStep)currentInstruction).getSubSteps()) { - addMseOccurenceAndCallerToInstructionsURIs(instructionURIs, step.getMseoccurrence()); - } - } else if (currentInstruction instanceof Step) { - if (!(currentInstruction.eContainer() instanceof ParallelStep)) { - // do not show internal step of parallel step, because they are already shown as a - // parallel - addMseOccurenceAndCallerToInstructionsURIs(instructionURIs, ((Step)currentInstruction) - .getMseoccurrence()); - } - } else { - instructionURIs.add(EcoreUtil.getURI(currentInstruction)); - } - final Set lastInstructions = CURRENT_INSTRUCTIONS_PER_FRAME.remove(frame); - if (lastInstructions != null) { - notifySirius(lastInstructions, debugModelID); + private void addMseOccurenceAndCallerToInstructionsURIs(Set instructionURIs, + MSEOccurrence mseOccurrence) { + if (mseOccurrence != null) { + instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse())); + if (mseOccurrence.getMse().getCaller() != null) { + instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse().getCaller())); + } + } } - CURRENT_INSTRUCTIONS_PER_FRAME.put(frame, instructionURIs); - notifySirius(instructionURIs, debugModelID); - } - private void addMseOccurenceAndCallerToInstructionsURIs(Set instructionURIs, - MSEOccurrence mseOccurrence) { - if (mseOccurrence != null) { - instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse())); - if (mseOccurrence.getMse().getCaller() != null) { - instructionURIs.add(EcoreUtil.getURI(mseOccurrence.getMse().getCaller())); - } + /** + * {@inheritDoc} + * + * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#terminated(java.lang.String, + * fr.obeo.dsl.debug.StackFrame) + */ + public void terminated(String debugModelID, StackFrame frame) { + final Set lastInstructions = CURRENT_INSTRUCTIONS_PER_FRAME.remove(frame); + if (lastInstructions != null) { + notifySirius(lastInstructions, debugModelID); + } } - } - /** - * {@inheritDoc} - * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#terminated(java.lang.String, - * fr.obeo.dsl.debug.StackFrame) - */ - public void terminated(String debugModelID, StackFrame frame) { - final Set lastInstructions = CURRENT_INSTRUCTIONS_PER_FRAME.remove(frame); - if (lastInstructions != null) { - notifySirius(lastInstructions, debugModelID); + /** + * Gets the current {@link StackFrame}. + * + * @return the current {@link StackFrame} + */ + public StackFrame getCurrentFrame() { + return currentFrame; + } + + /** + * {@inheritDoc} + * + * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#setCurrentFrame(java.lang.String, + * fr.obeo.dsl.debug.StackFrame) + */ + public void setCurrentFrame(String debugModelID, StackFrame frame) { + if (currentFrame != frame) { + currentFrame = frame; + Set instructionUris = CURRENT_INSTRUCTIONS_PER_FRAME.get(getCurrentFrame()); + if (instructionUris != null) { + notifySirius(instructionUris, debugModelID); + } + } } - } - /** - * Gets the current {@link StackFrame}. - * - * @return the current {@link StackFrame} - */ - public StackFrame getCurrentFrame() { - return currentFrame; - } - - /** - * {@inheritDoc} - * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#setCurrentFrame(java.lang.String, - * fr.obeo.dsl.debug.StackFrame) - */ - public void setCurrentFrame(String debugModelID, StackFrame frame) { - if (currentFrame != frame) { - currentFrame = frame; - Set instructionUris = CURRENT_INSTRUCTIONS_PER_FRAME.get(getCurrentFrame()); - if (instructionUris != null) { - notifySirius(instructionUris, debugModelID); - } - } - } + /** + * Tells if the given layer id and representation id should be refreshed while debugging the given + * debug model id. + * + * @param debugModelID + * the debug model id + * @param representationId + * the representation id + * @param layerID + * the layer id, it can be null + * @return true if the given layer id and representation id should be refreshed while + * debugging the given debug model id, false otherwise + */ + public boolean isRepresentationToRefresh(String debugModelID, String representationId, + String layerID) { + final boolean res; + + final Map> representations = representationToRefresh.get(debugModelID); + if (representations != null) { + final Set layerIDs = representations.get(representationId); + res = layerIDs == ANY_LAYER || (layerIDs != null && layerIDs.contains(layerID)); + } else { + res = false; + } - /** - * Tells if the given layer id and representation id should be refreshed while debugging the given - * debug model id. - * - * @param debugModelID - * the debug model id - * @param representationId - * the representation id - * @param layerID - * the layer id, it can be null - * @return true if the given layer id and representation id should be refreshed while - * debugging the given debug model id, false otherwise - */ - public boolean isRepresentationToRefresh(String debugModelID, String representationId, - String layerID) { - final boolean res; - - final Map> representations = representationToRefresh.get(debugModelID); - if (representations != null) { - final Set layerIDs = representations.get(representationId); - res = layerIDs == ANY_LAYER || (layerIDs != null && layerIDs.contains(layerID)); - } else { - res = false; + return res; } - return res; - } - } /** @@ -534,8 +533,8 @@ public boolean isRepresentationToRefresh(String debugModelID, String representat private static final Map> BREAKPOINTS = new HashMap>(); /** - * Current instruction for a given {@link StackFrame}. Note : in concurrent mode, a ParallelStep may - * be represented by several URI (so we use a set) + * Current instruction for a given {@link StackFrame}. Note : in concurrent mode, a ParallelStep may be + * represented by several URI (so we use a set) */ private static final Map> CURRENT_INSTRUCTIONS_PER_FRAME = new HashMap>(); @@ -543,26 +542,25 @@ public boolean isRepresentationToRefresh(String debugModelID, String representat * Constructor. */ public AbstractDSLDebuggerServices() { - for (StringCouple couple : getRepresentationRefreshList()) { - if (couple.getSecond() != null) { - LISTENER.addRepresentationToRefresh(getModelIdentifier(), couple.getFirst(), couple - .getSecond()); - } else { - LISTENER.addRepresentationToRefresh(getModelIdentifier(), couple.getFirst()); + for (StringCouple couple : getRepresentationRefreshList()) { + if (couple.getSecond() != null) { + LISTENER.addRepresentationToRefresh(getModelIdentifier(), couple.getFirst(), couple + .getSecond()); + } else { + LISTENER.addRepresentationToRefresh(getModelIdentifier(), couple.getFirst()); + } } } - } /** * Gets the {@link List} of {@link StringCouple} representing the - * {@link RepresentationDescription#getName() representation identifier} and the - * {@link Layer#getName() layer identifier} or null where services from this class are - * used. + * {@link RepresentationDescription#getName() representation identifier} and the {@link Layer#getName() + * layer identifier} or null where services from this class are used. * * @return the {@link List} of {@link StringCouple} representing the * {@link RepresentationDescription#getName() representation identifier} and the - * {@link Layer#getName() layer identifier} or null where services from this - * class are used + * {@link Layer#getName() layer identifier} or null where services from this class + * are used */ protected abstract List getRepresentationRefreshList(); @@ -571,12 +569,12 @@ public AbstractDSLDebuggerServices() { * * @param instruction * the {@link EObject instruction} - * @return true if the given {@link EObject instruction} has a breakpoint, - * false otherwise + * @return true if the given {@link EObject instruction} has a breakpoint, false + * otherwise */ public boolean hasBreakpoint(EObject instruction) { - final Set brkps = getBreakpoints(instruction); - return brkps != null && brkps.size() != 0; + final Set brkps = getBreakpoints(instruction); + return brkps != null && brkps.size() != 0; } /** @@ -588,23 +586,23 @@ public boolean hasBreakpoint(EObject instruction) { * false otherwise */ public boolean hasEnabledBreakpoint(EObject instruction) { - boolean res = false; - final Set brkps = getBreakpoints(instruction); - - if (brkps != null && brkps.size() != 0) { - for (DSLBreakpoint breakpoint : brkps) { - try { - if (breakpoint.isEnabled()) { - res = true; - break; + boolean res = false; + final Set brkps = getBreakpoints(instruction); + + if (brkps != null && brkps.size() != 0) { + for (DSLBreakpoint breakpoint : brkps) { + try { + if (breakpoint.isEnabled()) { + res = true; + break; + } + } catch (CoreException e) { + // ignore + } } - } catch (CoreException e) { - // ignore - } } - } - return res; + return res; } /** @@ -616,24 +614,24 @@ public boolean hasEnabledBreakpoint(EObject instruction) { * false otherwise */ public boolean hasDisabledBreakpoint(EObject instruction) { - boolean res = false; - final Set brkps = getBreakpoints(instruction); - - if (brkps != null && brkps.size() != 0) { - res = true; - for (DSLBreakpoint breakpoint : brkps) { - try { - if (breakpoint.isEnabled()) { - res = false; - break; + boolean res = false; + final Set brkps = getBreakpoints(instruction); + + if (brkps != null && brkps.size() != 0) { + res = true; + for (DSLBreakpoint breakpoint : brkps) { + try { + if (breakpoint.isEnabled()) { + res = false; + break; + } + } catch (CoreException e) { + // ignore + } } - } catch (CoreException e) { - // ignore - } } - } - return res; + return res; } /** @@ -646,34 +644,34 @@ public boolean hasDisabledBreakpoint(EObject instruction) { * {@link AbstractDSLDebuggerServices#getModelIdentifier() model identifier} */ protected Set getBreakpoints(EObject instruction) { - Set res = new HashSet(); + Set res = new HashSet(); - Set brkps = BREAKPOINTS.get(EcoreUtil.getURI(instruction)); - if (brkps != null) { - for (DSLBreakpoint breakpoint : brkps) { - if (breakpoint.getModelIdentifier().equals(getModelIdentifier())) { - res.add(breakpoint); - } + Set brkps = BREAKPOINTS.get(EcoreUtil.getURI(instruction)); + if (brkps != null) { + for (DSLBreakpoint breakpoint : brkps) { + if (breakpoint.getModelIdentifier().equals(getModelIdentifier())) { + res.add(breakpoint); + } + } } - } - return res; + return res; } /** * Tells if the given {@link EObject instruction} is a currently debugged instruction. A debugged - * instruction in this context is an instruction a debug target is suspended on. This service works in - * a similar way as {@link AbstractGemocAnimatorServices hasBeenActivated} but will be activated only - * when the engine is paused. In addition, its content is related to the selected stack frame. + * instruction in this context is an instruction a debug target is suspended on. This service works in a + * similar way as {@link AbstractGemocAnimatorServices hasBeenActivated} but will be activated only when + * the engine is paused. In addition, its content is related to the selected stack frame. * * @param instruction * the {@link EObject instruction} - * @return true if the given {@link EObject instruction} is a currently debugged - * instruction, false otherwise + * @return true if the given {@link EObject instruction} is a currently debugged instruction, + * false otherwise */ public boolean isCurrentInstruction(EObject instruction) { - final Set instructions = CURRENT_INSTRUCTIONS_PER_FRAME.get(LISTENER.getCurrentFrame()); - return instructions != null && instructions.contains(EcoreUtil.getURI(instruction)); + final Set instructions = CURRENT_INSTRUCTIONS_PER_FRAME.get(LISTENER.getCurrentFrame()); + return instructions != null && instructions.contains(EcoreUtil.getURI(instruction)); } /** diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird index 48c5c79e4..2f891c6ae 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird @@ -51,11 +51,6 @@ - - - - - @@ -73,6 +68,21 @@ + + + + + + + + + + + + + + + @@ -432,67 +442,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1454,12 +1403,12 @@ - + - - - + + + @@ -1523,140 +1472,7 @@ - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - italic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - italic - - - - - - - - - - italic - - - - - - - - - - italic - - - - - - - - - - - - - - - + @@ -1665,9 +1481,7 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - - - + @@ -1705,7 +1519,7 @@ - + @@ -1750,7 +1564,7 @@ - + @@ -1760,7 +1574,7 @@ - + @@ -1771,7 +1585,7 @@ - + @@ -1782,7 +1596,7 @@ - + @@ -1792,7 +1606,7 @@ - + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index e58463f5a..a2c748cfa 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -158,7 +158,7 @@ + volatile="true" transient="true" derived="true">
diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java index caa96593d..15321dbcb 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java @@ -72,6 +72,8 @@ public interface ITraceExtractor, StateSubType exten */ int getNumberOfDimensions(); + List getSubSteps(Step step); + List getSteps(int firstStateIndex, int lastStateIndex); /** diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index 6f30823d9..21e1e99db 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -58,27 +58,30 @@ import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; @SuppressWarnings("restriction") -public class GenericTraceExtractor implements ITraceExtractor, State, TracedObject, Dimension, Value> { +public class GenericTraceExtractor + implements ITraceExtractor, State, TracedObject, Dimension, Value> { - private Trace trace; - private Map,Boolean> ignoredDimensions = new HashMap<>(); + private Trace trace; + private Map, Boolean> ignoredDimensions = new HashMap<>(); private final IQualifiedNameProvider nameProvider = new DefaultDeclarativeQualifiedNameProvider(); private Map> listeners = new HashMap<>(); - + /** * Constructor - * @param trace The trace + * + * @param trace + * The trace */ - public GenericTraceExtractor(Trace, TracedObject, State> trace) { + public GenericTraceExtractor(Trace, TracedObject, State> trace) { this.trace = trace; configureDiffEngine(); } - + @Override - public void loadTrace(Trace, TracedObject, State> trace) { + public void loadTrace(Trace, TracedObject, State> trace) { this.trace = trace; } - + @Override public void notifyListeners() { for (Map.Entry> entry : listeners.entrySet()) { @@ -115,21 +118,21 @@ public boolean isDimensionIgnored(Dimension dimension) { final Boolean ignored = ignoredDimensions.get(dimension); return ignored != null && ignored.booleanValue(); } - + private boolean isDimensionIgnored(int index) { return isDimensionIgnored(getDimensions().get(index)); } @Override public boolean isStateBreakable(State state) { -// final boolean b = state.getStartedSteps().size() == 1; -// if (b) { -// Step s = state.getStartedSteps().get(0); -// return !(s instanceof ImplicitStep); -// } + // final boolean b = state.getStartedSteps().size() == 1; + // if (b) { + // Step s = state.getStartedSteps().get(0); + // return !(s instanceof ImplicitStep); + // } return true; } - + private final IPostProcessor customPostProcessor = new IPostProcessor() { private final Function getIdFunction = e -> e.eClass().getName(); @@ -190,7 +193,7 @@ public void postConflicts(Comparison comparison, Monitor monitor) { public void postComparison(Comparison comparison, Monitor monitor) { } }; - + private boolean compareInitialized = false; private IPostProcessor.Descriptor descriptor = null; private Registry registry = null; @@ -234,7 +237,7 @@ private boolean compareEObjects(EObject e1, EObject e2) { final Comparison comparison = compare.compare(scope); return comparison.getDifferences().isEmpty(); } - + @Override public boolean compareStates(State state1, State state2, boolean respectIgnored) { if (state1.getValues().size() != state2.getValues().size()) { @@ -260,14 +263,14 @@ public boolean compareStates(State state1, State state2, boolean res return result; } - + private final List> cachedDimensions = new ArrayList<>(); - private final Map, List>> stateEquivalenceClasses = Collections + private final Map, List>> stateEquivalenceClasses = Collections .synchronizedMap(new HashMap<>()); - private final Map, List>> cachedMaskedStateEquivalenceClasses = Collections + private final Map, List>> cachedMaskedStateEquivalenceClasses = Collections .synchronizedMap(new HashMap<>()); private final List> observedValues = new ArrayList<>(); - + private List computeStateComparisonList(List> values) { final List valueIndexes = new ArrayList<>(); for (int i = 0; i < values.size(); i++) { @@ -290,24 +293,23 @@ private List computeStateComparisonList(List> values } return valueIndexes; } - - private void updateEquivalenceClasses(State state) { + + private void updateEquivalenceClasses(State state) { final List> values = getStateValues(state); final List valueIndexes = computeStateComparisonList(values); - List> equivalenceClass = stateEquivalenceClasses.get(valueIndexes); + List> equivalenceClass = stateEquivalenceClasses.get(valueIndexes); if (equivalenceClass == null) { equivalenceClass = new ArrayList<>(); stateEquivalenceClasses.put(valueIndexes, equivalenceClass); } equivalenceClass.add(state); final List> dimensionsToMask = getIgnoredDimensions(); - // If the cached masked equivalence classes have not been flushed, updated them. + // If the cached masked equivalence classes have not been flushed, + // updated them. if (!(dimensionsToMask.isEmpty() || cachedMaskedStateEquivalenceClasses.isEmpty())) { final List> dimensions = getDimensions(); - final List dimensionIndexesToMask = dimensionsToMask.stream() - .map(d -> dimensions.indexOf(d)) - .sorted() - .collect(Collectors.toList()); + final List dimensionIndexesToMask = dimensionsToMask.stream().map(d -> dimensions.indexOf(d)) + .sorted().collect(Collectors.toList()); final List maskedIndexList = applyMask(valueIndexes, dimensionIndexesToMask); equivalenceClass = cachedMaskedStateEquivalenceClasses.get(maskedIndexList); if (equivalenceClass == null) { @@ -317,7 +319,7 @@ private void updateEquivalenceClasses(State state) { equivalenceClass.add(state); } } - + private List applyMask(List source, List mask) { final List result = new ArrayList<>(source); int j = 0; @@ -327,21 +329,19 @@ private List applyMask(List source, List mask) { } return result; } - - private List>> getStateEquivalenceClasses() { + + private List>> getStateEquivalenceClasses() { final Set> dimensionsToMask = ignoredDimensions.keySet(); if (dimensionsToMask.isEmpty()) { return new ArrayList<>(stateEquivalenceClasses.values()); } if (cachedMaskedStateEquivalenceClasses.isEmpty()) { final List> dimensions = getDimensions(); - final List dimensionIndexesToMask = dimensionsToMask.stream() - .map(d -> dimensions.indexOf(d)) - .sorted() - .collect(Collectors.toList()); + final List dimensionIndexesToMask = dimensionsToMask.stream().map(d -> dimensions.indexOf(d)) + .sorted().collect(Collectors.toList()); stateEquivalenceClasses.forEach((indexList, stateList) -> { final List maskedIndexList = applyMask(indexList, dimensionIndexesToMask); - List> equivalenceClass = cachedMaskedStateEquivalenceClasses.get(maskedIndexList); + List> equivalenceClass = cachedMaskedStateEquivalenceClasses.get(maskedIndexList); if (equivalenceClass == null) { equivalenceClass = new ArrayList<>(); cachedMaskedStateEquivalenceClasses.put(maskedIndexList, equivalenceClass); @@ -371,19 +371,17 @@ public LaunchConfiguration getLaunchConfiguration() { @Override public int getNumberOfDimensions() { - return trace.getTracedObjects().stream() - .map(o -> o.getDimensions().size()) - .reduce(0, (i1, i2) -> i1 + i2); + return trace.getTracedObjects().stream().map(o -> o.getDimensions().size()).reduce(0, (i1, i2) -> i1 + i2); } - - private List> getStateValues(State state) { + + private List> getStateValues(State state) { final Map, Value> dimensionToValue = new HashMap<>(); state.getValues().forEach(v -> dimensionToValue.put((Dimension) v.eContainer(), v)); return getDimensions().stream().map(d -> dimensionToValue.get(d)).collect(Collectors.toList()); } @Override - public String getStateDescription(State state) { + public String getStateDescription(State state) { String result = ""; final List> values = getStateValues(state); for (int i = 0; i < values.size(); i++) { @@ -392,7 +390,7 @@ public String getStateDescription(State state) { result += (description == null ? "" : (result.length() == 0 ? "" : "\n") + description); } } - + return result; } @@ -408,7 +406,7 @@ public int getStatesTraceLength() { @Override public List> getStates(int firstStateIndex, int lastStateIndex) { - final List> result = new ArrayList<>(); + final List> result = new ArrayList<>(); final int effectiveFrom = Math.max(0, firstStateIndex); final int effectiveTo = Math.min(trace.getStates().size(), lastStateIndex + 1); trace.getStates().subList(effectiveFrom, effectiveTo).forEach(s -> result.add(s)); @@ -427,15 +425,15 @@ public int getValueFirstStateIndex(Value value) { @Override public int getValueLastStateIndex(Value value) { - List> states = value.getStates(); + List> states = value.getStates(); return trace.getStates().indexOf(states.get(states.size() - 1)); } - + private String getValueName(Value value) { final String eClassName = value.eClass().getName(); return eClassName.substring(eClassName.indexOf('_') + 1, eClassName.indexOf("_Value")); } - + private String getObjectDescription(Object object) { if (object == null) { return "null"; @@ -466,12 +464,12 @@ private String getObjectDescription(Object object) { } return object.toString(); } - + public List> getValuesForStates(Dimension dimension, int from, int to) { final List> values = dimension.getValues().stream().filter(v -> { - final List> states = v.getStates(); - final State firstState = states.get(0); - final State lastState = states.get(states.size() - 1); + final List> states = v.getStates(); + final State firstState = states.get(0); + final State lastState = states.get(states.size() - 1); return getStateIndex(firstState) < to && getStateIndex(lastState) > from; }).collect(Collectors.toList()); return values; @@ -482,7 +480,7 @@ public String getValueDescription(Value value) { if (value == null) { return ""; } - String description = getDimensionLabel((Dimension)value.eContainer()) + " : "; + String description = getDimensionLabel((Dimension) value.eContainer()) + " : "; final String attributeName = getValueName(value); if (attributeName.length() > 0) { final Optional attribute = value.eClass().getEAllStructuralFeatures().stream() @@ -499,7 +497,7 @@ private Object getOriginalObject(EObject eObject) { return eObject.eClass().getEAllReferences().stream().filter(r -> r.getName().startsWith("originalObject")) .findFirst().map(r -> eObject.eGet(r)).orElse(null); } - + private Map, String> dimensionToLabel = new HashMap<>(); @Override @@ -529,7 +527,7 @@ public int getDimensionLength(Dimension dimension) { return dimension.getValues().size(); } - private void updateEquivalenceClasses(List> states) { + private void updateEquivalenceClasses(List> states) { states.stream().distinct().forEach(s -> updateEquivalenceClasses(s)); } @@ -564,7 +562,7 @@ public void dimensionsAdded(List> addedDimensions) { Collections.sort(insertedTracesIndexes); final List> keys = new ArrayList<>(stateEquivalenceClasses.keySet()); for (List key : keys) { - List> states = stateEquivalenceClasses.remove(key); + List> states = stateEquivalenceClasses.remove(key); for (Integer i : insertedTracesIndexes) { key.add(i, -1); } @@ -572,12 +570,22 @@ public void dimensionsAdded(List> addedDimensions) { } } + @Override + public List> getSubSteps(Step step) { + if (step instanceof BigStep) { + return new ArrayList<>(((BigStep) step).getSubSteps()); + } else { + return Collections.emptyList(); + } + } + @Override public List> getSteps(int firstStateIndex, int lastStateIndex) { final Step rootStep = trace.getRootStep(); - if (rootStep instanceof BigStep) { - final List> steps = new ArrayList<>(((BigStep) rootStep).getSubSteps()); - steps.removeIf(s -> getStateIndex(s.getEndingState()) < firstStateIndex || getStateIndex(s.getStartingState()) > lastStateIndex); + if (rootStep instanceof BigStep) { + final List> steps = new ArrayList<>(((BigStep) rootStep).getSubSteps()); + steps.removeIf(s -> s.getEndingState() != null && getStateIndex(s.getEndingState()) < firstStateIndex + || getStateIndex(s.getStartingState()) > lastStateIndex); return steps; } return Collections.singletonList(rootStep); @@ -590,10 +598,8 @@ public List> getDimensions() { } return cachedDimensions; } - + private List> getIgnoredDimensions() { - return getDimensions().stream() - .filter(d -> isDimensionIgnored(d)) - .collect(Collectors.toList()); + return getDimensions().stream().filter(d -> isDimensionIgnored(d)).collect(Collectors.toList()); } } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF index 818f324f8..096d819e8 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui, org.gemoc.executionframework.ui, org.gemoc.xdsmlframework.api;bundle-version="0.1.0", org.eclipse.emf.ecore.xmi, - org.eclipse.emf.compare + org.eclipse.emf.compare, + fr.inria.diverse.trace.commons.model;bundle-version="2.3.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java index 73da7a8f7..c29fc695f 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java @@ -33,6 +33,7 @@ import org.eclipse.emf.ecore.EReference; import org.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; +import fr.inria.diverse.trace.commons.model.trace.Value; import javafx.util.Pair; @SuppressWarnings("restriction") @@ -45,10 +46,10 @@ public class DiffComputer { private IPostProcessor.Descriptor descriptor = null; private boolean compareInitialized = false; - private final List, List>> eqGroup = new ArrayList<>(); - private final List, List>> substGroup = new ArrayList<>(); - private final List> inGroup = new ArrayList<>(); - private final List> delGroup = new ArrayList<>(); + private final List>, List>>> eqGroup = new ArrayList<>(); + private final List>, List>>> substGroup = new ArrayList<>(); + private final List>> inGroup = new ArrayList<>(); + private final List>> delGroup = new ArrayList<>(); private final List diffs = new ArrayList<>(); @@ -157,7 +158,7 @@ public boolean compareEObjects(EObject e1, EObject e2) { return comparison.getDifferences().isEmpty(); } - private boolean compareTraces(final List trace1, final List trace2) { + private boolean compareTraces(final List> trace1, final List> trace2) { final int length1 = trace1.size(); final int length2 = trace2.size(); @@ -173,7 +174,7 @@ private boolean compareTraces(final List trace1, final List tr return result; } - private int computeDistanceBetweenTraces(final List trace1, final List trace2) { + private int computeDistanceBetweenTraces(final List> trace1, final List> trace2) { final int[][] m = new int[trace1.size() + 1][trace2.size() + 1]; for (int i = 0; i < m.length; i++) { @@ -209,7 +210,7 @@ private int computeDistanceBetweenTraces(final List trace1, final List< return result; } - private Map matchTraces(final List> traces1, List> traces2) { + private Map matchTraces(final List>> traces1, List>> traces2) { final Map> pairs = new HashMap<>(); for (int i = 0; i < traces1.size(); i++) { for (int j = 0; j < traces2.size(); j++) { @@ -237,9 +238,9 @@ private Map matchTraces(final List> traces1, List< return result; } - private EClass getTraceEClass(final List trace) { + private EClass getTraceEClass(final List> trace) { EClass result = null; - for (EObject e : trace) { + for (Value e : trace) { if (e != null) { result = e.eClass(); break; @@ -252,31 +253,31 @@ public List getDiffs() { return diffs; } - public List, List>> getEqGroup() { + public List>, List>>> getEqGroup() { return eqGroup; } - public List, List>> getSubstGroup() { + public List>, List>>> getSubstGroup() { return substGroup; } - public List> getInGroup() { + public List>> getInGroup() { return inGroup; } - public List> getDelGroup() { + public List>> getDelGroup() { return delGroup; } - public void loadTraces(final List> traces1, final List> traces2) { - final Map>> traceGroups1 = new HashMap<>(); - final Map>> traceGroups2 = new HashMap<>(); + public void loadTraces(final List>> traces1, final List>> traces2) { + final Map>>> traceGroups1 = new HashMap<>(); + final Map>>> traceGroups2 = new HashMap<>(); diffs.clear(); - for (List trace : traces1) { + for (List> trace : traces1) { EClass eClass = getTraceEClass(trace); if (eClass != null) { - List> l = traceGroups1.get(eClass); + List>> l = traceGroups1.get(eClass); if (l == null) { l = new ArrayList<>(); traceGroups1.put(eClass, l); @@ -285,10 +286,10 @@ public void loadTraces(final List> traces1, final List trace : traces2) { + for (List> trace : traces2) { final EClass eClass = getTraceEClass(trace); if (eClass != null) { - List> l = traceGroups2.get(eClass); + List>> l = traceGroups2.get(eClass); if (l == null) { l = new ArrayList<>(); traceGroups2.put(eClass, l); @@ -307,17 +308,17 @@ public void loadTraces(final List> traces1, final List classesSorted = classes.stream().sorted((e1, e2) -> e2.getName().compareTo(e1.getName())) .collect(Collectors.toList()); - final Map, List>, Integer> substGroupAccumulator = new HashMap<>(); + final Map>, List>>, Integer> substGroupAccumulator = new HashMap<>(); for (EClass eClass : classesSorted) { if (traceGroups1.containsKey(eClass) && traceGroups2.containsKey(eClass)) { - List> traceGroup1 = traceGroups1.get(eClass); - List> traceGroup2 = traceGroups2.get(eClass); + List>> traceGroup1 = traceGroups1.get(eClass); + List>> traceGroup2 = traceGroups2.get(eClass); int i = 0; int j = 0; while (i < traceGroup1.size() && j < traceGroup2.size()) { - List trace1 = traceGroup1.get(i); - List trace2 = traceGroup2.get(j); + List> trace1 = traceGroup1.get(i); + List> trace2 = traceGroup2.get(j); if (compareTraces(trace1, trace2)) { traceGroup1.remove(i); traceGroup2.remove(j); @@ -334,8 +335,8 @@ public void loadTraces(final List> traces1, final List pair : matchTraces(traceGroup1, traceGroup2).entrySet()) { - final List t1 = traceGroup1.get(pair.getKey()[0]); - final List t2 = traceGroup2.get(pair.getKey()[1]); + final List> t1 = traceGroup1.get(pair.getKey()[0]); + final List> t2 = traceGroup2.get(pair.getKey()[1]); substGroupAccumulator.put(new Pair<>(t1, t2), pair.getValue()); } } @@ -352,7 +353,7 @@ public void loadTraces(final List> traces1, final List, List>, Integer> e : substGroupAccumulator.entrySet().stream() + for (Map.Entry>, List>>, Integer> e : substGroupAccumulator.entrySet().stream() .sorted((e1, e2) -> { return e1.getValue() - e2.getValue(); }).collect(Collectors.toList())) { @@ -366,12 +367,12 @@ public void loadTraces(final List> traces1, final List> stateTrace1 = new ArrayList<>(); - List> stateTrace2 = new ArrayList<>(); + List>> stateTrace1 = new ArrayList<>(); + List>> stateTrace2 = new ArrayList<>(); if (!substGroup.isEmpty()) { - List> valuesTrace1 = new ArrayList<>(); - List> valuesTrace2 = new ArrayList<>(); + List>> valuesTrace1 = new ArrayList<>(); + List>> valuesTrace2 = new ArrayList<>(); substGroup.forEach(p -> { valuesTrace1.add(p.getKey()); @@ -379,25 +380,25 @@ public void loadTraces(final List> traces1, final List stateValues = new ArrayList<>(); - for (List l : valuesTrace1) { + final List> stateValues = new ArrayList<>(); + for (List> l : valuesTrace1) { stateValues.add(l.get(i)); } stateTrace1.add(stateValues); } for (int i = 0; i < valuesTrace2.get(0).size(); i++) { - final List stateValues = new ArrayList<>(); - for (List l : valuesTrace2) { + final List> stateValues = new ArrayList<>(); + for (List> l : valuesTrace2) { stateValues.add(l.get(i)); } stateTrace2.add(stateValues); } - final List> allStates = new ArrayList<>(stateTrace1); + final List>> allStates = new ArrayList<>(stateTrace1); allStates.addAll(stateTrace2); - List>> equivalenceClasses = computeEquivalenceClasses(allStates); + List>>> equivalenceClasses = computeEquivalenceClasses(allStates); diffs.addAll(computeDiff(stateTrace1, stateTrace2, equivalenceClasses)); } else { eqGroup.stream().findAny().ifPresent(p -> { @@ -408,19 +409,19 @@ public void loadTraces(final List> traces1, final List>> computeEquivalenceClasses(final List> states) { - final List, List>> stateToValueIndexes = new ArrayList<>(); - final List observedValues = new ArrayList<>(); + private List>>> computeEquivalenceClasses(final List>> states) { + final List>, List>> stateToValueIndexes = new ArrayList<>(); + final List> observedValues = new ArrayList<>(); - for (List state : states) { + for (List> state : states) { final List valueIndexes = new ArrayList<>(); stateToValueIndexes.add(new Pair<>(state, valueIndexes)); for (int i = 0; i < state.size(); i++) { - final EObject value = state.get(i); + final Value value = state.get(i); int idx = -1; for (int j = 0; j < observedValues.size(); j++) { - final EObject v1 = observedValues.get(j); - final EObject v2 = value; + final Value v1 = observedValues.get(j); + final Value v2 = value; if (compareEObjects(v1, v2)) { idx = j; break; @@ -437,13 +438,13 @@ private List>> computeEquivalenceClasses(final List> distinctClasses = stateToValueIndexes.stream() .map(p -> p.getValue()).distinct().collect(Collectors.toList()); - final Map>> result = new HashMap<>(); + final Map>>> result = new HashMap<>(); stateToValueIndexes.forEach(p -> { - final List state = p.getKey(); + final List> state = p.getKey(); final List indexes = p.getValue(); int v = distinctClasses.indexOf(indexes); - List> equivalentStates = result.get(v); + List>> equivalentStates = result.get(v); if (equivalentStates == null) { equivalentStates = new ArrayList<>(); result.put(v, equivalentStates); @@ -462,12 +463,12 @@ private List>> computeEquivalenceClasses(final List> states1, final List> states2, - final Collection>> classes) { - final Map, List>> stateToEquivalentStates = new HashMap<>(); + private int[][] alignTraces(final List>> states1, final List>> states2, + final Collection>>> classes) { + final Map>, List>>> stateToEquivalentStates = new HashMap<>(); classes.forEach(l -> { l.forEach(s -> { - final List> equivalentStates = new ArrayList<>(l); + final List>> equivalentStates = new ArrayList<>(l); equivalentStates.remove(s); stateToEquivalentStates.put(s, equivalentStates); }); @@ -485,9 +486,9 @@ private int[][] alignTraces(final List> states1, final List s1 = states1.get(i); - final List s2 = states2.get(j); - final List> equivalentStates = stateToEquivalentStates.get(s1); + final List> s1 = states1.get(i); + final List> s2 = states2.get(j); + final List>> equivalentStates = stateToEquivalentStates.get(s1); if (equivalentStates.contains(s2)) { cost[i][j] = 0; } else { @@ -508,8 +509,8 @@ private int[][] alignTraces(final List> states1, final List computeDiff(final List> states1, final List> states2, - final Collection>> classes) { + public List computeDiff(final List>> states1, final List>> states2, + final Collection>>> classes) { final int[][] comparisonMatrix = alignTraces(states1, states2, classes); final int[][] highlightedCells = new int[comparisonMatrix.length][comparisonMatrix[0].length]; int i = comparisonMatrix.length - 1; diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java index 808501a3e..8edfa5c18 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java @@ -5,14 +5,16 @@ import java.util.List; import java.util.Map; -import org.eclipse.emf.ecore.EObject; import org.gemoc.sequential_addons.diffviewer.logic.Diff; import org.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; import org.gemoc.sequential_addons.diffviewer.logic.DiffComputer; +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StateWrapper; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.ValueWrapper; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.geometry.Insets; @@ -83,20 +85,19 @@ public class TimelineDiffViewerRenderer extends Pane { final Map>> lineToSegments = new HashMap<>(); final Map> segmentToDescription = new HashMap<>(); + final Map>, String> dimensionDescriptions = new HashMap<>(); - private ITraceExtractor extractor1 = null; - private ITraceExtractor extractor2 = null; + private ITraceExtractor, State, TracedObject, Dimension, Value> extractor1 = null; + private ITraceExtractor, State, TracedObject, Dimension, Value> extractor2 = null; - private final List> valueTraces1 = new ArrayList<>(); - private final List> valueTraces2 = new ArrayList<>(); + private final List>> values1 = new ArrayList<>(); + private final List>> values2 = new ArrayList<>(); - private final List wrappers1 = new ArrayList<>(); - private final List wrappers2 = new ArrayList<>(); + private final List> states1 = new ArrayList<>(); + private final List> states2 = new ArrayList<>(); private DiffComputer diffComputer; - private final Map valueToWrapper = new HashMap<>(); - public TimelineDiffViewerRenderer() { nbStates = new SimpleIntegerProperty(); @@ -186,19 +187,19 @@ private String computeStateLabel(int stateNumber) { } } - private void addState(StateWrapper wrapper, HBox line, Color color) { + private void addState(State state, HBox line, Color color, int stateIndex, String stateDescription) { final Rectangle rectangle = new Rectangle(WIDTH, WIDTH, color); rectangle.setArcHeight(WIDTH); rectangle.setArcWidth(WIDTH); - rectangle.setUserData(wrapper.state); - Label text = new Label(computeStateLabel(wrapper.stateIndex)); + rectangle.setUserData(state); + Label text = new Label(computeStateLabel(stateIndex)); text.setTextOverrun(OverrunStyle.ELLIPSIS); text.setAlignment(Pos.CENTER); text.setMouseTransparent(true); text.setTextFill(Color.WHITE); text.setFont(STATE_FONT); text.setMaxWidth(WIDTH); - final Tooltip tooltip = new Tooltip(wrapper.description); + final Tooltip tooltip = new Tooltip(stateDescription); Tooltip.install(rectangle, tooltip); StackPane layout = new StackPane(); StackPane.setMargin(rectangle, MARGIN_INSETS); @@ -212,7 +213,7 @@ private void addBlankState(HBox line) { line.getChildren().add(rectangle); } - private void addValue(EObject value, HBox line, String description, boolean newValue, DiffKind diffKind) { + private void addValue(Value value, HBox line, String description, boolean newValue, DiffKind diffKind) { final List> segments = lineToSegments.get(line); List segment; boolean addDescription = false; @@ -246,7 +247,7 @@ private void addValue(EObject value, HBox line, String description, boolean newV segment.add(diffKind); } - private void addValue(EObject value, HBox line, String description, boolean newValue) { + private void addValue(Value value, HBox line, String description, boolean newValue) { addValue(value, line, description, newValue, DiffKind.EQ); } @@ -276,59 +277,60 @@ private void addBlankValue(HBox line) { lineToSegments.get(line).add(null); } - private List normalizeValueTrace(List trace, int start, int end) { - final List result = new ArrayList<>(); - for (ValueWrapper w : trace) { - while (result.size() < w.firstStateIndex - start) { + private List> normalizeValueTrace(List> trace, int start, int end, ITraceExtractor, State, TracedObject, Dimension, Value> extractor) { + final List> result = new ArrayList<>(); + for (Value w : trace) { + final int firstStateIndex = extractor.getValueFirstStateIndex(w); + final int lastStateIndex = extractor.getValueLastStateIndex(w); + while (result.size() < firstStateIndex - start) { result.add(null); } - for (int i = Math.max(w.firstStateIndex, start); i <= Math.min(w.lastStateIndex, end); i++) { - result.add(w.value); - valueToWrapper.putIfAbsent(w.value, w); + for (int i = Math.max(firstStateIndex, start); i <= Math.min(lastStateIndex, end); i++) { + result.add(w); } } return result; } - public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor extractor2) { + public void loadTraces(final ITraceExtractor, State, TracedObject, Dimension, Value> extractor1, + final ITraceExtractor, State, TracedObject, Dimension, Value> extractor2) { loadTraces(extractor1, extractor2, 0, 0, extractor1.getStatesTraceLength() - 1, extractor2.getStatesTraceLength() - 1); } - public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor extractor2, int s1, int s2, int e1, int e2) { + public void loadTraces(final ITraceExtractor, State, TracedObject, Dimension, Value> extractor1, + final ITraceExtractor, State, TracedObject, Dimension, Value> extractor2, int s1, int s2, int e1, int e2) { this.extractor1 = extractor1; this.extractor2 = extractor2; - valueToWrapper.clear(); - valueTraces1.clear(); - valueTraces2.clear(); - wrappers1.clear(); - wrappers2.clear(); - - wrappers1.addAll(extractor1.getStateWrappers(s1, e1)); - final List> valueWrappers1 = new ArrayList<>(); - for (int i = 0; i < extractor1.getNumberOfTraces(); i++) { - final List valueWrappers = extractor1.getValueWrappers(i, s1, e1); - valueWrappers1.add(valueWrappers); - final List valueTrace = normalizeValueTrace(valueWrappers, s1, e1); - while (valueTrace.size() < e1 - s1 + 1) { - valueTrace.add(null); + values1.clear(); + values2.clear(); + states1.clear(); + states2.clear(); + dimensionDescriptions.clear(); + + states1.addAll(extractor1.getStates(s1, e1)); + for (Dimension dimension : this.extractor1.getDimensions()) { + final List> values = extractor1.getValuesForStates(dimension, s1, e1); + final List> normalizedValues = normalizeValueTrace(values, s1, e1, extractor1); + while (normalizedValues.size() < e1 - s1 + 1) { + normalizedValues.add(null); } - valueTraces1.add(valueTrace); + values1.add(normalizedValues); + dimensionDescriptions.put(normalizedValues, extractor1.getDimensionLabel(dimension)); } - wrappers2.addAll(extractor2.getStateWrappers(s2, e2)); - final List> valueWrappers2 = new ArrayList<>(); - for (int i = 0; i < extractor2.getNumberOfTraces(); i++) { - final List valueWrappers = extractor2.getValueWrappers(i, s2, e2); - valueWrappers2.add(valueWrappers); - final List valueTrace = normalizeValueTrace(valueWrappers, s2, e2); - while (valueTrace.size() < e2 - s2 + 1) { - valueTrace.add(null); + states2.addAll(extractor2.getStates(s2, e2)); + for (Dimension dimension : this.extractor2.getDimensions()) { + final List> values = extractor2.getValuesForStates(dimension, s2, e2); + final List> normalizedValues = normalizeValueTrace(values, s2, e2, extractor2); + while (normalizedValues.size() < e2 - s2 + 1) { + normalizedValues.add(null); } - valueTraces2.add(valueTrace); + values2.add(normalizedValues); + dimensionDescriptions.put(normalizedValues, extractor1.getDimensionLabel(dimension)); } diffComputer = new DiffComputer(); - diffComputer.loadTraces(valueTraces1, valueTraces2); + diffComputer.loadTraces(values1, values2); nbStates.set(diffComputer.getDiffs().size()); currentState = 0; scrollBar.setValue(0); @@ -336,11 +338,11 @@ public void loadTraces(final ITraceExtractor extractor1, final ITraceExtractor e refresh(); } - private boolean isNewValue(int idx, List list) { + private boolean isNewValue(int idx, List> list) { return idx == 0 || (idx < list.size() && idx > 0 && list.get(idx - 1) != list.get(idx)); } - private void fillGap(HBox line, List trace, int idx, String description) { + private void fillGap(HBox line, List> trace, int idx, String description) { if (idx > 0 && idx < trace.size()) { if (trace.get(idx - 1) != null || (idx < trace.size() - 1 && trace.get(idx + 1) != null)) { addDelayedValue(line, description); @@ -363,10 +365,10 @@ public void refresh() { lineToSegments.clear(); rootVBox.getChildren().clear(); - final List, List>> eqGroup = diffComputer.getEqGroup(); - final List, List>> substGroup = diffComputer.getSubstGroup(); - final List> inGroup = diffComputer.getInGroup(); - final List> delGroup = diffComputer.getDelGroup(); + final List>, List>>> eqGroup = diffComputer.getEqGroup(); + final List>, List>>> substGroup = diffComputer.getSubstGroup(); + final List>> inGroup = diffComputer.getInGroup(); + final List>> delGroup = diffComputer.getDelGroup(); if (!eqGroup.isEmpty()) { rootVBox.getChildren().add(eqBox); @@ -384,11 +386,11 @@ public void refresh() { rootVBox.getChildren().add(delBox); } - final Map, HBox> traceToLine = new HashMap<>(); + final Map>, HBox> traceToLine = new HashMap<>(); int c = 0; - for (Pair, List> e : eqGroup) { + for (Pair>, List>> e : eqGroup) { final VBox pairBox = new VBox(); final HBox trace1Box = new HBox(); final HBox trace2Box = new HBox(); @@ -396,8 +398,8 @@ public void refresh() { traceToLine.put(e.getValue(), trace2Box); lineToSegments.put(trace1Box, new ArrayList<>()); lineToSegments.put(trace2Box, new ArrayList<>()); - Label l1 = new Label(extractor1.getValueLabel(valueTraces1.indexOf(e.getKey()))); - Label l2 = new Label(extractor2.getValueLabel(valueTraces2.indexOf(e.getValue()))); + Label l1 = new Label(dimensionDescriptions.get(e.getKey())); + Label l2 = new Label(dimensionDescriptions.get(e.getValue())); VBox.setMargin(l1, HALF_MARGIN_INSETS); VBox.setMargin(l2, HALF_MARGIN_INSETS); l1.setFont(VALUE_FONT); @@ -410,7 +412,7 @@ public void refresh() { c++; } - for (Pair, List> e : substGroup) { + for (Pair>, List>> e : substGroup) { final VBox pairBox = new VBox(); final HBox trace1Box = new HBox(); final HBox trace2Box = new HBox(); @@ -418,8 +420,8 @@ public void refresh() { traceToLine.put(e.getValue(), trace2Box); lineToSegments.put(trace1Box, new ArrayList<>()); lineToSegments.put(trace2Box, new ArrayList<>()); - Label l1 = new Label(extractor1.getValueLabel(valueTraces1.indexOf(e.getKey()))); - Label l2 = new Label(extractor2.getValueLabel(valueTraces2.indexOf(e.getValue()))); + Label l1 = new Label(dimensionDescriptions.get(e.getKey())); + Label l2 = new Label(dimensionDescriptions.get(e.getValue())); VBox.setMargin(l1, HALF_MARGIN_INSETS); VBox.setMargin(l2, HALF_MARGIN_INSETS); l1.setFont(VALUE_FONT); @@ -432,12 +434,12 @@ public void refresh() { c++; } - for (List in : inGroup) { + for (List> in : inGroup) { final VBox inVBox = new VBox(); final HBox traceBox = new HBox(); traceToLine.put(in, traceBox); lineToSegments.put(traceBox, new ArrayList<>()); - Label l = new Label(extractor2.getValueLabel(valueTraces2.indexOf(in))); + Label l = new Label(dimensionDescriptions.get(in)); VBox.setMargin(l, HALF_MARGIN_INSETS); l.setFont(VALUE_FONT); inVBox.getChildren().addAll(l, traceBox); @@ -446,12 +448,12 @@ public void refresh() { c++; } - for (List del : delGroup) { + for (List> del : delGroup) { final VBox delVBox = new VBox(); final HBox traceBox = new HBox(); traceToLine.put(del, traceBox); lineToSegments.put(traceBox, new ArrayList<>()); - Label l = new Label(extractor1.getValueLabel(valueTraces1.indexOf(del))); + Label l = new Label(dimensionDescriptions.get(del)); VBox.setMargin(l, HALF_MARGIN_INSETS); l.setFont(VALUE_FONT); delVBox.getChildren().addAll(l, traceBox); @@ -466,50 +468,59 @@ public void refresh() { int i = diff.idx1; int j = diff.idx2; switch (diff.kind) { - case EQ: - addState(wrappers1.get(i), line1, Color.SLATEBLUE); - addState(wrappers2.get(j), line2, Color.SLATEBLUE); - for (Pair, List> e : eqGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + case EQ: { + final State state1 = states1.get(i); + final State state2 = states2.get(j); + addState(state1, line1, Color.SLATEBLUE, extractor1.getStateIndex(state1), extractor1.getStateDescription(state1)); + addState(state2, line2, Color.SLATEBLUE, extractor2.getStateIndex(state2), extractor2.getStateDescription(state2)); + for (Pair>, List>> e : eqGroup) { + final List> t1 = e.getKey(); + final List> t2 = e.getValue(); + final Value v1 = t1.get(i); + final Value v2 = t2.get(j); + String d1 = extractor1.getValueDescription(v1); + String d2 = extractor2.getValueDescription(v2); + addValue(v1, traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(v2, traceToLine.get(t2), d2, isNewValue(j, t2)); } - for (Pair, List> e : substGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); - addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); - addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); + for (Pair>, List>> e : substGroup) { + final List> t1 = e.getKey(); + final List> t2 = e.getValue(); + final Value v1 = t1.get(i); + final Value v2 = t2.get(j); + String d1 = extractor1.getValueDescription(v1); + String d2 = extractor2.getValueDescription(v2); + addValue(v1, traceToLine.get(t1), d1, isNewValue(i, t1)); + addValue(v2, traceToLine.get(t2), d2, isNewValue(j, t2)); } - for (List del : delGroup) { - String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + for (List> del : delGroup) { + String d = extractor1.getValueDescription(del.get(i)); addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); } - for (List in : inGroup) { - String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + for (List> in : inGroup) { + String d = extractor2.getValueDescription(in.get(j)); addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); } break; - case SUBST: - addState(wrappers1.get(i), line1, Color.TOMATO); - addState(wrappers2.get(j), line2, Color.TOMATO); - for (Pair, List> e : eqGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + } + case SUBST: { + final State state1 = states1.get(i); + final State state2 = states2.get(j); + addState(state1, line1, Color.TOMATO, extractor1.getStateIndex(state1), extractor1.getStateDescription(state1)); + addState(state2, line2, Color.TOMATO, extractor2.getStateIndex(state2), extractor2.getStateDescription(state2)); + for (Pair>, List>> e : eqGroup) { + final List> t1 = e.getKey(); + final List> t2 = e.getValue(); + String d1 = extractor1.getValueDescription(t1.get(i)); + String d2 = extractor2.getValueDescription(t2.get(j)); addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); } - for (Pair, List> e : substGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + for (Pair>, List>> e : substGroup) { + final List> t1 = e.getKey(); + final List> t2 = e.getValue(); + String d1 = extractor1.getValueDescription(t1.get(i)); + String d2 = extractor2.getValueDescription(t2.get(j)); if (diffComputer.compareEObjects(t1.get(i), t2.get(j))) { addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); @@ -518,72 +529,77 @@ public void refresh() { addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2), DiffKind.SUBST); } } - for (List del : delGroup) { - String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + for (List> del : delGroup) { + String d = extractor1.getValueDescription(del.get(i)); addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); } - for (List in : inGroup) { - String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + for (List> in : inGroup) { + String d = extractor2.getValueDescription(in.get(j)); addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); } break; - case DEL: - addState(wrappers1.get(i), line1, Color.BROWN); + } + case DEL: { + final State state1 = states1.get(i); + addState(state1, line1, Color.BROWN, extractor1.getStateIndex(state1), extractor1.getStateDescription(state1)); addBlankState(line2); - for (Pair, List> e : eqGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + for (Pair>, List>> e : eqGroup) { + final List> t1 = e.getKey(); + final List> t2 = e.getValue(); + String d1 = extractor1.getValueDescription(t1.get(i)); + String d2 = extractor2.getValueDescription(t2.get(j)); addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); fillGap(traceToLine.get(t2), t2, j, d2); } - for (Pair, List> e : substGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + for (Pair>, List>> e : substGroup) { + final List> t1 = e.getKey(); + final List> t2 = e.getValue(); + String d1 = extractor1.getValueDescription(t1.get(i)); + String d2 = extractor2.getValueDescription(t2.get(j)); addValue(t1.get(i), traceToLine.get(t1), d1, isNewValue(i, t1)); fillGap(traceToLine.get(t2), t2, j, d2); } - for (List del : delGroup) { - String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + for (List> del : delGroup) { + String d = extractor1.getValueDescription(del.get(i)); addValue(del.get(i), traceToLine.get(del), d, isNewValue(i, del)); } - for (List in : inGroup) { - String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + for (List> in : inGroup) { + String d = extractor2.getValueDescription(in.get(j)); fillGap(traceToLine.get(in), in, j, d); } break; - case IN: + } + case IN: { + final State state2 = states2.get(i); addBlankState(line1); - addState(wrappers2.get(j), line2, Color.BROWN); - for (Pair, List> e : eqGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + addState(state2, line2, Color.BROWN, extractor2.getStateIndex(state2), extractor2.getStateDescription(state2)); + for (Pair>, List>> e : eqGroup) { + final List> t1 = e.getKey(); + final List> t2 = e.getValue(); + String d1 = extractor1.getValueDescription(t1.get(i)); + String d2 = extractor2.getValueDescription(t2.get(j)); fillGap(traceToLine.get(t1), t1, i, d1); addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); } - for (Pair, List> e : substGroup) { - final List t1 = e.getKey(); - final List t2 = e.getValue(); - String d1 = extractor1.getValueDescription(valueTraces1.indexOf(t1), i); - String d2 = extractor2.getValueDescription(valueTraces2.indexOf(t2), j); + for (Pair>, List>> e : substGroup) { + final List> t1 = e.getKey(); + final List> t2 = e.getValue(); + String d1 = extractor1.getValueDescription(t1.get(i)); + String d2 = extractor2.getValueDescription(t2.get(j)); fillGap(traceToLine.get(t1), t1, i, d1); addValue(t2.get(j), traceToLine.get(t2), d2, isNewValue(j, t2)); } - for (List del : delGroup) { - String d = extractor1.getValueDescription(valueTraces1.indexOf(del), i); + for (List> del : delGroup) { + String d = extractor1.getValueDescription(del.get(i)); fillGap(traceToLine.get(del), del, i, d); } - for (List in : inGroup) { - String d = extractor2.getValueDescription(valueTraces2.indexOf(in), j); + for (List> in : inGroup) { + String d = extractor2.getValueDescription(in.get(j)); addValue(in.get(j), traceToLine.get(in), d, isNewValue(j, in)); } break; } + } } processSegments(); } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index 49d04a618..9e328c663 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.EObject; -import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; @@ -81,37 +80,37 @@ public class MultidimensionalTimelineRenderer extends Pane implements ITraceViewListener { - private ITraceExplorer, State, TracedObject, Dimension, Value> traceExplorer; - private ITraceExtractor, State, TracedObject, Dimension, Value> traceExtractor; + private ITraceExplorer, State, TracedObject, Dimension, Value> traceExplorer; + private ITraceExtractor, State, TracedObject, Dimension, Value> traceExtractor; - final private IntegerProperty currentState; - final private IntegerProperty currentStep; + private final IntegerProperty currentState; + private final IntegerProperty currentStep; - final private ScrollPane bodyScrollPane; - final private VBox headerPane; - final private Pane bodyPane; - final private VBox valuesLines; + private final ScrollPane bodyScrollPane; + private final VBox headerPane; + private final Pane bodyPane; + private final VBox valuesLines; - final private DoubleProperty valueTitleWidth; - final private DoubleProperty statesPaneHeight; - final private BooleanProperty displayGrid; - final private IntegerProperty nbDisplayableStates; - final private IntegerProperty visibleStatesRange; - final private IntegerProperty nbStates; + private final DoubleProperty valueTitleWidth; + private final DoubleProperty statesPaneHeight; + private final BooleanProperty displayGrid; + private final IntegerProperty nbDisplayableStates; + private final IntegerProperty visibleStatesRange; + private final IntegerProperty nbStates; private BooleanBinding displayGridBinding; - final private Path diagonalHatching = new Path(); + private final Path diagonalHatching = new Path(); - final private Font statesFont = Font.font("Arial", FontWeight.BOLD, 12); - final private Font valuesFont = Font.font("Arial", FontWeight.BOLD, 11); - final private Font stateNumbersFont = Font.font("Arial", FontWeight.BOLD, 9); + private final Font statesFont = Font.font("Arial", FontWeight.BOLD, 12); + private final Font valuesFont = Font.font("Arial", FontWeight.BOLD, 11); + private final Font stateNumbersFont = Font.font("Arial", FontWeight.BOLD, 9); - final private Image stepValueGraphic; - final private Image backValueGraphic; + private final Image stepValueGraphic; + private final Image backValueGraphic; private int lastClickedState = -1; - - final private Consumer jumpConsumer = (i) -> traceExplorer.jump(traceExtractor.getState(i)); - final private Supplier lastClickedStateSupplier = () -> lastClickedState; + + private final Consumer jumpConsumer = (i) -> traceExplorer.jump(traceExtractor.getState(i)); + private final Supplier lastClickedStateSupplier = () -> lastClickedState; private boolean stateColoration; @@ -245,7 +244,7 @@ public void onChanged(javafx.collections.ListChangeListener.Change state, boolean jump) { + private void showState(State state, boolean jump) { int toShow = Math.min(nbStates.intValue() - 1, Math.max(0, traceExtractor.getStateIndex(state))); int effectiveToShow = Math.min(visibleStatesRange.intValue() - 1, Math.max(0, toShow - nbDisplayableStates.intValue() / 2)); @@ -417,16 +416,15 @@ private String computeStateLabel(int stateNumber) { } } - private void fillStateLine(HBox line, List> states, int selectedState) { + private void fillStateLine(HBox line, List> states, int selectedState) { final Color currentColor = Color.CORAL; final Color otherColor = Color.SLATEBLUE; final int height = DIAMETER; final int width = DIAMETER; final int currentStateIndex = Math.max(0, currentState.intValue()); final int diff = states.isEmpty() ? 0 : currentStateIndex - traceExtractor.getStateIndex(states.get(0)); - - final List> colorGroups = stateColoration ? computeColorGroups(states) - : Collections.emptyList(); + + final List> colorGroups = stateColoration ? computeColorGroups(states) : Collections.emptyList(); final int nbColors = colorGroups.size(); final List colorPalette = new ArrayList<>(); if (nbColors > 0) { @@ -452,7 +450,7 @@ private void fillStateLine(HBox line, List> states, int selectedState line.setTranslateX(-(UNIT * diff)); } - for (State state : states) { + for (State state : states) { final int stateIndex = traceExtractor.getStateIndex(state); final Rectangle rectangle; if (selectedState == stateIndex) { @@ -531,8 +529,7 @@ private void fillValueLine(HBox line, Dimension dimension, int start, int end for (Value value : values) { final int firstStateIndex = traceExtractor.getValueFirstStateIndex(value); final int lastStateIndex = traceExtractor.getValueLastStateIndex(value); - - + if (firstStateIndex > stateIndex) { // When the first visible value starts after the first state, // we fill the space with a transparent rectangle. @@ -570,15 +567,16 @@ private void fillValueLine(HBox line, Dimension dimension, int start, int end } } - private NumberExpression createSteps(Step stepWrapper, int depth, int currentStateIndex, - int selectedStateIndex, List accumulator, Object[] stepTargets) { + private NumberExpression createSteps(Step step, int depth, int currentStateIndex, int selectedStateIndex, + List accumulator, Object[] stepTargets) { - final int stepStartingIndex = traceExtractor.getStateIndex(stepWrapper.getStartingState()); - - final boolean endedStep = stepWrapper.getEndingState() != null; + final int stepStartingIndex = traceExtractor.getStateIndex(step.getStartingState()); + + final boolean endedStep = step.getEndingState() != null; final int startingIndex = stepStartingIndex - currentStateIndex; - final int endingIndex = (endedStep ? traceExtractor.getStateIndex(stepWrapper.getEndingState()) : nbStates.intValue()) - currentStateIndex; + final int endingIndex = (endedStep ? traceExtractor.getStateIndex(step.getEndingState()) + : nbStates.intValue()) - currentStateIndex; final Path path = new Path(); path.setStrokeWidth(2); @@ -598,8 +596,7 @@ private NumberExpression createSteps(Step stepWrapper, int depth, int current accumulator.add(path); - final List> subSteps = stepWrapper instanceof BigStep ? ((BigStep) stepWrapper).getSubSteps() : - Collections.emptyList(); + final List> subSteps = traceExtractor.getSubSteps(step); NumberExpression yOffset = new SimpleDoubleProperty(0); if (subSteps != null && !subSteps.isEmpty()) { for (Step subStep : subSteps) { @@ -612,15 +609,15 @@ private NumberExpression createSteps(Step stepWrapper, int depth, int current lineTo.yProperty().bind(yOffset.add(DIAMETER / 2 + V_MARGIN)); - if (stepTargets[CURRENT_FORWARD_STEP] == stepWrapper) { + if (stepTargets[CURRENT_FORWARD_STEP] == step) { path.setStroke(Color.DARKORANGE); - } else if (stepTargets[CURRENT_BACKWARD_STEP] == stepWrapper) { + } else if (stepTargets[CURRENT_BACKWARD_STEP] == step) { path.setStroke(Color.DARKGREEN); - } else if (stepTargets[CURRENT_BIGSTEP] == stepWrapper) { + } else if (stepTargets[CURRENT_BIGSTEP] == step) { path.setStroke(Color.DARKRED); } else { path.setStroke(Color.DARKBLUE); - if (!traceExplorer.getCallStack().contains(stepWrapper) && (stepStartingIndex > selectedStateIndex + if (!traceExplorer.getCallStack().contains(step) && (stepStartingIndex > selectedStateIndex || (stepStartingIndex == selectedStateIndex && endedStep))) { path.getStrokeDashArray().addAll(5., 5.); path.setStrokeLineCap(StrokeLineCap.ROUND); @@ -662,7 +659,8 @@ public void refresh() { isInReplayMode.set(traceExplorer.isInReplayMode()); final int currentStateStartIndex = Math.max(0, currentState.intValue()); - final int currentStateEndIndex = Math.min(currentStateStartIndex + nbDisplayableStates.intValue(), traceExtractor.getStatesTraceLength()); + final int currentStateEndIndex = Math.min(currentStateStartIndex + nbDisplayableStates.intValue(), + traceExtractor.getStatesTraceLength()); final int selectedStateIndex = traceExtractor.getStateIndex(traceExplorer.getCurrentState()); @@ -675,8 +673,7 @@ protected boolean computeValue() { { final HBox hBox = createStateTraceLine(); - fillStateLine(hBox, - traceExtractor.getStates(currentStateStartIndex - 1, currentStateEndIndex + 1), + fillStateLine(hBox, traceExtractor.getStates(currentStateStartIndex - 1, currentStateEndIndex + 1), selectedStateIndex); } @@ -711,9 +708,9 @@ protected boolean computeValue() { stepTargets[CURRENT_BIGSTEP] = tmp; } - for (Step stepWrapper : rootSteps) { - if (stepWrapper.getStartingState() != stepWrapper.getEndingState()) { - createSteps(stepWrapper, 0, currentStateStartIndex, selectedStateIndex, steps, stepTargets); + for (Step step : rootSteps) { + if (step.getStartingState() != step.getEndingState()) { + createSteps(step, 0, currentStateStartIndex, selectedStateIndex, steps, stepTargets); } } @@ -771,7 +768,8 @@ public Consumer getJumpConsumer() { return jumpConsumer; } - public void setTraceExplorer(ITraceExplorer, State, TracedObject, Dimension, Value> traceExplorer) { + public void setTraceExplorer( + ITraceExplorer, State, TracedObject, Dimension, Value> traceExplorer) { if (this.traceExplorer != null) { this.traceExplorer.removeListener(this); } @@ -782,13 +780,15 @@ public void setTraceExplorer(ITraceExplorer, State, TracedObject update(); } - public void setTraceExtractor(ITraceExtractor, State, TracedObject, Dimension, Value> traceExtractor) { + public void setTraceExtractor( + ITraceExtractor, State, TracedObject, Dimension, Value> traceExtractor) { this.traceExtractor = traceExtractor; } @Override public void update() { - // TODO divide update between trace explorer listening (for the current state) + // TODO divide update between trace explorer listening (for the current + // state) // and trace model listening (for the view of the trace) ? if (traceExplorer != null) { nbStates.set(traceExtractor.getStatesTraceLength()); @@ -800,7 +800,7 @@ public void update() { } refresh(); } - + public void dimensionsAdded(List> dimensions) { // TODO Auto-generated method stub } @@ -813,23 +813,12 @@ public Supplier getLastClickedStateSupplier() { return lastClickedStateSupplier; } - private List> computeColorGroups(List> states) { - return traceExtractor.computeStateEquivalenceClasses().stream() - .sorted((l1, l2) -> { - final int min1 = l1.stream() - .map(e -> traceExtractor.getStateIndex(e)) - .min((i1, i2) -> i1 - i2) - .get(); - final int min2 = l2.stream() - .map(e -> traceExtractor.getStateIndex(e)) - .min((i1, i2) -> i1 - i2) - .get(); - return min1 - min2; - }) - .map(l -> l.stream() - .filter(s -> states.contains(s)) - .map(e -> traceExtractor.getStateIndex(e)) - .collect(Collectors.toList())) - .collect(Collectors.toList()); + private List> computeColorGroups(List> states) { + return traceExtractor.computeStateEquivalenceClasses().stream().sorted((l1, l2) -> { + final int min1 = l1.stream().map(e -> traceExtractor.getStateIndex(e)).min((i1, i2) -> i1 - i2).get(); + final int min2 = l2.stream().map(e -> traceExtractor.getStateIndex(e)).min((i1, i2) -> i1 - i2).get(); + return min1 - min2; + }).map(l -> l.stream().filter(s -> states.contains(s)).map(e -> traceExtractor.getStateIndex(e)) + .collect(Collectors.toList())).collect(Collectors.toList()); } } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java index 184baadbf..a5183d16b 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java @@ -7,33 +7,33 @@ import java.util.Map; import java.util.Map.Entry; import java.util.function.BiConsumer; -import java.util.stream.Collectors; import org.eclipse.emf.ecore.EObject; +import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.commons.model.trace.Value; import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StateWrapper; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor.StepWrapper; import fr.inria.diverse.trace.gemoc.api.ITraceListener; import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; public class StateGraph extends DirectedGraphimplements ITraceViewListener, ITraceListener { - private ITraceExtractor traceExtractor; + private ITraceExplorer, State, TracedObject, Dimension, Value> traceExplorer; + private ITraceExtractor, State, TracedObject, Dimension, Value> traceExtractor; - private ITraceExplorer traceExplorer; + private final Map, StateVertex> stateToNode = new HashMap<>(); - private final Map stateToNode = new HashMap<>(); + private final Map, State> stateToEquivalentState = new HashMap<>(); - private final Map stateToEquivalentState = new HashMap<>(); - - private final List equivalentStates = new ArrayList<>(); + private final List> equivalentStates = new ArrayList<>(); private BiConsumer renderCommand = null; - public void setTraceExtractor(ITraceExtractor traceExtractor) { + public void setTraceExtractor(ITraceExtractor, State, TracedObject, Dimension, Value> traceExtractor) { if (this.traceExtractor != null) { this.traceExtractor.removeListener(this); } @@ -43,7 +43,7 @@ public void setTraceExtractor(ITraceExtractor traceExtractor) { } } - public void setTraceExplorer(ITraceExplorer traceExplorer) { + public void setTraceExplorer(ITraceExplorer, State, TracedObject, Dimension, Value> traceExplorer) { if (this.traceExplorer != null) { this.traceExplorer.removeListener(this); } @@ -62,8 +62,8 @@ public void setUpdateCommand(BiConsumer command) { private void updateGraph() { // Finding out whether the list of ignored values has changed final List newIgnoredValueTraces = new ArrayList<>(); - for (int i = 0; i < traceExtractor.getNumberOfDimensions(); i++) { - newIgnoredValueTraces.add(traceExtractor.isDimensionIgnored(i)); + for (Dimension dimension : traceExtractor.getDimensions()) { + newIgnoredValueTraces.add(traceExtractor.isDimensionIgnored(dimension)); } // If it did we have to recompute the graph if (!newIgnoredValueTraces.equals(ignoredValueTraces)) { @@ -77,10 +77,9 @@ private void updateGraph() { private void updateCurrentState() { StateVertex currentNode = null; if (traceExplorer != null) { - final StateWrapper currentStateWrapper = traceExtractor - .getStateWrapper(traceExplorer.getCurrentStateIndex()); - if (currentStateWrapper != null) { - final EObject equivalentState = stateToEquivalentState.get(currentStateWrapper.state); + final State currentState = traceExplorer.getCurrentState(); + if (currentState != null) { + final EObject equivalentState = stateToEquivalentState.get(currentState); currentNode = stateToNode.get(equivalentState); } } @@ -91,10 +90,10 @@ private void updateCurrentState() { public void update() { } - private void updateEquivalentStates(Collection> equivalenceClasses) { + private void updateEquivalentStates(Collection>> equivalenceClasses) { equivalenceClasses.forEach(l -> { - EObject equivalentState = null; - for (EObject state : l) { + State equivalentState = null; + for (State state : l) { if (equivalentStates.contains(state)) { equivalentState = state; break; @@ -121,7 +120,7 @@ private void updateEquivalentStates(Collection> equivalenceClasses }); } stateToEquivalentState.put(equivalentState, equivalentState); - for (EObject otherState : l) { + for (State otherState : l) { stateToEquivalentState.put(otherState, equivalentState); } }); @@ -129,26 +128,25 @@ private void updateEquivalentStates(Collection> equivalenceClasses private void computeStateSpace() { stateToEquivalentState.clear(); - List> equivalenceClasses = traceExtractor.computeStateEquivalenceClasses(); + List>> equivalenceClasses = traceExtractor.computeStateEquivalenceClasses(); updateEquivalentStates(equivalenceClasses); final int n = traceExtractor.getStatesTraceLength(); - final List stateWrappers = traceExtractor.getStateWrappers(0, n); - final List stepWrappers = traceExtractor.getStepWrappers(0, n); + final List> steps = traceExtractor.getSteps(0, n); final List> addedEdges = new ArrayList<>(); - while (!stepWrappers.isEmpty()) { - final StepWrapper stepWrapper = stepWrappers.remove(0); - if (stepWrapper.endingIndex != -1 && stepWrapper.subSteps.isEmpty()) { - final StateWrapper startingStateWrapper = stateWrappers.get(stepWrapper.startingIndex); - final StateWrapper endingStateWrapper = stateWrappers.get(stepWrapper.endingIndex); - final Edge addedEdge = addEdge(startingStateWrapper, endingStateWrapper, stepWrapper.step); + while (!steps.isEmpty()) { + final Step step = steps.remove(0); + final List> subSteps = traceExtractor.getSubSteps(step); + if (step.getEndingState() != null && subSteps.isEmpty()) { + final State startingState = step.getStartingState(); + final State endingState = step.getEndingState(); + final Edge addedEdge = addEdge(startingState, endingState, step); if (addedEdge != null) { addedEdges.add(addedEdge); } } - stepWrappers.addAll(0, stepWrapper.subSteps.stream().map(s -> traceExtractor.getStepWrapper(s)) - .collect(Collectors.toList())); + steps.addAll(0, subSteps); } final List> edgesToRemove = new ArrayList<>(getEdges()); @@ -156,17 +154,15 @@ private void computeStateSpace() { edgesToRemove.forEach(e -> removeEdge(e)); } - public Edge addEdge(StateWrapper startStateWrapper, StateWrapper endStateWrapper, EObject step) { - final EObject startState = startStateWrapper.state; - final EObject endState = endStateWrapper.state; - final EObject equivalentStartState = stateToEquivalentState.get(startState); - final EObject equivalentEndState = stateToEquivalentState.get(endState); + public Edge addEdge(State startState, State endState, Step step) { + final State equivalentStartState = stateToEquivalentState.get(startState); + final State equivalentEndState = stateToEquivalentState.get(endState); if (equivalentEndState == equivalentStartState || equivalentStartState == null || equivalentEndState == null) { return null; } StateVertex startNode = null; StateVertex endNode = null; - for (Entry entry : stateToNode.entrySet()) { + for (Entry, StateVertex> entry : stateToNode.entrySet()) { final EObject entryState = entry.getKey(); if (startNode == null) { if (equivalentStartState == entryState) { @@ -187,22 +183,20 @@ public Edge addEdge(StateWrapper startStateWrapper, StateWrapper en } if (startNode == null) { - startNode = addVertex(new StateVertex(traceExtractor.getStateDescription(startStateWrapper.stateIndex), - startStateWrapper.stateIndex)); + startNode = addVertex(new StateVertex(traceExtractor.getStateDescription(startState), traceExtractor.getStateIndex(startState))); stateToNode.put(equivalentStartState, startNode); } else { - final int startIndex = traceExtractor.getStateWrapper(equivalentStartState).stateIndex; - final String description = traceExtractor.getStateDescription(startIndex); + final int startIndex = traceExtractor.getStateIndex(equivalentStartState); + final String description = traceExtractor.getStateDescription(equivalentStartState); startNode.setTooltip(description); startNode.setIndex(startIndex); } if (endNode == null) { - endNode = addVertex(new StateVertex(traceExtractor.getStateDescription(endStateWrapper.stateIndex), - endStateWrapper.stateIndex)); + endNode = addVertex(new StateVertex(traceExtractor.getStateDescription(endState), traceExtractor.getStateIndex(endState))); stateToNode.put(equivalentEndState, endNode); } else { - final int endIndex = traceExtractor.getStateWrapper(equivalentEndState).stateIndex; - final String description = traceExtractor.getStateDescription(endIndex); + final int endIndex = traceExtractor.getStateIndex(equivalentEndState); + final String description = traceExtractor.getStateDescription(equivalentEndState); endNode.setTooltip(description); endNode.setIndex(endIndex); } @@ -230,35 +224,32 @@ private void render(boolean clear, StateVertex currentVertex) { } @Override - public void statesAdded(List states) { - List> equivalenceClasses = traceExtractor.computeStateEquivalenceClasses(); + public void statesAdded(List> states) { + List>> equivalenceClasses = traceExtractor.computeStateEquivalenceClasses(); updateEquivalentStates(equivalenceClasses); render(false, null); } @Override - public void stepsEnded(List steps) { - for (EObject step : steps) { - final StepWrapper stepWrapper = traceExtractor.getStepWrapper((Step) step); - final StateWrapper startingStateWrapper = traceExtractor.getStateWrapper(stepWrapper.startingIndex); - final StateWrapper endingStateWrapper = traceExtractor.getStateWrapper(stepWrapper.endingIndex); - addEdge(startingStateWrapper, endingStateWrapper, step); + public void stepsEnded(List> steps) { + for (Step step : steps) { + addEdge(step.getStartingState(), step.getEndingState(), step); } render(false, null); } @Override - public void stepsStarted(java.util.List steps) { + public void stepsStarted(List> steps) { // Nothing to do here. }; @Override - public void valuesAdded(List values) { + public void valuesAdded(List> values) { // TODO Auto-generated method stub } @Override - public void dimensionsAdded(List> dimensions) { + public void dimensionsAdded(List> dimensions) { // TODO Auto-generated method stub } } From 3af0e8317fe54727426e468e680514993ba664cb Mon Sep 17 00:00:00 2001 From: d-leroy Date: Wed, 15 Feb 2017 18:09:15 +0100 Subject: [PATCH 103/267] Implemented generic trace constructor --- .../model/GenericTrace.aird | 84 ++-- .../model/GenericTrace.ecore | 174 ++++---- .../model/GenericTraceImpl.ecore | 97 +++-- .../model/LaunchConfiguration.ecore | 32 +- .../model/trace class diagram.png | Bin 300853 -> 117524 bytes .../generictrace/GenericReferenceValue.java | 35 +- .../generictrace/GenericSequentialStep.java | 4 +- .../generictrace/GenericTracedObject.java | 51 +++ .../generictrace/GenerictraceFactory.java | 33 +- .../generictrace/GenerictracePackage.java | 319 +++++++++++--- ...evalue.java => IntegerAttributeValue.java} | 14 +- .../generictrace/ManyReferenceValue.java | 42 ++ .../generictrace/SingleReferenceValue.java | 50 +++ .../impl/GenericReferenceValueImpl.java | 122 +----- .../impl/GenericSequentialStepImpl.java | 143 +++++++ .../impl/GenericTracedObjectImpl.java | 171 ++++++++ .../impl/GenerictraceFactoryImpl.java | 41 +- .../impl/GenerictracePackageImpl.java | 132 ++++-- ...pl.java => IntegerAttributeValueImpl.java} | 24 +- .../impl/ManyReferenceValueImpl.java | 131 ++++++ .../impl/SingleReferenceValueImpl.java | 156 +++++++ .../util/GenerictraceAdapterFactory.java | 65 ++- .../generictrace/util/GenerictraceSwitch.java | 83 +++- .../model/GenericTraceImpl.ecore | 3 - .../traceaddon/GenericTraceConstructor.java | 394 ++++++++++++++++-- .../model/base.aird | 19 +- .../model/base.ecore | 12 +- .../src/base/States/SpecificTracedObject.java | 2 +- .../States/impl/SpecificTracedObjectImpl.java | 3 +- .../base/States/impl/StatesPackageImpl.java | 14 +- .../States/util/StatesAdapterFactory.java | 2 +- .../src/base/States/util/StatesSwitch.java | 2 +- 32 files changed, 1911 insertions(+), 543 deletions(-) rename trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/{IntegerAttributevalue.java => IntegerAttributeValue.java} (79%) create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyReferenceValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/SingleReferenceValue.java rename trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/{IntegerAttributevalueImpl.java => IntegerAttributeValueImpl.java} (82%) create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc/model/GenericTraceImpl.ecore diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird index 2f891c6ae..531feabee 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird @@ -68,12 +68,6 @@ - - - - - - @@ -98,7 +92,7 @@ - + @@ -345,7 +339,7 @@ - + @@ -369,7 +363,7 @@ - + @@ -389,7 +383,7 @@ - + @@ -409,7 +403,7 @@ - + @@ -440,7 +434,7 @@ - + @@ -509,7 +503,7 @@ - + @@ -558,7 +552,7 @@ - + @@ -739,7 +733,7 @@ - + @@ -755,7 +749,7 @@ - + @@ -787,81 +781,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1472,7 +1466,7 @@ - + @@ -1481,7 +1475,9 @@ KEEP_LOCATION KEEP_SIZE KEEP_RATIO - + + + @@ -1519,7 +1515,7 @@ - + @@ -1564,7 +1560,7 @@ - + @@ -1574,7 +1570,7 @@ - + @@ -1585,7 +1581,7 @@ - + @@ -1596,7 +1592,7 @@ - + @@ -1606,7 +1602,7 @@ - + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index a2c748cfa..9c6c34a16 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -1,153 +1,159 @@ - + - - - + + + + + + + - - - + + + + + + + + - + - - + +
+ - +
+ - - + + + + + + - + - - - + + + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - - + + + - - + + - - + + - - - + + + - + - + - + - - + + + + + - - + + - - + + - - + @@ -155,61 +161,55 @@
- + - +
- + - + - - + + - + - - + + - + - + - - + + - - + + - - + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore index 7a557dec1..f9ccc568b 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore @@ -1,61 +1,90 @@ - + - - - - - + + + + + + + + + + - - - + + + + + + - - + + + + + + + - - - + + + + - + - - - - + + + + + - - - + + + + + - - + + + + - - + + + + - - + + + - - + + + + + + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore index 909c76c5c..cfa0528a1 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore @@ -1,23 +1,23 @@ - + - - + + + + - + + + - - - - - - - - + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.png b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.png index a09bcf7822fca0e8f5999b0b4c96f30efaa5c6a3..c6e19f2eced6a03909ebff0c43f6c0178c2a5d10 100644 GIT binary patch literal 117524 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 TS-oA7$OZdMEOzG^k;47~R+I^2 literal 300853 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%0AJM-=5nRFQhrE{_I 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 * A representation of the model object 'Generic Reference Value'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue#getReferenceValue Reference Value}
    • - *
* * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericReferenceValue() - * @model + * @model abstract="true" * @generated */ public interface GenericReferenceValue extends GenericValue { - /** - * Returns the value of the 'Reference Value' reference. - * - *

- * If the meaning of the 'Reference Value' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Reference Value' reference. - * @see #setReferenceValue(EObject) - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericReferenceValue_ReferenceValue() - * @model - * @generated - */ - EObject getReferenceValue(); - - /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue#getReferenceValue Reference Value}' reference. - * - * - * @param value the new value of the 'Reference Value' reference. - * @see #getReferenceValue() - * @generated - */ - void setReferenceValue(EObject value); } // GenericReferenceValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java index 3e68f7e5a..9bf09364d 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java @@ -2,6 +2,8 @@ */ package fr.inria.diverse.trace.commons.model.generictrace; +import fr.inria.diverse.trace.commons.model.trace.BigStep; + /** * @@ -13,5 +15,5 @@ * @model * @generated */ -public interface GenericSequentialStep extends GenericStep { +public interface GenericSequentialStep extends GenericStep, BigStep { } // GenericSequentialStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java index aa0508b43..73dd2dcb9 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java @@ -3,16 +3,67 @@ package fr.inria.diverse.trace.commons.model.generictrace; import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; /** * * A representation of the model object 'Generic Traced Object'. * * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject Original Object}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getAllDimensions All Dimensions}
    • + *
* * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericTracedObject() * @model * @generated */ public interface GenericTracedObject extends TracedObject { + + /** + * Returns the value of the 'Original Object' reference. + * + *

+ * If the meaning of the 'Original Object' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Original Object' reference. + * @see #setOriginalObject(EObject) + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericTracedObject_OriginalObject() + * @model + * @generated + */ + EObject getOriginalObject(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject Original Object}' reference. + * + * + * @param value the new value of the 'Original Object' reference. + * @see #getOriginalObject() + * @generated + */ + void setOriginalObject(EObject value); + + /** + * Returns the value of the 'All Dimensions' containment reference list. + * The list contents are of type {@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension}. + * + *

+ * If the meaning of the 'All Dimensions' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'All Dimensions' containment reference list. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericTracedObject_AllDimensions() + * @model containment="true" + * @generated + */ + EList getAllDimensions(); } // GenericTracedObject diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java index 2ee570d46..e842bb2ff 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java @@ -48,15 +48,6 @@ public interface GenerictraceFactory extends EFactory { */ GenericSmallStep createGenericSmallStep(); - /** - * Returns a new object of class 'Generic Reference Value'. - * - * - * @return a new object of class 'Generic Reference Value'. - * @generated - */ - GenericReferenceValue createGenericReferenceValue(); - /** * Returns a new object of class 'Generic Dimension'. * @@ -103,13 +94,13 @@ public interface GenerictraceFactory extends EFactory { BooleanAttributeValue createBooleanAttributeValue(); /** - * Returns a new object of class 'Integer Attributevalue'. + * Returns a new object of class 'Integer Attribute Value'. * * - * @return a new object of class 'Integer Attributevalue'. + * @return a new object of class 'Integer Attribute Value'. * @generated */ - IntegerAttributevalue createIntegerAttributevalue(); + IntegerAttributeValue createIntegerAttributeValue(); /** * Returns a new object of class 'String Attribute Value'. @@ -120,6 +111,24 @@ public interface GenerictraceFactory extends EFactory { */ StringAttributeValue createStringAttributeValue(); + /** + * Returns a new object of class 'Single Reference Value'. + * + * + * @return a new object of class 'Single Reference Value'. + * @generated + */ + SingleReferenceValue createSingleReferenceValue(); + + /** + * Returns a new object of class 'Many Reference Value'. + * + * + * @return a new object of class 'Many Reference Value'. + * @generated + */ + ManyReferenceValue createManyReferenceValue(); + /** * Returns the package supported by this factory. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java index d4ce1a0c1..c86ae30e3 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java @@ -151,6 +151,15 @@ public interface GenerictracePackage extends EPackage { */ int GENERIC_SEQUENTIAL_STEP__ENDING_STATE = GENERIC_STEP__ENDING_STATE; + /** + * The feature id for the 'Sub Steps' containment reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_SEQUENTIAL_STEP__SUB_STEPS = GENERIC_STEP_FEATURE_COUNT + 0; + /** * The number of structural features of the 'Generic Sequential Step' class. * @@ -158,7 +167,7 @@ public interface GenerictracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_SEQUENTIAL_STEP_FEATURE_COUNT = GENERIC_STEP_FEATURE_COUNT + 0; + int GENERIC_SEQUENTIAL_STEP_FEATURE_COUNT = GENERIC_STEP_FEATURE_COUNT + 1; /** * The number of operations of the 'Generic Sequential Step' class. @@ -335,15 +344,6 @@ public interface GenerictracePackage extends EPackage { */ int GENERIC_REFERENCE_VALUE__STATES = GENERIC_VALUE__STATES; - /** - * The feature id for the 'Reference Value' reference. - * - * - * @generated - * @ordered - */ - int GENERIC_REFERENCE_VALUE__REFERENCE_VALUE = GENERIC_VALUE_FEATURE_COUNT + 0; - /** * The number of structural features of the 'Generic Reference Value' class. * @@ -351,7 +351,7 @@ public interface GenerictracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_REFERENCE_VALUE_FEATURE_COUNT = GENERIC_VALUE_FEATURE_COUNT + 1; + int GENERIC_REFERENCE_VALUE_FEATURE_COUNT = GENERIC_VALUE_FEATURE_COUNT + 0; /** * The number of operations of the 'Generic Reference Value' class. @@ -419,7 +419,7 @@ public interface GenerictracePackage extends EPackage { int GENERIC_TRACED_OBJECT = 5; /** - * The feature id for the 'Dimensions' containment reference list. + * The feature id for the 'Dimensions' reference list. * * * @generated @@ -427,6 +427,24 @@ public interface GenerictracePackage extends EPackage { */ int GENERIC_TRACED_OBJECT__DIMENSIONS = TracePackage.TRACED_OBJECT__DIMENSIONS; + /** + * The feature id for the 'Original Object' reference. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACED_OBJECT__ORIGINAL_OBJECT = TracePackage.TRACED_OBJECT_FEATURE_COUNT + 0; + + /** + * The feature id for the 'All Dimensions' containment reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_TRACED_OBJECT__ALL_DIMENSIONS = TracePackage.TRACED_OBJECT_FEATURE_COUNT + 1; + /** * The number of structural features of the 'Generic Traced Object' class. * @@ -434,7 +452,7 @@ public interface GenerictracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_TRACED_OBJECT_FEATURE_COUNT = TracePackage.TRACED_OBJECT_FEATURE_COUNT + 0; + int GENERIC_TRACED_OBJECT_FEATURE_COUNT = TracePackage.TRACED_OBJECT_FEATURE_COUNT + 2; /** * The operation id for the 'Get Dimensions Internal' operation. @@ -657,14 +675,14 @@ public interface GenerictracePackage extends EPackage { int BOOLEAN_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributevalueImpl Integer Attributevalue}' class. + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl Integer Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributevalueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerAttributevalue() + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerAttributeValue() * @generated */ - int INTEGER_ATTRIBUTEVALUE = 10; + int INTEGER_ATTRIBUTE_VALUE = 10; /** * The feature id for the 'States' reference list. @@ -673,7 +691,7 @@ public interface GenerictracePackage extends EPackage { * @generated * @ordered */ - int INTEGER_ATTRIBUTEVALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + int INTEGER_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; /** * The feature id for the 'Attribute Value' attribute. @@ -682,25 +700,25 @@ public interface GenerictracePackage extends EPackage { * @generated * @ordered */ - int INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; + int INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; /** - * The number of structural features of the 'Integer Attributevalue' class. + * The number of structural features of the 'Integer Attribute Value' class. * * * @generated * @ordered */ - int INTEGER_ATTRIBUTEVALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + int INTEGER_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; /** - * The number of operations of the 'Integer Attributevalue' class. + * The number of operations of the 'Integer Attribute Value' class. * * * @generated * @ordered */ - int INTEGER_ATTRIBUTEVALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; + int INTEGER_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl String Attribute Value}' class. @@ -748,6 +766,98 @@ public interface GenerictracePackage extends EPackage { */ int STRING_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl Single Reference Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getSingleReferenceValue() + * @generated + */ + int SINGLE_REFERENCE_VALUE = 14; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int SINGLE_REFERENCE_VALUE__STATES = GENERIC_REFERENCE_VALUE__STATES; + + /** + * The feature id for the 'Reference Value' reference. + * + * + * @generated + * @ordered + */ + int SINGLE_REFERENCE_VALUE__REFERENCE_VALUE = GENERIC_REFERENCE_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Single Reference Value' class. + * + * + * @generated + * @ordered + */ + int SINGLE_REFERENCE_VALUE_FEATURE_COUNT = GENERIC_REFERENCE_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Single Reference Value' class. + * + * + * @generated + * @ordered + */ + int SINGLE_REFERENCE_VALUE_OPERATION_COUNT = GENERIC_REFERENCE_VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyReferenceValueImpl Many Reference Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyReferenceValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyReferenceValue() + * @generated + */ + int MANY_REFERENCE_VALUE = 15; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int MANY_REFERENCE_VALUE__STATES = GENERIC_REFERENCE_VALUE__STATES; + + /** + * The feature id for the 'Reference Values' reference list. + * + * + * @generated + * @ordered + */ + int MANY_REFERENCE_VALUE__REFERENCE_VALUES = GENERIC_REFERENCE_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Many Reference Value' class. + * + * + * @generated + * @ordered + */ + int MANY_REFERENCE_VALUE_FEATURE_COUNT = GENERIC_REFERENCE_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Many Reference Value' class. + * + * + * @generated + * @ordered + */ + int MANY_REFERENCE_VALUE_OPERATION_COUNT = GENERIC_REFERENCE_VALUE_OPERATION_COUNT + 0; + /** * The meta object id for the 'ISerializable' data type. * @@ -755,7 +865,7 @@ public interface GenerictracePackage extends EPackage { * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getISerializable() * @generated */ - int ISERIALIZABLE = 14; + int ISERIALIZABLE = 16; /** @@ -798,17 +908,6 @@ public interface GenerictracePackage extends EPackage { */ EClass getGenericReferenceValue(); - /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue#getReferenceValue Reference Value}'. - * - * - * @return the meta object for the reference 'Reference Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue#getReferenceValue() - * @see #getGenericReferenceValue() - * @generated - */ - EReference getGenericReferenceValue_ReferenceValue(); - /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension Generic Dimension}'. * @@ -840,6 +939,28 @@ public interface GenerictracePackage extends EPackage { */ EClass getGenericTracedObject(); + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject Original Object}'. + * + * + * @return the meta object for the reference 'Original Object'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject() + * @see #getGenericTracedObject() + * @generated + */ + EReference getGenericTracedObject_OriginalObject(); + + /** + * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getAllDimensions All Dimensions}'. + * + * + * @return the meta object for the containment reference list 'All Dimensions'. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getAllDimensions() + * @see #getGenericTracedObject() + * @generated + */ + EReference getGenericTracedObject_AllDimensions(); + /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericState Generic State}'. * @@ -892,25 +1013,25 @@ public interface GenerictracePackage extends EPackage { EAttribute getBooleanAttributeValue_AttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue Integer Attributevalue}'. + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue Integer Attribute Value}'. * * - * @return the meta object for class 'Integer Attributevalue'. - * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue + * @return the meta object for class 'Integer Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue * @generated */ - EClass getIntegerAttributevalue(); + EClass getIntegerAttributeValue(); /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue#getAttributeValue Attribute Value}'. + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue Attribute Value}'. * * * @return the meta object for the attribute 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue#getAttributeValue() - * @see #getIntegerAttributevalue() + * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue() + * @see #getIntegerAttributeValue() * @generated */ - EAttribute getIntegerAttributevalue_AttributeValue(); + EAttribute getIntegerAttributeValue_AttributeValue(); /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue String Attribute Value}'. @@ -953,6 +1074,48 @@ public interface GenerictracePackage extends EPackage { */ EClass getGenericValue(); + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue Single Reference Value}'. + * + * + * @return the meta object for class 'Single Reference Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue + * @generated + */ + EClass getSingleReferenceValue(); + + /** + * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue Reference Value}'. + * + * + * @return the meta object for the reference 'Reference Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue() + * @see #getSingleReferenceValue() + * @generated + */ + EReference getSingleReferenceValue_ReferenceValue(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue Many Reference Value}'. + * + * + * @return the meta object for class 'Many Reference Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue + * @generated + */ + EClass getManyReferenceValue(); + + /** + * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue#getReferenceValues Reference Values}'. + * + * + * @return the meta object for the reference list 'Reference Values'. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue#getReferenceValues() + * @see #getManyReferenceValue() + * @generated + */ + EReference getManyReferenceValue_ReferenceValues(); + /** * Returns the meta object for data type 'ISerializable'. * @@ -1026,14 +1189,6 @@ interface Literals { */ EClass GENERIC_REFERENCE_VALUE = eINSTANCE.getGenericReferenceValue(); - /** - * The meta object literal for the 'Reference Value' reference feature. - * - * - * @generated - */ - EReference GENERIC_REFERENCE_VALUE__REFERENCE_VALUE = eINSTANCE.getGenericReferenceValue_ReferenceValue(); - /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl Generic Dimension}' class. * @@ -1062,6 +1217,22 @@ interface Literals { */ EClass GENERIC_TRACED_OBJECT = eINSTANCE.getGenericTracedObject(); + /** + * The meta object literal for the 'Original Object' reference feature. + * + * + * @generated + */ + EReference GENERIC_TRACED_OBJECT__ORIGINAL_OBJECT = eINSTANCE.getGenericTracedObject_OriginalObject(); + + /** + * The meta object literal for the 'All Dimensions' containment reference list feature. + * + * + * @generated + */ + EReference GENERIC_TRACED_OBJECT__ALL_DIMENSIONS = eINSTANCE.getGenericTracedObject_AllDimensions(); + /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl Generic State}' class. * @@ -1111,14 +1282,14 @@ interface Literals { EAttribute BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getBooleanAttributeValue_AttributeValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributevalueImpl Integer Attributevalue}' class. + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl Integer Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributevalueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerAttributevalue() + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerAttributeValue() * @generated */ - EClass INTEGER_ATTRIBUTEVALUE = eINSTANCE.getIntegerAttributevalue(); + EClass INTEGER_ATTRIBUTE_VALUE = eINSTANCE.getIntegerAttributeValue(); /** * The meta object literal for the 'Attribute Value' attribute feature. @@ -1126,7 +1297,7 @@ interface Literals { * * @generated */ - EAttribute INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE = eINSTANCE.getIntegerAttributevalue_AttributeValue(); + EAttribute INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getIntegerAttributeValue_AttributeValue(); /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl String Attribute Value}' class. @@ -1166,6 +1337,42 @@ interface Literals { */ EClass GENERIC_VALUE = eINSTANCE.getGenericValue(); + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl Single Reference Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getSingleReferenceValue() + * @generated + */ + EClass SINGLE_REFERENCE_VALUE = eINSTANCE.getSingleReferenceValue(); + + /** + * The meta object literal for the 'Reference Value' reference feature. + * + * + * @generated + */ + EReference SINGLE_REFERENCE_VALUE__REFERENCE_VALUE = eINSTANCE.getSingleReferenceValue_ReferenceValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyReferenceValueImpl Many Reference Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyReferenceValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyReferenceValue() + * @generated + */ + EClass MANY_REFERENCE_VALUE = eINSTANCE.getManyReferenceValue(); + + /** + * The meta object literal for the 'Reference Values' reference list feature. + * + * + * @generated + */ + EReference MANY_REFERENCE_VALUE__REFERENCE_VALUES = eINSTANCE.getManyReferenceValue_ReferenceValues(); + /** * The meta object literal for the 'ISerializable' data type. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributevalue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributeValue.java similarity index 79% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributevalue.java rename to trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributeValue.java index 1405360ad..0dba59976 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributevalue.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributeValue.java @@ -5,21 +5,21 @@ /** * - * A representation of the model object 'Integer Attributevalue'. + * A representation of the model object 'Integer Attribute Value'. * * *

* The following features are supported: *

*
    - *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue#getAttributeValue Attribute Value}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue Attribute Value}
    • *
* - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerAttributevalue() + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerAttributeValue() * @model * @generated */ -public interface IntegerAttributevalue extends GenericAttributeValue { +public interface IntegerAttributeValue extends GenericAttributeValue { /** * Returns the value of the 'Attribute Value' attribute. * @@ -30,14 +30,14 @@ public interface IntegerAttributevalue extends GenericAttributeValue { * * @return the value of the 'Attribute Value' attribute. * @see #setAttributeValue(int) - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerAttributevalue_AttributeValue() + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerAttributeValue_AttributeValue() * @model * @generated */ int getAttributeValue(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue#getAttributeValue Attribute Value}' attribute. + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue Attribute Value}' attribute. * * * @param value the new value of the 'Attribute Value' attribute. @@ -46,4 +46,4 @@ public interface IntegerAttributevalue extends GenericAttributeValue { */ void setAttributeValue(int value); -} // IntegerAttributevalue +} // IntegerAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyReferenceValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyReferenceValue.java new file mode 100644 index 000000000..8f1196d7c --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyReferenceValue.java @@ -0,0 +1,42 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Many Reference Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue#getReferenceValues Reference Values}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyReferenceValue() + * @model + * @generated + */ +public interface ManyReferenceValue extends GenericReferenceValue { + /** + * Returns the value of the 'Reference Values' reference list. + * The list contents are of type {@link org.eclipse.emf.ecore.EObject}. + * + *

+ * If the meaning of the 'Reference Values' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Reference Values' reference list. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyReferenceValue_ReferenceValues() + * @model + * @generated + */ + EList getReferenceValues(); + +} // ManyReferenceValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/SingleReferenceValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/SingleReferenceValue.java new file mode 100644 index 000000000..e37aa2123 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/SingleReferenceValue.java @@ -0,0 +1,50 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Single Reference Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue Reference Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getSingleReferenceValue() + * @model + * @generated + */ +public interface SingleReferenceValue extends GenericReferenceValue { + /** + * Returns the value of the 'Reference Value' reference. + * + *

+ * If the meaning of the 'Reference Value' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Reference Value' reference. + * @see #setReferenceValue(EObject) + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getSingleReferenceValue_ReferenceValue() + * @model + * @generated + */ + EObject getReferenceValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue Reference Value}' reference. + * + * + * @param value the new value of the 'Reference Value' reference. + * @see #getReferenceValue() + * @generated + */ + void setReferenceValue(EObject value); + +} // SingleReferenceValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java index bedea2990..b8e388c15 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java @@ -4,39 +4,16 @@ import fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue; import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; - -import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; /** * * An implementation of the model object 'Generic Reference Value'. * - *

- * The following features are implemented: - *

- *
    - *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericReferenceValueImpl#getReferenceValue Reference Value}
    • - *
* * @generated */ -public class GenericReferenceValueImpl extends GenericValueImpl implements GenericReferenceValue { - /** - * The cached value of the '{@link #getReferenceValue() Reference Value}' reference. - * - * - * @see #getReferenceValue() - * @generated - * @ordered - */ - protected EObject referenceValue; - +public abstract class GenericReferenceValueImpl extends GenericValueImpl implements GenericReferenceValue { /** * * @@ -56,101 +33,4 @@ protected EClass eStaticClass() { return GenerictracePackage.Literals.GENERIC_REFERENCE_VALUE; } - /** - * - * - * @generated - */ - public EObject getReferenceValue() { - if (referenceValue != null && referenceValue.eIsProxy()) { - InternalEObject oldReferenceValue = (InternalEObject)referenceValue; - referenceValue = eResolveProxy(oldReferenceValue); - if (referenceValue != oldReferenceValue) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); - } - } - return referenceValue; - } - - /** - * - * - * @generated - */ - public EObject basicGetReferenceValue() { - return referenceValue; - } - - /** - * - * - * @generated - */ - public void setReferenceValue(EObject newReferenceValue) { - EObject oldReferenceValue = referenceValue; - referenceValue = newReferenceValue; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: - if (resolve) return getReferenceValue(); - return basicGetReferenceValue(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: - setReferenceValue((EObject)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: - setReferenceValue((EObject)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case GenerictracePackage.GENERIC_REFERENCE_VALUE__REFERENCE_VALUE: - return referenceValue != null; - } - return super.eIsSet(featureID); - } - } //GenericReferenceValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java index 3a29f5954..3f82773b5 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java @@ -3,18 +3,43 @@ package fr.inria.diverse.trace.commons.model.generictrace.impl; import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import java.util.Collection; +import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; /** * * An implementation of the model object 'Generic Sequential Step'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSequentialStepImpl#getSubSteps Sub Steps}
    • + *
* * @generated */ public class GenericSequentialStepImpl extends GenericStepImpl implements GenericSequentialStep { + /** + * The cached value of the '{@link #getSubSteps() Sub Steps}' containment reference list. + * + * + * @see #getSubSteps() + * @generated + * @ordered + */ + protected EList subSteps; + /** * * @@ -34,4 +59,122 @@ protected EClass eStaticClass() { return GenerictracePackage.Literals.GENERIC_SEQUENTIAL_STEP; } + /** + * + * + * @generated + */ + public EList getSubSteps() { + if (subSteps == null) { + subSteps = new EObjectContainmentEList(GenericStep.class, this, GenerictracePackage.GENERIC_SEQUENTIAL_STEP__SUB_STEPS); + } + return subSteps; + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case GenerictracePackage.GENERIC_SEQUENTIAL_STEP__SUB_STEPS: + return ((InternalEList)getSubSteps()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.GENERIC_SEQUENTIAL_STEP__SUB_STEPS: + return getSubSteps(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.GENERIC_SEQUENTIAL_STEP__SUB_STEPS: + getSubSteps().clear(); + getSubSteps().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.GENERIC_SEQUENTIAL_STEP__SUB_STEPS: + getSubSteps().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.GENERIC_SEQUENTIAL_STEP__SUB_STEPS: + return subSteps != null && !subSteps.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { + if (baseClass == BigStep.class) { + switch (derivedFeatureID) { + case GenerictracePackage.GENERIC_SEQUENTIAL_STEP__SUB_STEPS: return TracePackage.BIG_STEP__SUB_STEPS; + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { + if (baseClass == BigStep.class) { + switch (baseFeatureID) { + case TracePackage.BIG_STEP__SUB_STEPS: return GenerictracePackage.GENERIC_SEQUENTIAL_STEP__SUB_STEPS; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + } //GenericSequentialStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java index 584df8137..85f330eec 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java @@ -7,16 +7,52 @@ import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; import fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl; +import java.util.Collection; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; /** * * An implementation of the model object 'Generic Traced Object'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl#getOriginalObject Original Object}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl#getAllDimensions All Dimensions}
    • + *
* * @generated */ public class GenericTracedObjectImpl extends TracedObjectImpl implements GenericTracedObject { + /** + * The cached value of the '{@link #getOriginalObject() Original Object}' reference. + * + * + * @see #getOriginalObject() + * @generated + * @ordered + */ + protected EObject originalObject; + + /** + * The cached value of the '{@link #getAllDimensions() All Dimensions}' containment reference list. + * + * + * @see #getAllDimensions() + * @generated + * @ordered + */ + protected EList allDimensions; + /** * * @@ -36,4 +72,139 @@ protected EClass eStaticClass() { return GenerictracePackage.Literals.GENERIC_TRACED_OBJECT; } + /** + * + * + * @generated + */ + public EObject getOriginalObject() { + if (originalObject != null && originalObject.eIsProxy()) { + InternalEObject oldOriginalObject = (InternalEObject)originalObject; + originalObject = eResolveProxy(oldOriginalObject); + if (originalObject != oldOriginalObject) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, GenerictracePackage.GENERIC_TRACED_OBJECT__ORIGINAL_OBJECT, oldOriginalObject, originalObject)); + } + } + return originalObject; + } + + /** + * + * + * @generated + */ + public EObject basicGetOriginalObject() { + return originalObject; + } + + /** + * + * + * @generated + */ + public void setOriginalObject(EObject newOriginalObject) { + EObject oldOriginalObject = originalObject; + originalObject = newOriginalObject; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.GENERIC_TRACED_OBJECT__ORIGINAL_OBJECT, oldOriginalObject, originalObject)); + } + + /** + * + * + * @generated + */ + public EList getAllDimensions() { + if (allDimensions == null) { + allDimensions = new EObjectContainmentEList(GenericDimension.class, this, GenerictracePackage.GENERIC_TRACED_OBJECT__ALL_DIMENSIONS); + } + return allDimensions; + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case GenerictracePackage.GENERIC_TRACED_OBJECT__ALL_DIMENSIONS: + return ((InternalEList)getAllDimensions()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.GENERIC_TRACED_OBJECT__ORIGINAL_OBJECT: + if (resolve) return getOriginalObject(); + return basicGetOriginalObject(); + case GenerictracePackage.GENERIC_TRACED_OBJECT__ALL_DIMENSIONS: + return getAllDimensions(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.GENERIC_TRACED_OBJECT__ORIGINAL_OBJECT: + setOriginalObject((EObject)newValue); + return; + case GenerictracePackage.GENERIC_TRACED_OBJECT__ALL_DIMENSIONS: + getAllDimensions().clear(); + getAllDimensions().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.GENERIC_TRACED_OBJECT__ORIGINAL_OBJECT: + setOriginalObject((EObject)null); + return; + case GenerictracePackage.GENERIC_TRACED_OBJECT__ALL_DIMENSIONS: + getAllDimensions().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.GENERIC_TRACED_OBJECT__ORIGINAL_OBJECT: + return originalObject != null; + case GenerictracePackage.GENERIC_TRACED_OBJECT__ALL_DIMENSIONS: + return allDimensions != null && !allDimensions.isEmpty(); + } + return super.eIsSet(featureID); + } + } //GenericTracedObjectImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java index 81a3806fb..acd9bbaf0 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java @@ -60,14 +60,15 @@ public EObject create(EClass eClass) { case GenerictracePackage.GENERIC_SEQUENTIAL_STEP: return createGenericSequentialStep(); case GenerictracePackage.GENERIC_PARALLEL_STEP: return createGenericParallelStep(); case GenerictracePackage.GENERIC_SMALL_STEP: return createGenericSmallStep(); - case GenerictracePackage.GENERIC_REFERENCE_VALUE: return createGenericReferenceValue(); case GenerictracePackage.GENERIC_DIMENSION: return createGenericDimension(); case GenerictracePackage.GENERIC_TRACED_OBJECT: return createGenericTracedObject(); case GenerictracePackage.GENERIC_STATE: return createGenericState(); case GenerictracePackage.GENERIC_TRACE: return createGenericTrace(); case GenerictracePackage.BOOLEAN_ATTRIBUTE_VALUE: return createBooleanAttributeValue(); - case GenerictracePackage.INTEGER_ATTRIBUTEVALUE: return createIntegerAttributevalue(); + case GenerictracePackage.INTEGER_ATTRIBUTE_VALUE: return createIntegerAttributeValue(); case GenerictracePackage.STRING_ATTRIBUTE_VALUE: return createStringAttributeValue(); + case GenerictracePackage.SINGLE_REFERENCE_VALUE: return createSingleReferenceValue(); + case GenerictracePackage.MANY_REFERENCE_VALUE: return createManyReferenceValue(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -133,16 +134,6 @@ public GenericSmallStep createGenericSmallStep() { return genericSmallStep; } - /** - * - * - * @generated - */ - public GenericReferenceValue createGenericReferenceValue() { - GenericReferenceValueImpl genericReferenceValue = new GenericReferenceValueImpl(); - return genericReferenceValue; - } - /** * * @@ -198,9 +189,9 @@ public BooleanAttributeValue createBooleanAttributeValue() { * * @generated */ - public IntegerAttributevalue createIntegerAttributevalue() { - IntegerAttributevalueImpl integerAttributevalue = new IntegerAttributevalueImpl(); - return integerAttributevalue; + public IntegerAttributeValue createIntegerAttributeValue() { + IntegerAttributeValueImpl integerAttributeValue = new IntegerAttributeValueImpl(); + return integerAttributeValue; } /** @@ -213,6 +204,26 @@ public StringAttributeValue createStringAttributeValue() { return stringAttributeValue; } + /** + * + * + * @generated + */ + public SingleReferenceValue createSingleReferenceValue() { + SingleReferenceValueImpl singleReferenceValue = new SingleReferenceValueImpl(); + return singleReferenceValue; + } + + /** + * + * + * @generated + */ + public ManyReferenceValue createManyReferenceValue() { + ManyReferenceValueImpl manyReferenceValue = new ManyReferenceValueImpl(); + return manyReferenceValue; + } + /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java index 2bdde26c5..65f7d1940 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java @@ -16,7 +16,9 @@ import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue; +import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; +import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; import fr.inria.diverse.trace.commons.model.trace.TracePackage; @@ -114,7 +116,7 @@ public class GenerictracePackageImpl extends EPackageImpl implements Generictrac * * @generated */ - private EClass integerAttributevalueEClass = null; + private EClass integerAttributeValueEClass = null; /** * @@ -137,6 +139,20 @@ public class GenerictracePackageImpl extends EPackageImpl implements Generictrac */ private EClass genericValueEClass = null; + /** + * + * + * @generated + */ + private EClass singleReferenceValueEClass = null; + + /** + * + * + * @generated + */ + private EClass manyReferenceValueEClass = null; + /** * * @@ -249,8 +265,8 @@ public EClass getGenericReferenceValue() { * * @generated */ - public EReference getGenericReferenceValue_ReferenceValue() { - return (EReference)genericReferenceValueEClass.getEStructuralFeatures().get(0); + public EClass getGenericDimension() { + return genericDimensionEClass; } /** @@ -258,8 +274,8 @@ public EReference getGenericReferenceValue_ReferenceValue() { * * @generated */ - public EClass getGenericDimension() { - return genericDimensionEClass; + public EReference getGenericDimension_DynamicProperty() { + return (EReference)genericDimensionEClass.getEStructuralFeatures().get(0); } /** @@ -267,8 +283,8 @@ public EClass getGenericDimension() { * * @generated */ - public EReference getGenericDimension_DynamicProperty() { - return (EReference)genericDimensionEClass.getEStructuralFeatures().get(0); + public EClass getGenericTracedObject() { + return genericTracedObjectEClass; } /** @@ -276,8 +292,17 @@ public EReference getGenericDimension_DynamicProperty() { * * @generated */ - public EClass getGenericTracedObject() { - return genericTracedObjectEClass; + public EReference getGenericTracedObject_OriginalObject() { + return (EReference)genericTracedObjectEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getGenericTracedObject_AllDimensions() { + return (EReference)genericTracedObjectEClass.getEStructuralFeatures().get(1); } /** @@ -330,8 +355,8 @@ public EAttribute getBooleanAttributeValue_AttributeValue() { * * @generated */ - public EClass getIntegerAttributevalue() { - return integerAttributevalueEClass; + public EClass getIntegerAttributeValue() { + return integerAttributeValueEClass; } /** @@ -339,8 +364,8 @@ public EClass getIntegerAttributevalue() { * * @generated */ - public EAttribute getIntegerAttributevalue_AttributeValue() { - return (EAttribute)integerAttributevalueEClass.getEStructuralFeatures().get(0); + public EAttribute getIntegerAttributeValue_AttributeValue() { + return (EAttribute)integerAttributeValueEClass.getEStructuralFeatures().get(0); } /** @@ -379,6 +404,42 @@ public EClass getGenericValue() { return genericValueEClass; } + /** + * + * + * @generated + */ + public EClass getSingleReferenceValue() { + return singleReferenceValueEClass; + } + + /** + * + * + * @generated + */ + public EReference getSingleReferenceValue_ReferenceValue() { + return (EReference)singleReferenceValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getManyReferenceValue() { + return manyReferenceValueEClass; + } + + /** + * + * + * @generated + */ + public EReference getManyReferenceValue_ReferenceValues() { + return (EReference)manyReferenceValueEClass.getEStructuralFeatures().get(0); + } + /** * * @@ -423,12 +484,13 @@ public void createPackageContents() { genericSmallStepEClass = createEClass(GENERIC_SMALL_STEP); genericReferenceValueEClass = createEClass(GENERIC_REFERENCE_VALUE); - createEReference(genericReferenceValueEClass, GENERIC_REFERENCE_VALUE__REFERENCE_VALUE); genericDimensionEClass = createEClass(GENERIC_DIMENSION); createEReference(genericDimensionEClass, GENERIC_DIMENSION__DYNAMIC_PROPERTY); genericTracedObjectEClass = createEClass(GENERIC_TRACED_OBJECT); + createEReference(genericTracedObjectEClass, GENERIC_TRACED_OBJECT__ORIGINAL_OBJECT); + createEReference(genericTracedObjectEClass, GENERIC_TRACED_OBJECT__ALL_DIMENSIONS); genericStateEClass = createEClass(GENERIC_STATE); @@ -439,8 +501,8 @@ public void createPackageContents() { booleanAttributeValueEClass = createEClass(BOOLEAN_ATTRIBUTE_VALUE); createEAttribute(booleanAttributeValueEClass, BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); - integerAttributevalueEClass = createEClass(INTEGER_ATTRIBUTEVALUE); - createEAttribute(integerAttributevalueEClass, INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE); + integerAttributeValueEClass = createEClass(INTEGER_ATTRIBUTE_VALUE); + createEAttribute(integerAttributeValueEClass, INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); stringAttributeValueEClass = createEClass(STRING_ATTRIBUTE_VALUE); createEAttribute(stringAttributeValueEClass, STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); @@ -449,6 +511,12 @@ public void createPackageContents() { genericValueEClass = createEClass(GENERIC_VALUE); + singleReferenceValueEClass = createEClass(SINGLE_REFERENCE_VALUE); + createEReference(singleReferenceValueEClass, SINGLE_REFERENCE_VALUE__REFERENCE_VALUE); + + manyReferenceValueEClass = createEClass(MANY_REFERENCE_VALUE); + createEReference(manyReferenceValueEClass, MANY_REFERENCE_VALUE__REFERENCE_VALUES); + // Create data types iSerializableEDataType = createEDataType(ISERIALIZABLE); } @@ -488,12 +556,19 @@ public void initializePackageContents() { genericTraceEClass_StepSubType.getEBounds().add(g1); // Add supertypes to classes - genericSequentialStepEClass.getESuperTypes().add(this.getGenericStep()); + g1 = createEGenericType(this.getGenericStep()); + genericSequentialStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theTracePackage.getBigStep()); + EGenericType g2 = createEGenericType(this.getGenericStep()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(this.getGenericState()); + g1.getETypeArguments().add(g2); + genericSequentialStepEClass.getEGenericSuperTypes().add(g1); genericParallelStepEClass.getESuperTypes().add(this.getGenericStep()); genericSmallStepEClass.getESuperTypes().add(this.getGenericStep()); genericReferenceValueEClass.getESuperTypes().add(this.getGenericValue()); g1 = createEGenericType(theTracePackage.getDimension()); - EGenericType g2 = createEGenericType(this.getGenericValue()); + g2 = createEGenericType(this.getGenericValue()); g1.getETypeArguments().add(g2); genericDimensionEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(theTracePackage.getTracedObject()); @@ -516,7 +591,7 @@ public void initializePackageContents() { genericTraceEClass.getEGenericSuperTypes().add(g1); genericAttributeValueEClass.getESuperTypes().add(this.getGenericValue()); booleanAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); - integerAttributevalueEClass.getESuperTypes().add(this.getGenericAttributeValue()); + integerAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); stringAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); g1 = createEGenericType(theTracePackage.getStep()); g2 = createEGenericType(this.getGenericState()); @@ -526,6 +601,8 @@ public void initializePackageContents() { g2 = createEGenericType(this.getGenericState()); g1.getETypeArguments().add(g2); genericValueEClass.getEGenericSuperTypes().add(g1); + singleReferenceValueEClass.getESuperTypes().add(this.getGenericReferenceValue()); + manyReferenceValueEClass.getESuperTypes().add(this.getGenericReferenceValue()); // Initialize classes, features, and operations; add parameters initEClass(genericSequentialStepEClass, GenericSequentialStep.class, "GenericSequentialStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -534,13 +611,14 @@ public void initializePackageContents() { initEClass(genericSmallStepEClass, GenericSmallStep.class, "GenericSmallStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(genericReferenceValueEClass, GenericReferenceValue.class, "GenericReferenceValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenericReferenceValue_ReferenceValue(), ecorePackage.getEObject(), null, "referenceValue", null, 0, 1, GenericReferenceValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(genericReferenceValueEClass, GenericReferenceValue.class, "GenericReferenceValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(genericDimensionEClass, GenericDimension.class, "GenericDimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getGenericDimension_DynamicProperty(), theEcorePackage.getEStructuralFeature(), null, "dynamicProperty", null, 0, 1, GenericDimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(genericTracedObjectEClass, GenericTracedObject.class, "GenericTracedObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getGenericTracedObject_OriginalObject(), theEcorePackage.getEObject(), null, "originalObject", null, 0, 1, GenericTracedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGenericTracedObject_AllDimensions(), this.getGenericDimension(), null, "allDimensions", null, 0, -1, GenericTracedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(genericStateEClass, GenericState.class, "GenericState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -551,8 +629,8 @@ public void initializePackageContents() { initEClass(booleanAttributeValueEClass, BooleanAttributeValue.class, "BooleanAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getBooleanAttributeValue_AttributeValue(), ecorePackage.getEBoolean(), "attributeValue", "false", 0, 1, BooleanAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(integerAttributevalueEClass, IntegerAttributevalue.class, "IntegerAttributevalue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIntegerAttributevalue_AttributeValue(), ecorePackage.getEInt(), "attributeValue", null, 0, 1, IntegerAttributevalue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(integerAttributeValueEClass, IntegerAttributeValue.class, "IntegerAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getIntegerAttributeValue_AttributeValue(), ecorePackage.getEInt(), "attributeValue", null, 0, 1, IntegerAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(stringAttributeValueEClass, StringAttributeValue.class, "StringAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getStringAttributeValue_AttributeValue(), ecorePackage.getEString(), "attributeValue", null, 0, 1, StringAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -561,6 +639,12 @@ public void initializePackageContents() { initEClass(genericValueEClass, GenericValue.class, "GenericValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(singleReferenceValueEClass, SingleReferenceValue.class, "SingleReferenceValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getSingleReferenceValue_ReferenceValue(), ecorePackage.getEObject(), null, "referenceValue", null, 0, 1, SingleReferenceValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(manyReferenceValueEClass, ManyReferenceValue.class, "ManyReferenceValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getManyReferenceValue_ReferenceValues(), ecorePackage.getEObject(), null, "referenceValues", null, 0, -1, ManyReferenceValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + // Initialize data types initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributevalueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java similarity index 82% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributevalueImpl.java rename to trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java index d3ea18899..bd9c43843 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributevalueImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java @@ -3,7 +3,7 @@ package fr.inria.diverse.trace.commons.model.generictrace.impl; import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue; +import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; import org.eclipse.emf.common.notify.Notification; @@ -13,18 +13,18 @@ /** * - * An implementation of the model object 'Integer Attributevalue'. + * An implementation of the model object 'Integer Attribute Value'. * *

* The following features are implemented: *

*
    - *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributevalueImpl#getAttributeValue Attribute Value}
    • + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl#getAttributeValue Attribute Value}
    • *
* * @generated */ -public class IntegerAttributevalueImpl extends GenericAttributeValueImpl implements IntegerAttributevalue { +public class IntegerAttributeValueImpl extends GenericAttributeValueImpl implements IntegerAttributeValue { /** * The default value of the '{@link #getAttributeValue() Attribute Value}' attribute. * @@ -50,7 +50,7 @@ public class IntegerAttributevalueImpl extends GenericAttributeValueImpl impleme * * @generated */ - protected IntegerAttributevalueImpl() { + protected IntegerAttributeValueImpl() { super(); } @@ -61,7 +61,7 @@ protected IntegerAttributevalueImpl() { */ @Override protected EClass eStaticClass() { - return GenerictracePackage.Literals.INTEGER_ATTRIBUTEVALUE; + return GenerictracePackage.Literals.INTEGER_ATTRIBUTE_VALUE; } /** @@ -82,7 +82,7 @@ public void setAttributeValue(int newAttributeValue) { int oldAttributeValue = attributeValue; attributeValue = newAttributeValue; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); + eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); } /** @@ -93,7 +93,7 @@ public void setAttributeValue(int newAttributeValue) { @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case GenerictracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + case GenerictracePackage.INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: return getAttributeValue(); } return super.eGet(featureID, resolve, coreType); @@ -107,7 +107,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case GenerictracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + case GenerictracePackage.INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: setAttributeValue((Integer)newValue); return; } @@ -122,7 +122,7 @@ public void eSet(int featureID, Object newValue) { @Override public void eUnset(int featureID) { switch (featureID) { - case GenerictracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + case GenerictracePackage.INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); return; } @@ -137,7 +137,7 @@ public void eUnset(int featureID) { @Override public boolean eIsSet(int featureID) { switch (featureID) { - case GenerictracePackage.INTEGER_ATTRIBUTEVALUE__ATTRIBUTE_VALUE: + case GenerictracePackage.INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: return attributeValue != ATTRIBUTE_VALUE_EDEFAULT; } return super.eIsSet(featureID); @@ -159,4 +159,4 @@ public String toString() { return result.toString(); } -} //IntegerAttributevalueImpl +} //IntegerAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java new file mode 100644 index 000000000..59b4e4034 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java @@ -0,0 +1,131 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; + +import java.util.Collection; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; + +import org.eclipse.emf.ecore.util.EObjectResolvingEList; + +/** + * + * An implementation of the model object 'Many Reference Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyReferenceValueImpl#getReferenceValues Reference Values}
    • + *
+ * + * @generated + */ +public class ManyReferenceValueImpl extends GenericReferenceValueImpl implements ManyReferenceValue { + /** + * The cached value of the '{@link #getReferenceValues() Reference Values}' reference list. + * + * + * @see #getReferenceValues() + * @generated + * @ordered + */ + protected EList referenceValues; + /** + * + * + * @generated + */ + protected ManyReferenceValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.MANY_REFERENCE_VALUE; + } + + /** + * + * + * @generated + */ + public EList getReferenceValues() { + if (referenceValues == null) { + referenceValues = new EObjectResolvingEList(EObject.class, this, GenerictracePackage.MANY_REFERENCE_VALUE__REFERENCE_VALUES); + } + return referenceValues; + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.MANY_REFERENCE_VALUE__REFERENCE_VALUES: + return getReferenceValues(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.MANY_REFERENCE_VALUE__REFERENCE_VALUES: + getReferenceValues().clear(); + getReferenceValues().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.MANY_REFERENCE_VALUE__REFERENCE_VALUES: + getReferenceValues().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.MANY_REFERENCE_VALUE__REFERENCE_VALUES: + return referenceValues != null && !referenceValues.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //ManyReferenceValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java new file mode 100644 index 000000000..c8c5c346f --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java @@ -0,0 +1,156 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Single Reference Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl#getReferenceValue Reference Value}
    • + *
+ * + * @generated + */ +public class SingleReferenceValueImpl extends GenericReferenceValueImpl implements SingleReferenceValue { + /** + * The cached value of the '{@link #getReferenceValue() Reference Value}' reference. + * + * + * @see #getReferenceValue() + * @generated + * @ordered + */ + protected EObject referenceValue; + + /** + * + * + * @generated + */ + protected SingleReferenceValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.SINGLE_REFERENCE_VALUE; + } + + /** + * + * + * @generated + */ + public EObject getReferenceValue() { + if (referenceValue != null && referenceValue.eIsProxy()) { + InternalEObject oldReferenceValue = (InternalEObject)referenceValue; + referenceValue = eResolveProxy(oldReferenceValue); + if (referenceValue != oldReferenceValue) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, GenerictracePackage.SINGLE_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); + } + } + return referenceValue; + } + + /** + * + * + * @generated + */ + public EObject basicGetReferenceValue() { + return referenceValue; + } + + /** + * + * + * @generated + */ + public void setReferenceValue(EObject newReferenceValue) { + EObject oldReferenceValue = referenceValue; + referenceValue = newReferenceValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.SINGLE_REFERENCE_VALUE__REFERENCE_VALUE, oldReferenceValue, referenceValue)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.SINGLE_REFERENCE_VALUE__REFERENCE_VALUE: + if (resolve) return getReferenceValue(); + return basicGetReferenceValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.SINGLE_REFERENCE_VALUE__REFERENCE_VALUE: + setReferenceValue((EObject)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.SINGLE_REFERENCE_VALUE__REFERENCE_VALUE: + setReferenceValue((EObject)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.SINGLE_REFERENCE_VALUE__REFERENCE_VALUE: + return referenceValue != null; + } + return super.eIsSet(featureID); + } + +} //SingleReferenceValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java index 5120ad768..a10980920 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java @@ -4,6 +4,7 @@ import fr.inria.diverse.trace.commons.model.generictrace.*; +import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; @@ -115,8 +116,8 @@ public Adapter caseBooleanAttributeValue(BooleanAttributeValue object) { return createBooleanAttributeValueAdapter(); } @Override - public Adapter caseIntegerAttributevalue(IntegerAttributevalue object) { - return createIntegerAttributevalueAdapter(); + public Adapter caseIntegerAttributeValue(IntegerAttributeValue object) { + return createIntegerAttributeValueAdapter(); } @Override public Adapter caseStringAttributeValue(StringAttributeValue object) { @@ -131,10 +132,22 @@ public Adapter caseGenericValue(GenericValue object) { return createGenericValueAdapter(); } @Override + public Adapter caseSingleReferenceValue(SingleReferenceValue object) { + return createSingleReferenceValueAdapter(); + } + @Override + public Adapter caseManyReferenceValue(ManyReferenceValue object) { + return createManyReferenceValueAdapter(); + } + @Override public > Adapter caseStep(Step object) { return createStepAdapter(); } @Override + public , StateSubType extends State> Adapter caseBigStep(BigStep object) { + return createBigStepAdapter(); + } + @Override public > Adapter caseValue(Value object) { return createValueAdapter(); } @@ -315,16 +328,16 @@ public Adapter createBooleanAttributeValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue Integer Attributevalue}'. + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue Integer Attribute Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributevalue + * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue * @generated */ - public Adapter createIntegerAttributevalueAdapter() { + public Adapter createIntegerAttributeValueAdapter() { return null; } @@ -370,6 +383,34 @@ public Adapter createGenericValueAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue Single Reference Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue + * @generated + */ + public Adapter createSingleReferenceValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue Many Reference Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue + * @generated + */ + public Adapter createManyReferenceValueAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. * @@ -384,6 +425,20 @@ public Adapter createStepAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.BigStep + * @generated + */ + public Adapter createBigStepAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java index 5d0c38ff4..44d66c4dd 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java @@ -4,6 +4,7 @@ import fr.inria.diverse.trace.commons.model.generictrace.*; +import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; @@ -77,6 +78,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { GenericSequentialStep genericSequentialStep = (GenericSequentialStep)theEObject; T result = caseGenericSequentialStep(genericSequentialStep); if (result == null) result = caseGenericStep(genericSequentialStep); + if (result == null) result = caseBigStep(genericSequentialStep); if (result == null) result = caseStep(genericSequentialStep); if (result == null) result = defaultCase(theEObject); return result; @@ -150,12 +152,12 @@ protected T doSwitch(int classifierID, EObject theEObject) { if (result == null) result = defaultCase(theEObject); return result; } - case GenerictracePackage.INTEGER_ATTRIBUTEVALUE: { - IntegerAttributevalue integerAttributevalue = (IntegerAttributevalue)theEObject; - T result = caseIntegerAttributevalue(integerAttributevalue); - if (result == null) result = caseGenericAttributeValue(integerAttributevalue); - if (result == null) result = caseGenericValue(integerAttributevalue); - if (result == null) result = caseValue(integerAttributevalue); + case GenerictracePackage.INTEGER_ATTRIBUTE_VALUE: { + IntegerAttributeValue integerAttributeValue = (IntegerAttributeValue)theEObject; + T result = caseIntegerAttributeValue(integerAttributeValue); + if (result == null) result = caseGenericAttributeValue(integerAttributeValue); + if (result == null) result = caseGenericValue(integerAttributeValue); + if (result == null) result = caseValue(integerAttributeValue); if (result == null) result = defaultCase(theEObject); return result; } @@ -182,6 +184,24 @@ protected T doSwitch(int classifierID, EObject theEObject) { if (result == null) result = defaultCase(theEObject); return result; } + case GenerictracePackage.SINGLE_REFERENCE_VALUE: { + SingleReferenceValue singleReferenceValue = (SingleReferenceValue)theEObject; + T result = caseSingleReferenceValue(singleReferenceValue); + if (result == null) result = caseGenericReferenceValue(singleReferenceValue); + if (result == null) result = caseGenericValue(singleReferenceValue); + if (result == null) result = caseValue(singleReferenceValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.MANY_REFERENCE_VALUE: { + ManyReferenceValue manyReferenceValue = (ManyReferenceValue)theEObject; + T result = caseManyReferenceValue(manyReferenceValue); + if (result == null) result = caseGenericReferenceValue(manyReferenceValue); + if (result == null) result = caseGenericValue(manyReferenceValue); + if (result == null) result = caseValue(manyReferenceValue); + if (result == null) result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } @@ -337,17 +357,17 @@ public T caseBooleanAttributeValue(BooleanAttributeValue object) { } /** - * Returns the result of interpreting the object as an instance of 'Integer Attributevalue'. + * Returns the result of interpreting the object as an instance of 'Integer Attribute Value'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Integer Attributevalue'. + * @return the result of interpreting the object as an instance of 'Integer Attribute Value'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseIntegerAttributevalue(IntegerAttributevalue object) { + public T caseIntegerAttributeValue(IntegerAttributeValue object) { return null; } @@ -396,6 +416,36 @@ public T caseGenericValue(GenericValue object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Single Reference Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Single Reference Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseSingleReferenceValue(SingleReferenceValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Many Reference Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Many Reference Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseManyReferenceValue(ManyReferenceValue object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Step'. * @@ -411,6 +461,21 @@ public T caseGenericValue(GenericValue object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Big Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Big Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , StateSubType extends State> T caseBigStep(BigStep object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Value'. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/model/GenericTraceImpl.ecore b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/model/GenericTraceImpl.ecore deleted file mode 100644 index 707d57b1c..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/model/GenericTraceImpl.ecore +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index 08ec981c0..908f7cca0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -10,32 +10,324 @@ *******************************************************************************/ package fr.inria.diverse.trace.gemoc.traceaddon; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EClassifier; +import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.EcorePackage; +import org.eclipse.emf.ecore.resource.Resource; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange; +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange; +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange; +import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.RemovedObjectModelChange; +import fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; +import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericState; +import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; +import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; +import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; +import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; +import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; +import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.MSEModel; import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.trace.Trace; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; public class GenericTraceConstructor implements ITraceConstructor { -// private Trace, TracedObject, State> traceRoot; -// private Resource traceResource; -// private final Deque> context = new LinkedList>(); + private Trace traceRoot; + private Resource executedModel; + private MSEModel mseModel; + private Resource traceResource; + private final Map exeToTraced = new HashMap<>(); + private final Deque context = new LinkedList<>(); + private GenericState lastState; private GenericTraceConstructor() { } + private Set getAllExecutedModelResources() { + Set allResources = new HashSet<>(); + allResources.add(executedModel); + allResources.addAll(org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); + allResources.removeIf(r -> r == null); + return allResources; + } + + public static final String DYNAMIC_ANNOTATION_URI = "aspect"; + + private static boolean isDynamic(EModelElement o) { + return o.getEAnnotations().stream().anyMatch(a -> a.getSource().equals(DYNAMIC_ANNOTATION_URI)); + } + + public static boolean isDynamic(EClass c) { + return isDynamic((EModelElement)c); + } + + public static boolean isDynamic(EStructuralFeature p) { + return isDynamic((EModelElement) p) || isDynamic(p.getEContainingClass()); + } + + private boolean addNewObjectToStateIfDynamic(EObject object, GenericState state) { + final EClass c = object.eClass(); + final List mutableProperties = c.getEStructuralFeatures().stream() + .filter(p -> isDynamic(p)) + .collect(Collectors.toList()); + if (isDynamic(object.eClass()) || !mutableProperties.isEmpty()) { + return addNewObjectToState(object, mutableProperties, lastState); + } + return true; + } + + @SuppressWarnings("unchecked") + private GenericValue getGenericValue(EObject object, EStructuralFeature mutableProperty) { + GenericValue result = null; + if (mutableProperty instanceof EAttribute) { + final EClassifier eType = mutableProperty.getEType(); + if (eType == EcorePackage.Literals.EINT) { + final IntegerAttributeValue value = GenerictraceFactory.eINSTANCE.createIntegerAttributeValue(); + value.setAttributeValue((Integer) object.eGet(mutableProperty)); + result = value; + } else if (eType == EcorePackage.Literals.EBOOLEAN) { + final BooleanAttributeValue value = GenerictraceFactory.eINSTANCE.createBooleanAttributeValue(); + value.setAttributeValue((Boolean) object.eGet(mutableProperty)); + result = value; + } else if (eType == EcorePackage.Literals.ESTRING) { + final StringAttributeValue value = GenerictraceFactory.eINSTANCE.createStringAttributeValue(); + value.setAttributeValue((String) object.eGet(mutableProperty)); + result = value; + } + } else if (mutableProperty instanceof EReference) { + if (mutableProperty.isMany()) { + final List modelElements = (List) object.eGet(mutableProperty); + final ManyReferenceValue value = GenerictraceFactory.eINSTANCE.createManyReferenceValue(); + for (EObject o : modelElements) { + value.getReferenceValues().add(exeToTraced.get(o)); + } + result = value; + } else { + final EObject o = (EObject) object.eGet(mutableProperty); + final SingleReferenceValue value = GenerictraceFactory.eINSTANCE.createSingleReferenceValue(); + value.setReferenceValue(exeToTraced.get(o)); + result = value; + } + } + return result; + } + + @SuppressWarnings("unchecked") + private boolean addNewObjectToState(EObject object, List mutableProperties, GenericState state) { + boolean added = false; + if (!exeToTraced.containsKey(object)) { + final GenericTracedObject tracedObject = GenerictraceFactory.eINSTANCE.createGenericTracedObject(); + tracedObject.setOriginalObject(object); + exeToTraced.put(object, tracedObject); + for (EStructuralFeature mutableProperty : mutableProperties) { + final GenericDimension dimension = GenerictraceFactory.eINSTANCE.createGenericDimension(); + GenericValue firstValue = null; + dimension.setDynamicProperty(mutableProperty); + tracedObject.getDimensionsInternal().add(dimension); + if (mutableProperty instanceof EAttribute) { + final EClassifier eType = mutableProperty.getEType(); + if (eType == EcorePackage.Literals.EINT) { + final IntegerAttributeValue value = GenerictraceFactory.eINSTANCE.createIntegerAttributeValue(); + value.setAttributeValue((Integer) object.eGet(mutableProperty)); + firstValue = value; + } else if (eType == EcorePackage.Literals.EBOOLEAN) { + final BooleanAttributeValue value = GenerictraceFactory.eINSTANCE.createBooleanAttributeValue(); + value.setAttributeValue((Boolean) object.eGet(mutableProperty)); + firstValue = value; + } else if (eType == EcorePackage.Literals.ESTRING) { + final StringAttributeValue value = GenerictraceFactory.eINSTANCE.createStringAttributeValue(); + value.setAttributeValue((String) object.eGet(mutableProperty)); + firstValue = value; + } + } else if (mutableProperty instanceof EReference) { + if (mutableProperty.isMany()) { + final List modelElements = (List) object.eGet(mutableProperty); + final ManyReferenceValue value = GenerictraceFactory.eINSTANCE.createManyReferenceValue(); + for (EObject o : modelElements) { + addNewObjectToStateIfDynamic(o, state); + value.getReferenceValues().add(exeToTraced.get(o)); + } + firstValue = value; + } else { + final EObject o = (EObject) object.eGet(mutableProperty); + addNewObjectToStateIfDynamic(o, state); + final SingleReferenceValue value = GenerictraceFactory.eINSTANCE.createSingleReferenceValue(); + value.setReferenceValue(exeToTraced.get(o)); + firstValue = value; + } + } + if (firstValue != null) { + dimension.getValues().add(firstValue); + } + } + traceRoot.getTracedObjects().add(tracedObject); + added = true; + } + return added; + } + + private void addInitialState() { + if (lastState == null) { + // Creation of the initial state + Set allResources = getAllExecutedModelResources(); + + lastState = GenerictraceFactory.eINSTANCE.createGenericState(); + for (Resource r : allResources) { + for (TreeIterator i = r.getAllContents(); i.hasNext();) { + final EObject o = i.next(); + addNewObjectToStateIfDynamic(o, lastState); + } + } + this.traceRoot.getStates().add(lastState); + } + } + + private boolean copiedState = false; + + private GenericState copyState(GenericState oldState) { + GenericState newState = GenerictraceFactory.eINSTANCE.createGenericState(); + newState.getValues().addAll(oldState.getValues()); + copiedState = true; + return newState; + } + + @SuppressWarnings("unchecked") @Override public void addState(List modelChanges) { - throw new UnsupportedOperationException(); - // Empty implementation, states are not yet supported in the generic trace. + if (lastState == null) { + addInitialState(); + } + if (!modelChanges.isEmpty()) { + boolean stateChanged = false; + // We start by a (shallow) copy of the last state + // But we will have to rollback a little by replacing values that changed + GenericState newState = copyState(lastState); + for (ModelChange modelChange : modelChanges) { + EObject o = modelChange.getChangedObject(); + // We only look at constructable objects that have mutable fields + // Here we have nothing to rollback, just a new object to add + if (modelChange instanceof NewObjectModelChange) { + stateChanged = true; + addNewObjectToStateIfDynamic(o, newState); + } + // We only look at constructable objects that have mutable fields + // Here we must rollback to remove the values of the removed object from the copied state + else if (modelChange instanceof RemovedObjectModelChange) { + stateChanged = true; + final List values = newState.getValues(); + exeToTraced.get(o).getDimensionsInternal().forEach(d -> values.remove(d.getValues().get(d.getValues().size() - 1))); + } + // Here we must look at non-collection mutable fields + // We must rollback the last values from the copied state, and add new values as well + // ie. mix of remove and new + else if (modelChange instanceof NonCollectionFieldModelChange) { + stateChanged = true; + EStructuralFeature p = ((NonCollectionFieldModelChange) modelChange).getChangedField(); + // Rollback: we remove the last value of this field from the new state + final GenericTracedObject tracedObject = exeToTraced.get(o); + final GenericDimension dimension = tracedObject.getAllDimensions().stream() + .filter(d -> d.getDynamicProperty() == p) + .findFirst().orElse(null); + if (dimension != null) { + final List values = dimension.getValues(); + final GenericValue lastValue = values.get(values.size() - 1); + if (lastValue != null) { + newState.getValues().remove(lastValue); + } + final GenericValue newValue = getGenericValue(o, p); + values.add(newValue); + newState.getValues().add(newValue); + } + } + // Here we look at collection mutable fields + // We must first manually find out if the collection changed... + // If it changed we must rollback the last values from the copied state, and add new values as well + else if (modelChange instanceof PotentialCollectionFieldModelChange) { + final EStructuralFeature p = ((PotentialCollectionFieldModelChange) modelChange).getChangedField(); + final GenericTracedObject tracedObject = exeToTraced.get(o); + // We compare the last collection in the value sequence, and the current one in the potentially changed object + final GenericDimension dimension = tracedObject.getAllDimensions().stream() + .filter(d -> d.getDynamicProperty() == p) + .findFirst().orElse(null); + if (dimension != null) { + final List dimensionValues = dimension.getValues(); + final ManyReferenceValue lastValue = (ManyReferenceValue) dimensionValues.get(dimensionValues.size() - 1); + final List values = (List) tracedObject.eGet(p); + for (EObject eObj : values) { + addNewObjectToStateIfDynamic(eObj, newState); + } + boolean change = false; + if (lastValue != null) { + if (lastValue.getReferenceValues().size() == values.size()) { + java.util.Iterator it = values.iterator(); + for (EObject aPreviousValue : lastValue.getReferenceValues()) { + EObject aCurrentValue = it.next(); + if (aPreviousValue != exeToTraced.get(aCurrentValue)) { + change = true; + break; + } + } + } else { + change = true; + } + } else { + change = true; + } + if (change) { + stateChanged = true; + // Rollback: we remove the last value of this field from the new state + newState.getValues().remove(lastValue); + // And we create a proper new value + GenericValue newValue = getGenericValue(o, p); + dimension.getValues().add(newValue); + newState.getValues().add(newValue); + } + } + } + } + if (stateChanged) { + final GenericStep currentStep = context.peekFirst(); + if (currentStep != null && currentStep instanceof BigStep) { + final GenericState startingState = lastState; + final GenericState endingState = newState; + addImplicitStep((BigStep) currentStep, startingState, endingState); + } + lastState = newState; + traceRoot.getStates().add(lastState); + } else if (copiedState) { + newState.getValues().clear(); + } + copiedState = false; + } } - + // private List> getSubSteps(Step step) { // if (step instanceof BigStep) { // return ((BigStep) step).getSubSteps(); @@ -44,63 +336,75 @@ public void addState(List modelChanges) { // } // } + private void addImplicitStep(BigStep currentStep, GenericState startingState, GenericState endingState) { + GenericSmallStep implicitStep = GenerictraceFactory.eINSTANCE.createGenericSmallStep(); + implicitStep.setStartingState(startingState); + implicitStep.setEndingState(endingState); + currentStep.getSubSteps().add(implicitStep); + } + @Override public void addStep(Step step) { - throw new UnsupportedOperationException(); -// if (context.isEmpty()) { -// final List> tmp = new ArrayList<>(getSubSteps(traceRoot.getRootStep())); -// tmp.add(step); -// context.push(step); -// } else { -// final Step topStep = context.getFirst(); -// if (topStep != null && topStep instanceof BigStep) { -// ((BigStep) topStep).getSubSteps().add(step); -// } -// } + GenericSequentialStep step_cast = null; + if (step != null && step instanceof GenericSequentialStep) { + step_cast = (GenericSequentialStep) step; + if (mseModel == null) { + mseModel = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEModel(); + traceResource.getContents().add(mseModel); + } + mseModel.getOwnedMSEs().add(step_cast.getMseoccurrence().getMse()); + + GenericState state = traceRoot.getStates().get(traceRoot.getStates().size() - 1); + step_cast.setStartingState(state); + if (!context.isEmpty() && context.getFirst() != null) { + context.getFirst().getSubSteps().add(step_cast); + } else { + traceRoot.getRootStep().getSubSteps().add(step_cast); + } + } + context.push(step_cast); } @Override public void endStep(Step step) { - throw new UnsupportedOperationException(); -// context.pop(); + GenericStep popped = context.pop(); + if (popped != null) + popped.setEndingState(lastState); } @Override public EObject initTrace(LaunchConfiguration launchConfiguration) { - throw new UnsupportedOperationException(); -// // Create root -// traceRoot = TraceFactory.eINSTANCE.createGenericTrace(); -// traceRoot.setLaunchconfiguration(launchConfiguration); -// -// // Create root sequential step -// GenericSequentialStep rootStep = TraceFactory.eINSTANCE.createGenericSequentialStep(); -// traceRoot.setRootStep(rootStep); -// -// // Put in the resource -// traceResource.getContents().add(traceRoot); -// -// return traceRoot; + // Create root + traceRoot = GenerictraceFactory.eINSTANCE.createGenericTrace(); + traceRoot.setLaunchconfiguration(launchConfiguration); + + // Create root sequential step + GenericSequentialStep rootStep = GenerictraceFactory.eINSTANCE.createGenericSequentialStep(); + traceRoot.setRootStep(rootStep); + + // Put in the resource + traceResource.getContents().add(traceRoot); + + return traceRoot; } @Override public void save() { - throw new UnsupportedOperationException(); -// try { -// traceResource.save(null); -// } catch (java.io.IOException e) { -// e.printStackTrace(); -// } + try { + traceResource.save(null); + } catch (java.io.IOException e) { + e.printStackTrace(); + } } @Override public void save(URI uri) { - throw new UnsupportedOperationException(); -// try { -// traceResource.setURI(uri); -// traceResource.save(null); -// } catch (java.io.IOException e) { -// e.printStackTrace(); -// } + try { + traceResource.setURI(uri); + traceResource.save(null); + } catch (java.io.IOException e) { + e.printStackTrace(); + } } @Override diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird index c2909ddc0..7e151f9c2 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird @@ -42,6 +42,15 @@ + + + + + + + + + @@ -931,16 +940,16 @@ - + - - - + + + - + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore index 89e02f9fb..c09a76ff7 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore @@ -60,11 +60,15 @@ - + + + + + + + - - - + extends TracedObject> { +public interface SpecificTracedObject> extends TracedObject { } // SpecificTracedObject diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java index b70053bf8..be34c1b88 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java @@ -4,6 +4,7 @@ import base.States.SpecificDimension; import base.States.SpecificTracedObject; +import base.States.SpecificValue; import base.States.StatesPackage; import fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl; @@ -16,7 +17,7 @@ * * @generated */ -public abstract class SpecificTracedObjectImpl extends TracedObjectImpl> implements SpecificTracedObject { +public abstract class SpecificTracedObjectImpl> extends TracedObjectImpl implements SpecificTracedObject { /** * * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java index 49d0065c3..3609e699c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java @@ -273,16 +273,22 @@ public void initializePackageContents() { // Create type parameters ETypeParameter specificDimensionEClass_ValueSubType = addETypeParameter(specificDimensionEClass, "ValueSubType"); - addETypeParameter(specificTracedObjectEClass, "DimensionSubType"); + ETypeParameter specificTracedObjectEClass_DimensionSubType = addETypeParameter(specificTracedObjectEClass, "DimensionSubType"); addETypeParameter(specificReferenceValueEClass, "T"); // Set bounds for type parameters EGenericType g1 = createEGenericType(this.getSpecificValue()); specificDimensionEClass_ValueSubType.getEBounds().add(g1); + g1 = createEGenericType(this.getSpecificDimension()); + EGenericType g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + EGenericType g3 = createEGenericType(this.getSpecificValue()); + g2.setEUpperBound(g3); + specificTracedObjectEClass_DimensionSubType.getEBounds().add(g1); // Add supertypes to classes g1 = createEGenericType(theTracePackage.getState()); - EGenericType g2 = createEGenericType(theStepsPackage.getSpecificStep()); + g2 = createEGenericType(theStepsPackage.getSpecificStep()); g1.getETypeArguments().add(g2); g2 = createEGenericType(this.getSpecificValue()); g1.getETypeArguments().add(g2); @@ -293,10 +299,8 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); specificDimensionEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(theTracePackage.getTracedObject()); - g2 = createEGenericType(this.getSpecificDimension()); + g2 = createEGenericType(specificTracedObjectEClass_DimensionSubType); g1.getETypeArguments().add(g2); - EGenericType g3 = createEGenericType(); - g2.getETypeArguments().add(g3); specificTracedObjectEClass.getEGenericSuperTypes().add(g1); specificReferenceValueEClass.getESuperTypes().add(this.getSpecificValue()); g1 = createEGenericType(theTracePackage.getValue()); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java index 602348c6d..e8ed139dd 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java @@ -86,7 +86,7 @@ public Adapter caseSpecificDimension(Specif return createSpecificDimensionAdapter(); } @Override - public Adapter caseSpecificTracedObject(SpecificTracedObject object) { + public > Adapter caseSpecificTracedObject(SpecificTracedObject object) { return createSpecificTracedObjectAdapter(); } @Override diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java index 114a80f50..5d4c60c63 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java @@ -176,7 +176,7 @@ public T1 caseSpecificDimension(SpecificDim * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T1 caseSpecificTracedObject(SpecificTracedObject object) { + public > T1 caseSpecificTracedObject(SpecificTracedObject object) { return null; } From bd361528632cfd8eb9385d380f85bf9dc9a65066 Mon Sep 17 00:00:00 2001 From: d-leroy Date: Fri, 17 Feb 2017 09:18:33 +0100 Subject: [PATCH 104/267] Working implementation of the generic trace constructor and state manager --- .../model/GenericTraceImpl.ecore | 7 +- .../generictrace/GenericSequentialStep.java | 4 +- .../generictrace/GenericTracedObject.java | 9 ++ .../generictrace/GenerictracePackage.java | 23 ++++- .../impl/GenericSequentialStepImpl.java | 11 +++ .../impl/GenericTracedObjectImpl.java | 46 +++++++++ .../impl/GenerictracePackageImpl.java | 15 ++- .../util/GenerictraceAdapterFactory.java | 19 ++++ .../generictrace/util/GenerictraceSwitch.java | 17 ++++ .../META-INF/MANIFEST.MF | 3 +- .../fr.inria.diverse.trace.gemoc/plugin.xml | 9 ++ .../gemoc/traceaddon/AbstractTraceAddon.xtend | 6 +- .../gemoc/traceaddon/GenericStateManager.java | 98 +++++++++++++++++++ .../traceaddon/GenericTraceConstructor.java | 59 ++++++----- .../traceaddon/GenericTraceEngineAddon.java | 30 +++--- .../traceaddon/GenericTraceExtractor.java | 39 ++++++-- .../traceaddon/GenericTraceStepFactory.java | 9 +- 17 files changed, 348 insertions(+), 56 deletions(-) create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc/plugin.xml create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore index f9ccc568b..56b9a4465 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore @@ -6,7 +6,7 @@ - + @@ -22,6 +22,11 @@ + + +
+ + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java index 9bf09364d..b1f56569f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java @@ -2,7 +2,7 @@ */ package fr.inria.diverse.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; /** @@ -15,5 +15,5 @@ * @model * @generated */ -public interface GenericSequentialStep extends GenericStep, BigStep { +public interface GenericSequentialStep extends GenericStep, SequentialStep { } // GenericSequentialStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java index 73dd2dcb9..f7ef081fa 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java @@ -66,4 +66,13 @@ public interface GenericTracedObject extends TracedObject { * @generated */ EList getAllDimensions(); + + /** + * + * + * @model kind="operation" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList result = new org.eclipse.emf.ecore.util.BasicInternalEList(Object.class);\nresult.addAll(super.getDimensionsInternal());\nresult.addAll(getAllDimensions());\nreturn result;\n'" + * @generated + */ + EList getDimensionsInternal(); } // GenericTracedObject diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java index c86ae30e3..409664a2a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java @@ -7,6 +7,7 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; @@ -461,7 +462,7 @@ public interface GenerictracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = TracePackage.TRACED_OBJECT___GET_DIMENSIONS_INTERNAL; + int GENERIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 0; /** * The number of operations of the 'Generic Traced Object' class. @@ -470,7 +471,7 @@ public interface GenerictracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_TRACED_OBJECT_OPERATION_COUNT = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 0; + int GENERIC_TRACED_OBJECT_OPERATION_COUNT = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 1; /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl Generic State}' class. @@ -961,6 +962,16 @@ public interface GenerictracePackage extends EPackage { */ EReference getGenericTracedObject_AllDimensions(); + /** + * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getDimensionsInternal() Get Dimensions Internal}' operation. + * + * + * @return the meta object for the 'Get Dimensions Internal' operation. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getDimensionsInternal() + * @generated + */ + EOperation getGenericTracedObject__GetDimensionsInternal(); + /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericState Generic State}'. * @@ -1233,6 +1244,14 @@ interface Literals { */ EReference GENERIC_TRACED_OBJECT__ALL_DIMENSIONS = eINSTANCE.getGenericTracedObject_AllDimensions(); + /** + * The meta object literal for the 'Get Dimensions Internal' operation. + * + * + * @generated + */ + EOperation GENERIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = eINSTANCE.getGenericTracedObject__GetDimensionsInternal(); + /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl Generic State}' class. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java index 3f82773b5..beb1d324a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java @@ -7,6 +7,7 @@ import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; @@ -158,6 +159,11 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { default: return -1; } } + if (baseClass == SequentialStep.class) { + switch (derivedFeatureID) { + default: return -1; + } + } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } @@ -174,6 +180,11 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { default: return -1; } } + if (baseClass == SequentialStep.class) { + switch (baseFeatureID) { + default: return -1; + } + } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java index 85f330eec..0258e21ce 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java @@ -6,7 +6,10 @@ import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl; +import java.lang.reflect.InvocationTargetException; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -122,6 +125,19 @@ public EList getAllDimensions() { return allDimensions; } + /** + * + * + * @generated + */ + public EList getDimensionsInternal() { + final EList result = new org.eclipse.emf.ecore.util.BasicInternalEList(Object.class); + result.addAll(super.getDimensionsInternal()); + result.addAll(getAllDimensions()); + return result; + + } + /** * * @@ -207,4 +223,34 @@ public boolean eIsSet(int featureID) { return super.eIsSet(featureID); } + /** + * + * + * @generated + */ + @Override + public int eDerivedOperationID(int baseOperationID, Class baseClass) { + if (baseClass == TracedObject.class) { + switch (baseOperationID) { + case TracePackage.TRACED_OBJECT___GET_DIMENSIONS_INTERNAL: return GenerictracePackage.GENERIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL; + default: return super.eDerivedOperationID(baseOperationID, baseClass); + } + } + return super.eDerivedOperationID(baseOperationID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case GenerictracePackage.GENERIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL: + return getDimensionsInternal(); + } + return super.eInvoke(operationID, arguments); + } + } //GenericTracedObjectImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java index 65f7d1940..e25e07368 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java @@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EGenericType; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.ETypeParameter; @@ -305,6 +306,15 @@ public EReference getGenericTracedObject_AllDimensions() { return (EReference)genericTracedObjectEClass.getEStructuralFeatures().get(1); } + /** + * + * + * @generated + */ + public EOperation getGenericTracedObject__GetDimensionsInternal() { + return genericTracedObjectEClass.getEOperations().get(0); + } + /** * * @@ -491,6 +501,7 @@ public void createPackageContents() { genericTracedObjectEClass = createEClass(GENERIC_TRACED_OBJECT); createEReference(genericTracedObjectEClass, GENERIC_TRACED_OBJECT__ORIGINAL_OBJECT); createEReference(genericTracedObjectEClass, GENERIC_TRACED_OBJECT__ALL_DIMENSIONS); + createEOperation(genericTracedObjectEClass, GENERIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL); genericStateEClass = createEClass(GENERIC_STATE); @@ -558,7 +569,7 @@ public void initializePackageContents() { // Add supertypes to classes g1 = createEGenericType(this.getGenericStep()); genericSequentialStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(theTracePackage.getBigStep()); + g1 = createEGenericType(theTracePackage.getSequentialStep()); EGenericType g2 = createEGenericType(this.getGenericStep()); g1.getETypeArguments().add(g2); g2 = createEGenericType(this.getGenericState()); @@ -620,6 +631,8 @@ public void initializePackageContents() { initEReference(getGenericTracedObject_OriginalObject(), theEcorePackage.getEObject(), null, "originalObject", null, 0, 1, GenericTracedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getGenericTracedObject_AllDimensions(), this.getGenericDimension(), null, "allDimensions", null, 0, -1, GenericTracedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEOperation(getGenericTracedObject__GetDimensionsInternal(), this.getGenericDimension(), "getDimensionsInternal", 0, -1, IS_UNIQUE, IS_ORDERED); + initEClass(genericStateEClass, GenericState.class, "GenericState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(genericTraceEClass, GenericTrace.class, "GenericTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java index a10980920..225ae8499 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java @@ -6,6 +6,7 @@ import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; @@ -148,6 +149,10 @@ public Adapter caseManyReferenceValue(ManyReferenceValue object) { return createBigStepAdapter(); } @Override + public , StateSubType extends State> Adapter caseSequentialStep(SequentialStep object) { + return createSequentialStepAdapter(); + } + @Override public > Adapter caseValue(Value object) { return createValueAdapter(); } @@ -439,6 +444,20 @@ public Adapter createBigStepAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep + * @generated + */ + public Adapter createSequentialStepAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java index 44d66c4dd..326755094 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java @@ -6,6 +6,7 @@ import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.SequentialStep; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; @@ -78,6 +79,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { GenericSequentialStep genericSequentialStep = (GenericSequentialStep)theEObject; T result = caseGenericSequentialStep(genericSequentialStep); if (result == null) result = caseGenericStep(genericSequentialStep); + if (result == null) result = caseSequentialStep(genericSequentialStep); if (result == null) result = caseBigStep(genericSequentialStep); if (result == null) result = caseStep(genericSequentialStep); if (result == null) result = defaultCase(theEObject); @@ -476,6 +478,21 @@ public T caseManyReferenceValue(ManyReferenceValue object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Sequential Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Sequential Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , StateSubType extends State> T caseSequentialStep(SequentialStep object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Value'. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF index 90bea06d4..176b5fcc4 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: fr.inria.diverse.tracemm.gemoctrace -Bundle-SymbolicName: fr.inria.diverse.trace.gemoc +Bundle-SymbolicName: fr.inria.diverse.trace.gemoc;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", @@ -16,4 +16,5 @@ Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", org.gemoc.commons.eclipse;bundle-version="0.1.0", org.eclipse.emf.compare Export-Package: fr.inria.diverse.trace.gemoc.traceaddon +Bundle-ActivationPolicy: lazy diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/plugin.xml b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/plugin.xml new file mode 100644 index 000000000..ce8c3f2e7 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/plugin.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index 784d3874f..6f0c779d8 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -60,9 +60,9 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi private BatchModelChangeListener listenerAddon - abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map exeToTraced) + abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map> exeToTraced) - abstract def IStateManager> constructStateManager(Resource modelResource, Map tracedToExe) + abstract def IStateManager> constructStateManager(Resource modelResource, Map, EObject> tracedToExe) abstract def boolean isAddonForTrace(EObject traceRoot) @@ -173,7 +173,7 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi val launchConfiguration = engine.extractLaunchConfiguration - val BiMap exeToTraced = HashBiMap.create + val BiMap> exeToTraced = HashBiMap.create // We construct the trace constructor, using the concrete generated method traceConstructor = constructTraceConstructor(modelResource, traceResource, exeToTraced) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java new file mode 100644 index 000000000..e4c42a2a0 --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java @@ -0,0 +1,98 @@ +package fr.inria.diverse.trace.gemoc.traceaddon; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.eclipse.emf.common.util.BasicEList; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.transaction.RecordingCommand; +import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.emf.transaction.util.TransactionUtil; +import org.gemoc.executionframework.engine.core.CommandExecution; + +import fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; +import fr.inria.diverse.trace.commons.model.generictrace.GenericState; +import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; +import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; +import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; +import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; +import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import fr.inria.diverse.trace.gemoc.api.IStateManager; + +public class GenericStateManager implements IStateManager> { + + private final Resource modelResource; + + private final Map, EObject> tracedToExe; + + public GenericStateManager(Resource modelResource, Map, EObject> tracedToExe) { + this.modelResource = modelResource; + this.tracedToExe = tracedToExe; + } + + @Override + public void restoreState(State state) { + + if (modelResource != null && state instanceof GenericState) { + try { + final TransactionalEditingDomain ed = TransactionUtil.getEditingDomain(modelResource); + if (ed != null) { + final RecordingCommand command = new RecordingCommand(ed, "") { + protected void doExecute() { + restoreStateExecute((GenericState) state); + } + }; + CommandExecution.execute(ed, command); + } + } catch (Exception e) { + throw e; + } + } + } + + public void restoreStateExecute(GenericState state) { + state.getValues().forEach(v -> { + GenericDimension dimension = (GenericDimension) v.eContainer(); + GenericTracedObject tracedObject = (GenericTracedObject) dimension.eContainer(); + EObject originalObject = tracedObject.getOriginalObject(); + if (originalObject == null) { + originalObject = tracedToExe.get(tracedObject); + } + if (v instanceof GenericAttributeValue) { + if (v instanceof IntegerAttributeValue) { + originalObject.eSet(dimension.getDynamicProperty(), ((IntegerAttributeValue) v).getAttributeValue()); + } else if (v instanceof BooleanAttributeValue) { + originalObject.eSet(dimension.getDynamicProperty(), ((BooleanAttributeValue) v).isAttributeValue()); + } else { + originalObject.eSet(dimension.getDynamicProperty(), ((StringAttributeValue) v).getAttributeValue()); + } + } else { + if (v instanceof SingleReferenceValue) { + final EObject refVal = ((SingleReferenceValue) v).getReferenceValue(); + if (refVal instanceof GenericTracedObject) { + final EObject exe = tracedToExe.get(refVal); + originalObject.eSet(dimension.getDynamicProperty(), exe); + } else { + originalObject.eSet(dimension.getDynamicProperty(), refVal); + } + } else { + final List values = new BasicEList(); + values.addAll(((ManyReferenceValue) v).getReferenceValues().stream().map(refVal -> { + if (refVal instanceof GenericTracedObject) { + return tracedToExe.get(refVal); + } else { + return refVal; + } + }).collect(Collectors.toList())); + originalObject.eSet(dimension.getDynamicProperty(), values); + } + } + }); + } +} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index 908f7cca0..19f629a50 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -11,7 +11,6 @@ package fr.inria.diverse.trace.gemoc.traceaddon; import java.util.Deque; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -54,6 +53,7 @@ import fr.inria.diverse.trace.commons.model.trace.MSEModel; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; public class GenericTraceConstructor implements ITraceConstructor { @@ -62,12 +62,14 @@ public class GenericTraceConstructor implements ITraceConstructor { private Resource executedModel; private MSEModel mseModel; private Resource traceResource; - private final Map exeToTraced = new HashMap<>(); + private final Map> exeToTraced; private final Deque context = new LinkedList<>(); private GenericState lastState; - private GenericTraceConstructor() { - + public GenericTraceConstructor(Resource executedModel, Resource traceResource, Map> exeToTraced) { + this.executedModel = executedModel; + this.traceResource = traceResource; + this.exeToTraced = exeToTraced; } private Set getAllExecutedModelResources() { @@ -94,7 +96,7 @@ public static boolean isDynamic(EStructuralFeature p) { private boolean addNewObjectToStateIfDynamic(EObject object, GenericState state) { final EClass c = object.eClass(); - final List mutableProperties = c.getEStructuralFeatures().stream() + final List mutableProperties = c.getEAllStructuralFeatures().stream() .filter(p -> isDynamic(p)) .collect(Collectors.toList()); if (isDynamic(object.eClass()) || !mutableProperties.isEmpty()) { @@ -104,7 +106,7 @@ private boolean addNewObjectToStateIfDynamic(EObject object, GenericState state) } @SuppressWarnings("unchecked") - private GenericValue getGenericValue(EObject object, EStructuralFeature mutableProperty) { + private GenericValue getGenericValue(EObject object, EStructuralFeature mutableProperty, GenericState state) { GenericValue result = null; if (mutableProperty instanceof EAttribute) { final EClassifier eType = mutableProperty.getEType(); @@ -126,13 +128,21 @@ private GenericValue getGenericValue(EObject object, EStructuralFeature mutableP final List modelElements = (List) object.eGet(mutableProperty); final ManyReferenceValue value = GenerictraceFactory.eINSTANCE.createManyReferenceValue(); for (EObject o : modelElements) { - value.getReferenceValues().add(exeToTraced.get(o)); + if (isDynamic(o.eClass())) { + value.getReferenceValues().add(exeToTraced.get(o)); + } else { + value.getReferenceValues().add(o); + } } result = value; } else { final EObject o = (EObject) object.eGet(mutableProperty); final SingleReferenceValue value = GenerictraceFactory.eINSTANCE.createSingleReferenceValue(); - value.setReferenceValue(exeToTraced.get(o)); + if (isDynamic(o.eClass())) { + value.setReferenceValue(exeToTraced.get(o)); + } else { + value.setReferenceValue(o); + } result = value; } } @@ -144,13 +154,15 @@ private boolean addNewObjectToState(EObject object, List mut boolean added = false; if (!exeToTraced.containsKey(object)) { final GenericTracedObject tracedObject = GenerictraceFactory.eINSTANCE.createGenericTracedObject(); - tracedObject.setOriginalObject(object); + if (!isDynamic(object.eClass())) { + tracedObject.setOriginalObject(object); + } exeToTraced.put(object, tracedObject); for (EStructuralFeature mutableProperty : mutableProperties) { final GenericDimension dimension = GenerictraceFactory.eINSTANCE.createGenericDimension(); GenericValue firstValue = null; dimension.setDynamicProperty(mutableProperty); - tracedObject.getDimensionsInternal().add(dimension); + tracedObject.getAllDimensions().add(dimension); if (mutableProperty instanceof EAttribute) { final EClassifier eType = mutableProperty.getEType(); if (eType == EcorePackage.Literals.EINT) { @@ -177,14 +189,17 @@ private boolean addNewObjectToState(EObject object, List mut firstValue = value; } else { final EObject o = (EObject) object.eGet(mutableProperty); - addNewObjectToStateIfDynamic(o, state); - final SingleReferenceValue value = GenerictraceFactory.eINSTANCE.createSingleReferenceValue(); - value.setReferenceValue(exeToTraced.get(o)); - firstValue = value; + if (o != null) { + addNewObjectToStateIfDynamic(o, state); + final SingleReferenceValue value = GenerictraceFactory.eINSTANCE.createSingleReferenceValue(); + value.setReferenceValue(exeToTraced.get(o)); + firstValue = value; + } } } if (firstValue != null) { dimension.getValues().add(firstValue); + state.getValues().add(firstValue); } } traceRoot.getTracedObjects().add(tracedObject); @@ -242,7 +257,7 @@ public void addState(List modelChanges) { else if (modelChange instanceof RemovedObjectModelChange) { stateChanged = true; final List values = newState.getValues(); - exeToTraced.get(o).getDimensionsInternal().forEach(d -> values.remove(d.getValues().get(d.getValues().size() - 1))); + ((GenericTracedObject) exeToTraced.get(o)).getAllDimensions().forEach(d -> values.remove(d.getValues().get(d.getValues().size() - 1))); } // Here we must look at non-collection mutable fields // We must rollback the last values from the copied state, and add new values as well @@ -251,17 +266,18 @@ else if (modelChange instanceof NonCollectionFieldModelChange) { stateChanged = true; EStructuralFeature p = ((NonCollectionFieldModelChange) modelChange).getChangedField(); // Rollback: we remove the last value of this field from the new state - final GenericTracedObject tracedObject = exeToTraced.get(o); + final GenericTracedObject tracedObject = (GenericTracedObject) exeToTraced.get(o); final GenericDimension dimension = tracedObject.getAllDimensions().stream() .filter(d -> d.getDynamicProperty() == p) .findFirst().orElse(null); if (dimension != null) { final List values = dimension.getValues(); - final GenericValue lastValue = values.get(values.size() - 1); + addNewObjectToStateIfDynamic((EObject) o.eGet(p), newState); + final GenericValue lastValue = values.isEmpty() ? null : values.get(values.size() - 1); if (lastValue != null) { newState.getValues().remove(lastValue); } - final GenericValue newValue = getGenericValue(o, p); + final GenericValue newValue = getGenericValue(o, p, newState); values.add(newValue); newState.getValues().add(newValue); } @@ -271,7 +287,7 @@ else if (modelChange instanceof NonCollectionFieldModelChange) { // If it changed we must rollback the last values from the copied state, and add new values as well else if (modelChange instanceof PotentialCollectionFieldModelChange) { final EStructuralFeature p = ((PotentialCollectionFieldModelChange) modelChange).getChangedField(); - final GenericTracedObject tracedObject = exeToTraced.get(o); + final GenericTracedObject tracedObject = (GenericTracedObject) exeToTraced.get(o); // We compare the last collection in the value sequence, and the current one in the potentially changed object final GenericDimension dimension = tracedObject.getAllDimensions().stream() .filter(d -> d.getDynamicProperty() == p) @@ -279,7 +295,7 @@ else if (modelChange instanceof PotentialCollectionFieldModelChange) { if (dimension != null) { final List dimensionValues = dimension.getValues(); final ManyReferenceValue lastValue = (ManyReferenceValue) dimensionValues.get(dimensionValues.size() - 1); - final List values = (List) tracedObject.eGet(p); + final List values = (List) o.eGet(p); for (EObject eObj : values) { addNewObjectToStateIfDynamic(eObj, newState); } @@ -305,7 +321,7 @@ else if (modelChange instanceof PotentialCollectionFieldModelChange) { // Rollback: we remove the last value of this field from the new state newState.getValues().remove(lastValue); // And we create a proper new value - GenericValue newValue = getGenericValue(o, p); + GenericValue newValue = getGenericValue(o, p, newState); dimension.getValues().add(newValue); newState.getValues().add(newValue); } @@ -353,7 +369,6 @@ public void addStep(Step step) { traceResource.getContents().add(mseModel); } mseModel.getOwnedMSEs().add(step_cast.getMseoccurrence().getMse()); - GenericState state = traceRoot.getStates().get(traceRoot.getStates().size() - 1); step_cast.setStartingState(state); if (!context.isEmpty() && context.getFirst() != null) { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java index c8d041375..06428d4f1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java @@ -14,44 +14,40 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; import fr.inria.diverse.trace.commons.model.trace.State; +import fr.inria.diverse.trace.commons.model.trace.Trace; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.gemoc.api.IStateManager; import fr.inria.diverse.trace.gemoc.api.IStepFactory; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; -import fr.inria.diverse.trace.gemoc.api.ITraceNotifier; public class GenericTraceEngineAddon extends AbstractTraceAddon { -// private GenericTraceStepFactory factory = null; + private GenericTraceStepFactory factory = null; @Override public IStepFactory getFactory() { - throw new UnsupportedOperationException(); -// if (factory == null) { -// factory = new GenericTraceStepFactory(); -// } -// return factory; + if (factory == null) { + factory = new GenericTraceStepFactory(); + } + return factory; } @Override - public ITraceConstructor constructTraceConstructor(Resource exeModel, - Resource traceResource, Map exeToTraced) { - throw new UnsupportedOperationException(); -// return new GenericTraceConstructor(traceResource); + public ITraceConstructor constructTraceConstructor(Resource modelResource, + Resource traceResource, Map> exeToTraced) { + return new GenericTraceConstructor(modelResource, traceResource, exeToTraced); } @Override public boolean isAddonForTrace(EObject traceRoot) { - throw new UnsupportedOperationException(); -// return true; + return traceRoot instanceof Trace; } @Override - public IStateManager> constructStateManager(Resource modelResource, Map tracedToExe) { - throw new UnsupportedOperationException(); -// return null; + public IStateManager> constructStateManager(Resource modelResource, Map, EObject> tracedToExe) { + return new GenericStateManager(modelResource, tracedToExe); } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index 21e1e99db..ff5678cdd 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -46,6 +46,11 @@ import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; +import fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; +import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; +import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; +import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; @@ -481,7 +486,18 @@ public String getValueDescription(Value value) { return ""; } String description = getDimensionLabel((Dimension) value.eContainer()) + " : "; - final String attributeName = getValueName(value); + final String attributeName; + if (value instanceof GenericValue) { + if (value instanceof GenericAttributeValue) { + attributeName = "attributeValue"; + } else if (value instanceof SingleReferenceValue) { + attributeName = "referenceValue"; + } else { + attributeName = "referenceValues"; + } + } else { + attributeName = getValueName(value); + } if (attributeName.length() > 0) { final Optional attribute = value.eClass().getEAllStructuralFeatures().stream() .filter(r -> r.getName().equals(attributeName)).findFirst(); @@ -506,18 +522,29 @@ public String getDimensionLabel(Dimension dimension) { EObject container = dimension.eContainer(); final String modelElement; if (container != null) { - Object originalObject = getOriginalObject(container); + Object originalObject; + if (container instanceof GenericTracedObject) { + originalObject = ((GenericTracedObject) container).getOriginalObject(); + } else { + originalObject = getOriginalObject(container); + } if (originalObject != null) { - modelElement = nameProvider.getFullyQualifiedName((EObject) originalObject).getLastSegment() + "."; + final QualifiedName fqn = nameProvider.getFullyQualifiedName((EObject) originalObject); + modelElement = fqn == null ? "" : fqn.getLastSegment() + "."; } else { modelElement = ""; } } else { modelElement = ""; } - final String dimensionName = dimension.eClass().getName(); - final String tmp = dimensionName.substring(0, dimensionName.indexOf("_Dimension")); - final String result = tmp.substring(tmp.lastIndexOf("_") + 1); + final String result; + if (dimension instanceof GenericDimension) { + result = ((GenericDimension) dimension).getDynamicProperty().getName(); + } else { + final String dimensionName = dimension.eClass().getName(); + final String tmp = dimensionName.substring(0, dimensionName.indexOf("_Dimension")); + result = tmp.substring(tmp.lastIndexOf("_") + 1); + } return modelElement + result; }); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java index c1fb33453..8f1c0298d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java @@ -14,6 +14,7 @@ import fr.inria.diverse.trace.commons.model.trace.MSE; import fr.inria.diverse.trace.commons.model.trace.Step; +import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; import fr.inria.diverse.trace.gemoc.api.IStepFactory; @@ -21,7 +22,13 @@ public class GenericTraceStepFactory implements IStepFactory { @Override public Step createStep(MSE mse, List parameters, List result) { - return GenerictraceFactory.eINSTANCE.createGenericSequentialStep(); + final GenericSequentialStep step = GenerictraceFactory.eINSTANCE.createGenericSequentialStep(); + fr.inria.diverse.trace.commons.model.trace.MSEOccurrence mseocc = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEOccurrence(); + mseocc.setMse(mse); + mseocc.getParameters().addAll(parameters); + mseocc.getResult().addAll(result); + step.setMseoccurrence(mseocc); + return step; } } From cfd88dc7fcd88e0f0a9511bbb2d8ec6b5e7505e3 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 20 Feb 2017 10:25:01 +0100 Subject: [PATCH 105/267] remove exactType from basic melange template --- .../templates/SequentialLanguage/java/$melangeFileName$.melange | 1 - 1 file changed, 1 deletion(-) diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/templates/SequentialLanguage/java/$melangeFileName$.melange b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/templates/SequentialLanguage/java/$melangeFileName$.melange index 93cc7ab49..0ddc550da 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/templates/SequentialLanguage/java/$melangeFileName$.melange +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/templates/SequentialLanguage/java/$melangeFileName$.melange @@ -4,5 +4,4 @@ language $metamodelName$ { syntax "platform:/resource/$ecoreFilePath$" $listOfAspects$ - exactType $metamodelName$MT } \ No newline at end of file From 85a08e9e147409f6d2a9bdaafd2b96aadbfc0d66 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 20 Feb 2017 11:50:11 +0100 Subject: [PATCH 106/267] send error messages to the logger rather than to the console --- .../javaxdsml/ide/ui/templates/SequentialTemplate.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java index cd6726ef0..67ca2c468 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java @@ -128,10 +128,9 @@ public static Set getAspectClassesList(IProject k3IProject){ } } } catch (IOException e) { - // ... + Activator.error(e.getMessage(), e); } catch (CoreException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Activator.error(e.getMessage(), e); } } } From f2fc66cbf4930c30600ddc52c587bcdf20a8202c Mon Sep 17 00:00:00 2001 From: d-leroy Date: Mon, 13 Mar 2017 09:53:36 +0100 Subject: [PATCH 107/267] Updated benchmark infrastructure, added domain-specific code building generic traces & various minor fixes --- ...scientGenericSequentialModelDebugger.xtend | 2 +- .../PlainK3DebugModelPresentation.java | 12 +- .../tabs/LaunchConfigurationMainTab.java | 2 +- .../model/GenericTrace.ecore | 174 +- .../model/GenericTraceImpl.ecore | 118 +- .../model/LaunchConfiguration.ecore | 32 +- .../generictrace/GenerictraceFactory.java | 27 + .../generictrace/GenerictracePackage.java | 265 +- .../ManyBooleanAttributeValue.java | 40 + .../ManyIntegerAttributeValue.java | 40 + .../ManyStringAttributeValue.java | 40 + .../impl/GenerictraceFactoryImpl.java | 33 + .../impl/GenerictracePackageImpl.java | 99 + .../impl/ManyBooleanAttributeValueImpl.java | 147 ++ .../impl/ManyIntegerAttributeValueImpl.java | 147 ++ .../impl/ManyStringAttributeValueImpl.java | 147 ++ .../util/GenerictraceAdapterFactory.java | 54 + .../generictrace/util/GenerictraceSwitch.java | 72 + .../GenericEngineTraceAddonGenerator.xtend | 52 +- .../gemoc/traceaddon/AbstractTraceAddon.xtend | 53 +- .../gemoc/traceaddon/GenericStateManager.java | 18 +- .../traceaddon/GenericTraceConstructor.java | 13 +- .../traceaddon/GenericTraceEngineAddon.java | 10 +- .../traceaddon/GenericTraceExtractor.java | 4 +- .../generator/TraceMMGeneratorStates.xtend | 23 +- .../GenericTracePluginGenerator.xtend | 20 - ...GenericTraceConstructorGeneratorJava.xtend | 1030 ++++++++ .../codegen/StateManagerGeneratorJava.xtend | 106 +- .../TraceConstructorGeneratorJava.xtend | 6 +- .../MultidimensionalTimelineRenderer.java | 11 +- .../MultidimensionalTimelineViewPart.java | 2 + .../.classpath | 1 + .../2557-1_4-Clone.launch | 18 + .../2557-1_4-Generated.launch | 18 + .../2557-1_4-Generic.launch | 18 + .../2557-1_4-None.launch | 18 + .../META-INF/MANIFEST.MF | 24 +- .../ExecutionTraceModelImpl/2557-1_1.trace | 2278 +++++++++++++++++ .../ExecutionTraceModelImpl/2557-1_2.trace | 2150 ++++++++++++++++ .../ExecutionTraceModelImpl/2557-1_3.trace | 2150 ++++++++++++++++ .../ExecutionTraceModelImpl/2557-1_4.trace | 2150 ++++++++++++++++ .../ExecutionTraceModelImpl/2557-1_5.trace | 2150 ++++++++++++++++ .../ExecutionTraceModelImpl/2557-1_6.trace | 2150 ++++++++++++++++ .../ExecutionTraceModelImpl/2557-2_1.trace | 1774 +++++++++++++ .../ExecutionTraceModelImpl/2557-2_2.trace | 1774 +++++++++++++ .../ExecutionTraceModelImpl/2557-2_3.trace | 1774 +++++++++++++ .../ExecutionTraceModelImpl/2557-2_4.trace | 1774 +++++++++++++ .../ExecutionTraceModelImpl/2557-2_5.trace | 1774 +++++++++++++ .../ExecutionTraceModelImpl/2557-2_6.trace | 1774 +++++++++++++ .../ExecutionTraceModelImpl/3561-1_1.trace | 1627 ++++++++++++ .../ExecutionTraceModelImpl/3561-1_2.trace | 1627 ++++++++++++ .../ExecutionTraceModelImpl/3561-1_3.trace | 1627 ++++++++++++ .../ExecutionTraceModelImpl/3561-2_1.trace | 1627 ++++++++++++ .../ExecutionTraceModelImpl/3561-2_2.trace | 1627 ++++++++++++ .../ExecutionTraceModelImpl/3561-2_3.trace | 1627 ++++++++++++ .../ExampleBV1_false_false.trace | 960 +++++++ .../ExampleBV1_false_true.trace | 1160 +++++++++ .../ExampleBV1_true_false.trace | 1060 ++++++++ .../ExampleBV1_true_true.trace | 1060 ++++++++ .../ExampleBV2_false_false.trace | 960 +++++++ .../ExampleBV2_false_true.trace | 1160 +++++++++ .../ExampleBV2_true_false.trace | 1060 ++++++++ .../ExampleBV2_true_true.trace | 1060 ++++++++ .../ExampleBV3_false_false_false.trace | 1482 +++++++++++ .../ExampleBV3_false_false_true.trace | 1610 ++++++++++++ .../ExampleBV3_false_true_false.trace | 1482 +++++++++++ .../ExampleBV3_false_true_true.trace | 1482 +++++++++++ .../ExampleBV3_true_false_false.trace | 1354 ++++++++++ .../ExampleBV3_true_false_true.trace | 1354 ++++++++++ .../ExampleBV3_true_true_false.trace | 1354 ++++++++++ .../ExampleBV3_true_true_true.trace | 1354 ++++++++++ .../hireV1_false.trace | 569 ++++ .../ExecutionTraceModelImpl/hireV1_true.trace | 1316 ++++++++++ .../hireV2_false.trace | 608 +++++ .../ExecutionTraceModelImpl/hireV2_true.trace | 1669 ++++++++++++ .../hireV3_false.trace | 595 +++++ .../ExecutionTraceModelImpl/hireV3_true.trace | 1470 +++++++++++ .../hireV4_false.trace | 685 +++++ .../ExecutionTraceModelImpl/hireV4_true.trace | 1470 +++++++++++ .../GenericTraceImpl/2557-1_1.trace | 608 +++++ .../GenericTraceImpl/2557-1_2.trace | 593 +++++ .../GenericTraceImpl/2557-1_3.trace | 593 +++++ .../GenericTraceImpl/2557-1_4.trace | 593 +++++ .../GenericTraceImpl/2557-1_5.trace | 593 +++++ .../GenericTraceImpl/2557-1_6.trace | 593 +++++ .../GenericTraceImpl/2557-2_1.trace | 533 ++++ .../GenericTraceImpl/2557-2_2.trace | 533 ++++ .../GenericTraceImpl/2557-2_3.trace | 533 ++++ .../GenericTraceImpl/2557-2_4.trace | 533 ++++ .../GenericTraceImpl/2557-2_5.trace | 533 ++++ .../GenericTraceImpl/2557-2_6.trace | 533 ++++ .../GenericTraceImpl/3561-1_1.trace | 519 ++++ .../GenericTraceImpl/3561-1_2.trace | 519 ++++ .../GenericTraceImpl/3561-1_3.trace | 519 ++++ .../GenericTraceImpl/3561-2_1.trace | 519 ++++ .../GenericTraceImpl/3561-2_2.trace | 519 ++++ .../GenericTraceImpl/3561-2_3.trace | 519 ++++ .../ExampleBV1_false_false.trace | 411 +++ .../ExampleBV1_false_true.trace | 443 ++++ .../ExampleBV1_true_false.trace | 428 ++++ .../ExampleBV1_true_true.trace | 428 ++++ .../ExampleBV2_false_false.trace | 411 +++ .../ExampleBV2_false_true.trace | 443 ++++ .../ExampleBV2_true_false.trace | 428 ++++ .../ExampleBV2_true_true.trace | 428 ++++ .../ExampleBV3_false_false_false.trace | 519 ++++ .../ExampleBV3_false_false_true.trace | 536 ++++ .../ExampleBV3_false_true_false.trace | 521 ++++ .../ExampleBV3_false_true_true.trace | 521 ++++ .../ExampleBV3_true_false_false.trace | 506 ++++ .../ExampleBV3_true_false_true.trace | 506 ++++ .../ExampleBV3_true_true_false.trace | 506 ++++ .../ExampleBV3_true_true_true.trace | 506 ++++ .../GenericTraceImpl/hireV1_false.trace | 337 +++ .../GenericTraceImpl/hireV1_true.trace | 469 ++++ .../GenericTraceImpl/hireV2_false.trace | 358 +++ .../GenericTraceImpl/hireV2_true.trace | 531 ++++ .../GenericTraceImpl/hireV3_false.trace | 351 +++ .../GenericTraceImpl/hireV3_true.trace | 498 ++++ .../GenericTraceImpl/hireV4_false.trace | 366 +++ .../GenericTraceImpl/hireV4_true.trace | 498 ++++ .../SpecificTraceImpl/2557-1_1.trace | 551 ++++ .../SpecificTraceImpl/2557-1_2.trace | 537 ++++ .../SpecificTraceImpl/2557-1_3.trace | 537 ++++ .../SpecificTraceImpl/2557-1_4.trace | 537 ++++ .../SpecificTraceImpl/2557-1_5.trace | 537 ++++ .../SpecificTraceImpl/2557-1_6.trace | 537 ++++ .../SpecificTraceImpl/2557-2_1.trace | 483 ++++ .../SpecificTraceImpl/2557-2_2.trace | 483 ++++ .../SpecificTraceImpl/2557-2_3.trace | 483 ++++ .../SpecificTraceImpl/2557-2_4.trace | 483 ++++ .../SpecificTraceImpl/2557-2_5.trace | 483 ++++ .../SpecificTraceImpl/2557-2_6.trace | 483 ++++ .../SpecificTraceImpl/3561-1_1.trace | 475 ++++ .../SpecificTraceImpl/3561-1_2.trace | 475 ++++ .../SpecificTraceImpl/3561-1_3.trace | 475 ++++ .../SpecificTraceImpl/3561-2_1.trace | 475 ++++ .../SpecificTraceImpl/3561-2_2.trace | 475 ++++ .../SpecificTraceImpl/3561-2_3.trace | 475 ++++ .../ExampleBV1_false_false.trace | 369 +++ .../ExampleBV1_false_true.trace | 399 +++ .../ExampleBV1_true_false.trace | 385 +++ .../ExampleBV1_true_true.trace | 385 +++ .../ExampleBV2_false_false.trace | 369 +++ .../ExampleBV2_false_true.trace | 399 +++ .../ExampleBV2_true_false.trace | 385 +++ .../ExampleBV2_true_true.trace | 385 +++ .../ExampleBV3_false_false_false.trace | 467 ++++ .../ExampleBV3_false_false_true.trace | 483 ++++ .../ExampleBV3_false_true_false.trace | 469 ++++ .../ExampleBV3_false_true_true.trace | 469 ++++ .../ExampleBV3_true_false_false.trace | 455 ++++ .../ExampleBV3_true_false_true.trace | 455 ++++ .../ExampleBV3_true_true_false.trace | 455 ++++ .../ExampleBV3_true_true_true.trace | 455 ++++ .../SpecificTraceImpl/hireV1_false.trace | 299 +++ .../SpecificTraceImpl/hireV1_true.trace | 422 +++ .../SpecificTraceImpl/hireV2_false.trace | 317 +++ .../SpecificTraceImpl/hireV2_true.trace | 478 ++++ .../SpecificTraceImpl/hireV3_false.trace | 311 +++ .../SpecificTraceImpl/hireV3_true.trace | 448 ++++ .../SpecificTraceImpl/hireV4_false.trace | 325 +++ .../SpecificTraceImpl/hireV4_true.trace | 448 ++++ .../models/2557-1_1.aird | 1037 ++++++++ .../models/2557-1_1.xsad | 54 + .../models/2557-1_2.xsad | 60 + .../models/2557-1_3.xsad | 60 + .../models/2557-1_4.xsad | 60 + .../models/2557-1_5.xsad | 60 + .../models/2557-1_6.xsad | 60 + .../models/2557-2_1.xsad | 56 + .../models/2557-2_2.xsad | 56 + .../models/2557-2_3.xsad | 56 + .../models/2557-2_4.xsad | 56 + .../models/2557-2_5.xsad | 56 + .../models/2557-2_6.xsad | 56 + .../models/3561-1_1.xsad | 71 + .../models/3561-1_2.xsad | 71 + .../models/3561-1_3.xsad | 71 + .../models/3561-2_1.xsad | 71 + .../models/3561-2_2.xsad | 71 + .../models/3561-2_3.xsad | 71 + .../models/ExampleBV1_false_false.xsad | 48 + .../models/ExampleBV1_false_true.xsad | 48 + .../models/ExampleBV1_true_false.xsad | 48 + .../models/ExampleBV1_true_true.xsad | 48 + .../models/ExampleBV2_false_false.xsad | 47 + .../models/ExampleBV2_false_true.xsad | 47 + .../models/ExampleBV2_true_false.xsad | 47 + .../models/ExampleBV2_true_true.xsad | 47 + .../models/ExampleBV3_false_false_false.xsad | 62 + .../models/ExampleBV3_false_false_true.xsad | 62 + .../models/ExampleBV3_false_true_false.xsad | 62 + .../models/ExampleBV3_false_true_true.xsad | 62 + .../models/ExampleBV3_true_false_false.xsad | 62 + .../models/ExampleBV3_true_false_true.xsad | 62 + .../models/ExampleBV3_true_true_false.xsad | 62 + .../models/ExampleBV3_true_true_true.xsad | 62 + .../models/hireV1_false.xsad | 43 + .../models/hireV1_true.xsad | 43 + .../models/hireV2_false.xsad | 48 + .../models/hireV2_true.xsad | 48 + .../models/hireV3_false.xsad | 44 + .../models/hireV3_true.xsad | 44 + .../models/hireV4_false.xsad | 44 + .../models/hireV4_true.xsad | 44 + .../results.csv | 43 + .../diverse/trace/benchmark/Benchmark.xtend | 164 -- .../trace/benchmark/BenchmarkData.xtend | 76 + .../benchmark/BenchmarkMemoryTestSuite.xtend | 230 ++ .../benchmark/BenchmarkRunConfiguration.xtend | 80 - .../BenchmarkSingleJVMTestSuite.xtend | 202 ++ .../benchmark/BenchmarkTimeTestSuite.xtend | 160 ++ .../diverse/trace/benchmark/EngineHelper.java | 172 -- .../diverse/trace/benchmark/Language.java | 6 - .../diverse/trace/benchmark/Result.xtend | 73 - .../diverse/trace/benchmark/Results.xtend | 39 - .../trace/benchmark/XTextConverter.java | 45 + .../diverse/trace/benchmark/XTextFixer2.java | 45 + .../trace/benchmark/api/IDebuggerHelper.java | 3 +- .../debuggers/AbstractTraceDebugger.java | 98 - .../debuggers/DSTraceDebuggerHelper.xtend | 73 - .../debuggers/NoTraceDebuggerHelper.java | 77 - .../benchmark/debuggers/SnapshotDebugger.java | 127 - .../benchmark/languages/ActivityDiagram.xtend | 27 + .../languages/BenchmarkLanguage.xtend | 29 + .../benchmark/memory/MemoryAnalyzer.java | 133 +- .../runconf/BenchmarkRunConfiguration.xtend | 93 + .../benchmark/start/BenchmarkStart.xtend | 112 - .../tracingcases/BenchmarkTracingCase.xtend | 36 + .../tracingcases/CloneBasedTracingCase.xtend | 8 + .../tracingcases/GeneratedTracingCase.xtend | 9 + .../tracingcases/GenericTracingCase.xtend | 9 + .../tracingcases/HybridTracingCase.xtend | 8 + .../tracingcases/NoTracingCase.xtend | 7 + .../BenchmarkExecutionModelContext.xtend | 14 + .../benchmark/utils/BenchmarkHelpers.xtend | 156 ++ .../trace/benchmark/utils/CSVHelper.xtend | 51 + .../trace/benchmark/utils/CSVLine.xtend | 37 + .../trace/benchmark/utils/EngineHelper.java | 89 + .../benchmark/utils/MemoryCSVHelper.xtend | 36 + .../benchmark/utils/PDETestListener.java | 137 + .../utils/PDETestResultsCollector.java | 41 + .../model/originals/2557-1.xmi | 255 +- .../model/originals/2557-2.xmi | 2 +- .../model/originals/hireV1.xmi | 26 +- .../.classpath | 2 +- 247 files changed, 109174 insertions(+), 1557 deletions(-) create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyBooleanAttributeValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyIntegerAttributeValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyStringAttributeValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java create mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Clone.launch create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generated.launch create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generic.launch create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-None.launch create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_4.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_5.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_6.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_4.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_5.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_6.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_4.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_5.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_6.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_4.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_5.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_6.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_4.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_5.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_6.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_4.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_5.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_6.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_1.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_2.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_3.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_false.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_true.trace create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.aird create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_2.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_3.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_4.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_5.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_6.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_1.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_2.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_3.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_4.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_5.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_6.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_1.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_2.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_3.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_1.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_2.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_3.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_false.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_true.xsad create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/output_memory_08-03-2017_16-32-39/results.csv delete mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Benchmark.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkData.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkMemoryTestSuite.xtend delete mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkRunConfiguration.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkSingleJVMTestSuite.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkTimeTestSuite.xtend delete mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/EngineHelper.java delete mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Result.xtend delete mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Results.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextConverter.java create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextFixer2.java delete mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/AbstractTraceDebugger.java delete mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/DSTraceDebuggerHelper.xtend delete mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/NoTraceDebuggerHelper.java delete mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/SnapshotDebugger.java create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/ActivityDiagram.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/BenchmarkLanguage.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend delete mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/start/BenchmarkStart.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/BenchmarkTracingCase.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/CloneBasedTracingCase.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GeneratedTracingCase.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GenericTracingCase.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/HybridTracingCase.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/NoTracingCase.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkHelpers.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVHelper.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVLine.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/EngineHelper.java create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/MemoryCSVHelper.xtend create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestListener.java create mode 100644 trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestResultsCollector.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend index 383a50bc0..a43d2575e 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend @@ -278,7 +278,7 @@ public class OmniscientGenericSequentialModelDebugger extends GenericSequentialM if (executedModelRoot != null) { try { if(!callerStack.empty){ - updateData(threadName, callerStack.findFirst[true]) + updateData(threadName, callerStack.findFirst[true]) } else { } diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java index 747b4cb57..d0de61014 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java @@ -13,6 +13,7 @@ import org.eclipse.emf.common.notify.Adapter; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Display; import org.gemoc.execution.sequential.javaengine.ui.Activator; import fr.obeo.dsl.debug.DebugTarget; @@ -42,11 +43,18 @@ public String getText(Object element) { return super.getText(element); } + private Image image; + @Override public Image getImage(Object element) { if (element instanceof DSLDebugTargetAdapter || element instanceof DSLThreadAdapter) { - ImageDescriptor id = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/debugt_obj.png"); - return id.createImage(); + ImageDescriptor descriptor = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/debugt_obj.png"); + Image cachedImage = imagesCache.get(descriptor); + if (cachedImage == null) { + cachedImage = new Image(Display.getDefault(), descriptor.getImageData()); + imagesCache.put(descriptor, cachedImage); + } + return image; } return super.getImage(element); } diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index 459fa03bb..546b16248 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -589,7 +589,7 @@ private void updateMainElementName(){ if(mainElement != null){ org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider nameprovider = new DefaultDeclarativeQualifiedNameProvider(); QualifiedName qname = nameprovider.getFullyQualifiedName(mainElement); - String objectName = qname != null ? qname.toString(): mainElement.toString(); + String objectName = qname != null ? qname.toString(): mainElement.toString(); String prettyName = objectName+ " : "+mainElement.eClass().getName(); _entryPointModelElementLabel.setText(prettyName); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index 9c6c34a16..a2c748cfa 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -1,159 +1,153 @@ - + - - - - - - - + + + - - - - - - - - + + + - + - - + +
- - +
- - - - - - - + + - + - - - + + + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - - + + + - - + + - - + + - - - + + + - + - + - + - - - - - + + - - + + - - + + + - + @@ -161,55 +155,61 @@
- + - +
- + - + - - + + - + - - + + - + - + - - + + - - + + - - + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore index 56b9a4465..23713c3c7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore @@ -1,95 +1,93 @@ - + - - - - - + + + + - - - + + + - - - - - - + + + - +
- - - - - - - + + + + - - - - + + + - + - - - - - + + + + - - - - - + + + - - - - + + - - - - + + + + + + + + + + + - - - + + - - - + + - - - - + + - - - - + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore index cfa0528a1..909c76c5c 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore @@ -1,23 +1,23 @@ - + - - - - + + - - - + - - - - - - - - + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java index e842bb2ff..ce3b8572c 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java @@ -111,6 +111,33 @@ public interface GenerictraceFactory extends EFactory { */ StringAttributeValue createStringAttributeValue(); + /** + * Returns a new object of class 'Many Boolean Attribute Value'. + * + * + * @return a new object of class 'Many Boolean Attribute Value'. + * @generated + */ + ManyBooleanAttributeValue createManyBooleanAttributeValue(); + + /** + * Returns a new object of class 'Many Integer Attribute Value'. + * + * + * @return a new object of class 'Many Integer Attribute Value'. + * @generated + */ + ManyIntegerAttributeValue createManyIntegerAttributeValue(); + + /** + * Returns a new object of class 'Many String Attribute Value'. + * + * + * @return a new object of class 'Many String Attribute Value'. + * @generated + */ + ManyStringAttributeValue createManyStringAttributeValue(); + /** * Returns a new object of class 'Single Reference Value'. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java index 409664a2a..b49ce18fc 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java @@ -68,7 +68,7 @@ public interface GenerictracePackage extends EPackage { * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericStep() * @generated */ - int GENERIC_STEP = 12; + int GENERIC_STEP = 15; /** * The feature id for the 'Mseoccurrence' containment reference. @@ -297,7 +297,7 @@ public interface GenerictracePackage extends EPackage { * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericValue() * @generated */ - int GENERIC_VALUE = 13; + int GENERIC_VALUE = 16; /** * The feature id for the 'States' reference list. @@ -767,6 +767,144 @@ public interface GenerictracePackage extends EPackage { */ int STRING_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl Many Boolean Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyBooleanAttributeValue() + * @generated + */ + int MANY_BOOLEAN_ATTRIBUTE_VALUE = 12; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int MANY_BOOLEAN_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + + /** + * The feature id for the 'Attribute Value' attribute list. + * + * + * @generated + * @ordered + */ + int MANY_BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Many Boolean Attribute Value' class. + * + * + * @generated + * @ordered + */ + int MANY_BOOLEAN_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Many Boolean Attribute Value' class. + * + * + * @generated + * @ordered + */ + int MANY_BOOLEAN_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl Many Integer Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyIntegerAttributeValue() + * @generated + */ + int MANY_INTEGER_ATTRIBUTE_VALUE = 13; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int MANY_INTEGER_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + + /** + * The feature id for the 'Attribute Value' attribute list. + * + * + * @generated + * @ordered + */ + int MANY_INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Many Integer Attribute Value' class. + * + * + * @generated + * @ordered + */ + int MANY_INTEGER_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Many Integer Attribute Value' class. + * + * + * @generated + * @ordered + */ + int MANY_INTEGER_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl Many String Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyStringAttributeValue() + * @generated + */ + int MANY_STRING_ATTRIBUTE_VALUE = 14; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int MANY_STRING_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + + /** + * The feature id for the 'Attribute Value' attribute list. + * + * + * @generated + * @ordered + */ + int MANY_STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Many String Attribute Value' class. + * + * + * @generated + * @ordered + */ + int MANY_STRING_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Many String Attribute Value' class. + * + * + * @generated + * @ordered + */ + int MANY_STRING_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; + /** * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl Single Reference Value}' class. * @@ -775,7 +913,7 @@ public interface GenerictracePackage extends EPackage { * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getSingleReferenceValue() * @generated */ - int SINGLE_REFERENCE_VALUE = 14; + int SINGLE_REFERENCE_VALUE = 17; /** * The feature id for the 'States' reference list. @@ -821,7 +959,7 @@ public interface GenerictracePackage extends EPackage { * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyReferenceValue() * @generated */ - int MANY_REFERENCE_VALUE = 15; + int MANY_REFERENCE_VALUE = 18; /** * The feature id for the 'States' reference list. @@ -866,7 +1004,7 @@ public interface GenerictracePackage extends EPackage { * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getISerializable() * @generated */ - int ISERIALIZABLE = 16; + int ISERIALIZABLE = 19; /** @@ -1065,6 +1203,69 @@ public interface GenerictracePackage extends EPackage { */ EAttribute getStringAttributeValue_AttributeValue(); + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue Many Boolean Attribute Value}'. + * + * + * @return the meta object for class 'Many Boolean Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue + * @generated + */ + EClass getManyBooleanAttributeValue(); + + /** + * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue#getAttributeValue Attribute Value}'. + * + * + * @return the meta object for the attribute list 'Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue#getAttributeValue() + * @see #getManyBooleanAttributeValue() + * @generated + */ + EAttribute getManyBooleanAttributeValue_AttributeValue(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue Many Integer Attribute Value}'. + * + * + * @return the meta object for class 'Many Integer Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue + * @generated + */ + EClass getManyIntegerAttributeValue(); + + /** + * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue#getAttributeValue Attribute Value}'. + * + * + * @return the meta object for the attribute list 'Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue#getAttributeValue() + * @see #getManyIntegerAttributeValue() + * @generated + */ + EAttribute getManyIntegerAttributeValue_AttributeValue(); + + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue Many String Attribute Value}'. + * + * + * @return the meta object for class 'Many String Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue + * @generated + */ + EClass getManyStringAttributeValue(); + + /** + * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue#getAttributeValue Attribute Value}'. + * + * + * @return the meta object for the attribute list 'Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue#getAttributeValue() + * @see #getManyStringAttributeValue() + * @generated + */ + EAttribute getManyStringAttributeValue_AttributeValue(); + /** * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericStep Generic Step}'. * @@ -1336,6 +1537,60 @@ interface Literals { */ EAttribute STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getStringAttributeValue_AttributeValue(); + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl Many Boolean Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyBooleanAttributeValue() + * @generated + */ + EClass MANY_BOOLEAN_ATTRIBUTE_VALUE = eINSTANCE.getManyBooleanAttributeValue(); + + /** + * The meta object literal for the 'Attribute Value' attribute list feature. + * + * + * @generated + */ + EAttribute MANY_BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getManyBooleanAttributeValue_AttributeValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl Many Integer Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyIntegerAttributeValue() + * @generated + */ + EClass MANY_INTEGER_ATTRIBUTE_VALUE = eINSTANCE.getManyIntegerAttributeValue(); + + /** + * The meta object literal for the 'Attribute Value' attribute list feature. + * + * + * @generated + */ + EAttribute MANY_INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getManyIntegerAttributeValue_AttributeValue(); + + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl Many String Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyStringAttributeValue() + * @generated + */ + EClass MANY_STRING_ATTRIBUTE_VALUE = eINSTANCE.getManyStringAttributeValue(); + + /** + * The meta object literal for the 'Attribute Value' attribute list feature. + * + * + * @generated + */ + EAttribute MANY_STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getManyStringAttributeValue_AttributeValue(); + /** * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStepImpl Generic Step}' class. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyBooleanAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyBooleanAttributeValue.java new file mode 100644 index 000000000..b152a89a4 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyBooleanAttributeValue.java @@ -0,0 +1,40 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import org.eclipse.emf.common.util.EList; + +/** + * + * A representation of the model object 'Many Boolean Attribute Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue#getAttributeValue Attribute Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyBooleanAttributeValue() + * @model + * @generated + */ +public interface ManyBooleanAttributeValue extends GenericAttributeValue { + /** + * Returns the value of the 'Attribute Value' attribute list. + * The list contents are of type {@link java.lang.Boolean}. + * + *

+ * If the meaning of the 'Attribute Value' attribute list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Attribute Value' attribute list. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyBooleanAttributeValue_AttributeValue() + * @model default="false" + * @generated + */ + EList getAttributeValue(); + +} // ManyBooleanAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyIntegerAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyIntegerAttributeValue.java new file mode 100644 index 000000000..5a286a800 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyIntegerAttributeValue.java @@ -0,0 +1,40 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import org.eclipse.emf.common.util.EList; + +/** + * + * A representation of the model object 'Many Integer Attribute Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue#getAttributeValue Attribute Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyIntegerAttributeValue() + * @model + * @generated + */ +public interface ManyIntegerAttributeValue extends GenericAttributeValue { + /** + * Returns the value of the 'Attribute Value' attribute list. + * The list contents are of type {@link java.lang.Integer}. + * + *

+ * If the meaning of the 'Attribute Value' attribute list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Attribute Value' attribute list. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyIntegerAttributeValue_AttributeValue() + * @model + * @generated + */ + EList getAttributeValue(); + +} // ManyIntegerAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyStringAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyStringAttributeValue.java new file mode 100644 index 000000000..4c41e8017 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyStringAttributeValue.java @@ -0,0 +1,40 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + +import org.eclipse.emf.common.util.EList; + +/** + * + * A representation of the model object 'Many String Attribute Value'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue#getAttributeValue Attribute Value}
    • + *
+ * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyStringAttributeValue() + * @model + * @generated + */ +public interface ManyStringAttributeValue extends GenericAttributeValue { + /** + * Returns the value of the 'Attribute Value' attribute list. + * The list contents are of type {@link java.lang.String}. + * + *

+ * If the meaning of the 'Attribute Value' attribute list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Attribute Value' attribute list. + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyStringAttributeValue_AttributeValue() + * @model + * @generated + */ + EList getAttributeValue(); + +} // ManyStringAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java index acd9bbaf0..44764057a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java @@ -67,6 +67,9 @@ public EObject create(EClass eClass) { case GenerictracePackage.BOOLEAN_ATTRIBUTE_VALUE: return createBooleanAttributeValue(); case GenerictracePackage.INTEGER_ATTRIBUTE_VALUE: return createIntegerAttributeValue(); case GenerictracePackage.STRING_ATTRIBUTE_VALUE: return createStringAttributeValue(); + case GenerictracePackage.MANY_BOOLEAN_ATTRIBUTE_VALUE: return createManyBooleanAttributeValue(); + case GenerictracePackage.MANY_INTEGER_ATTRIBUTE_VALUE: return createManyIntegerAttributeValue(); + case GenerictracePackage.MANY_STRING_ATTRIBUTE_VALUE: return createManyStringAttributeValue(); case GenerictracePackage.SINGLE_REFERENCE_VALUE: return createSingleReferenceValue(); case GenerictracePackage.MANY_REFERENCE_VALUE: return createManyReferenceValue(); default: @@ -204,6 +207,36 @@ public StringAttributeValue createStringAttributeValue() { return stringAttributeValue; } + /** + * + * + * @generated + */ + public ManyBooleanAttributeValue createManyBooleanAttributeValue() { + ManyBooleanAttributeValueImpl manyBooleanAttributeValue = new ManyBooleanAttributeValueImpl(); + return manyBooleanAttributeValue; + } + + /** + * + * + * @generated + */ + public ManyIntegerAttributeValue createManyIntegerAttributeValue() { + ManyIntegerAttributeValueImpl manyIntegerAttributeValue = new ManyIntegerAttributeValueImpl(); + return manyIntegerAttributeValue; + } + + /** + * + * + * @generated + */ + public ManyStringAttributeValue createManyStringAttributeValue() { + ManyStringAttributeValueImpl manyStringAttributeValue = new ManyStringAttributeValueImpl(); + return manyStringAttributeValue; + } + /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java index e25e07368..7db60ccfd 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java @@ -17,7 +17,10 @@ import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue; import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; +import fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue; import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; @@ -126,6 +129,27 @@ public class GenerictracePackageImpl extends EPackageImpl implements Generictrac */ private EClass stringAttributeValueEClass = null; + /** + * + * + * @generated + */ + private EClass manyBooleanAttributeValueEClass = null; + + /** + * + * + * @generated + */ + private EClass manyIntegerAttributeValueEClass = null; + + /** + * + * + * @generated + */ + private EClass manyStringAttributeValueEClass = null; + /** * * @@ -396,6 +420,60 @@ public EAttribute getStringAttributeValue_AttributeValue() { return (EAttribute)stringAttributeValueEClass.getEStructuralFeatures().get(0); } + /** + * + * + * @generated + */ + public EClass getManyBooleanAttributeValue() { + return manyBooleanAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getManyBooleanAttributeValue_AttributeValue() { + return (EAttribute)manyBooleanAttributeValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getManyIntegerAttributeValue() { + return manyIntegerAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getManyIntegerAttributeValue_AttributeValue() { + return (EAttribute)manyIntegerAttributeValueEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getManyStringAttributeValue() { + return manyStringAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getManyStringAttributeValue_AttributeValue() { + return (EAttribute)manyStringAttributeValueEClass.getEStructuralFeatures().get(0); + } + /** * * @@ -518,6 +596,15 @@ public void createPackageContents() { stringAttributeValueEClass = createEClass(STRING_ATTRIBUTE_VALUE); createEAttribute(stringAttributeValueEClass, STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + manyBooleanAttributeValueEClass = createEClass(MANY_BOOLEAN_ATTRIBUTE_VALUE); + createEAttribute(manyBooleanAttributeValueEClass, MANY_BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + + manyIntegerAttributeValueEClass = createEClass(MANY_INTEGER_ATTRIBUTE_VALUE); + createEAttribute(manyIntegerAttributeValueEClass, MANY_INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + + manyStringAttributeValueEClass = createEClass(MANY_STRING_ATTRIBUTE_VALUE); + createEAttribute(manyStringAttributeValueEClass, MANY_STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + genericStepEClass = createEClass(GENERIC_STEP); genericValueEClass = createEClass(GENERIC_VALUE); @@ -604,6 +691,9 @@ public void initializePackageContents() { booleanAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); integerAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); stringAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); + manyBooleanAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); + manyIntegerAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); + manyStringAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); g1 = createEGenericType(theTracePackage.getStep()); g2 = createEGenericType(this.getGenericState()); g1.getETypeArguments().add(g2); @@ -648,6 +738,15 @@ public void initializePackageContents() { initEClass(stringAttributeValueEClass, StringAttributeValue.class, "StringAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getStringAttributeValue_AttributeValue(), ecorePackage.getEString(), "attributeValue", null, 0, 1, StringAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(manyBooleanAttributeValueEClass, ManyBooleanAttributeValue.class, "ManyBooleanAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getManyBooleanAttributeValue_AttributeValue(), ecorePackage.getEBoolean(), "attributeValue", "false", 0, -1, ManyBooleanAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(manyIntegerAttributeValueEClass, ManyIntegerAttributeValue.class, "ManyIntegerAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getManyIntegerAttributeValue_AttributeValue(), ecorePackage.getEInt(), "attributeValue", null, 0, -1, ManyIntegerAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(manyStringAttributeValueEClass, ManyStringAttributeValue.class, "ManyStringAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getManyStringAttributeValue_AttributeValue(), ecorePackage.getEString(), "attributeValue", null, 0, -1, ManyStringAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(genericStepEClass, GenericStep.class, "GenericStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(genericValueEClass, GenericValue.class, "GenericValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java new file mode 100644 index 000000000..04fbb46c7 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java @@ -0,0 +1,147 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue; + +import java.util.Collection; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; + +/** + * + * An implementation of the model object 'Many Boolean Attribute Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl#getAttributeValue Attribute Value}
    • + *
+ * + * @generated + */ +public class ManyBooleanAttributeValueImpl extends GenericAttributeValueImpl implements ManyBooleanAttributeValue { + /** + * The cached value of the '{@link #getAttributeValue() Attribute Value}' attribute list. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected EList attributeValue; + + /** + * + * + * @generated + */ + protected ManyBooleanAttributeValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.MANY_BOOLEAN_ATTRIBUTE_VALUE; + } + + /** + * + * + * @generated + */ + public EList getAttributeValue() { + if (attributeValue == null) { + attributeValue = new EDataTypeUniqueEList(Boolean.class, this, GenerictracePackage.MANY_BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + } + return attributeValue; + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.MANY_BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return getAttributeValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.MANY_BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + getAttributeValue().clear(); + getAttributeValue().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.MANY_BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + getAttributeValue().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.MANY_BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return attributeValue != null && !attributeValue.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeValue: "); + result.append(attributeValue); + result.append(')'); + return result.toString(); + } + +} //ManyBooleanAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java new file mode 100644 index 000000000..693160d33 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java @@ -0,0 +1,147 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue; + +import java.util.Collection; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; + +/** + * + * An implementation of the model object 'Many Integer Attribute Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl#getAttributeValue Attribute Value}
    • + *
+ * + * @generated + */ +public class ManyIntegerAttributeValueImpl extends GenericAttributeValueImpl implements ManyIntegerAttributeValue { + /** + * The cached value of the '{@link #getAttributeValue() Attribute Value}' attribute list. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected EList attributeValue; + + /** + * + * + * @generated + */ + protected ManyIntegerAttributeValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.MANY_INTEGER_ATTRIBUTE_VALUE; + } + + /** + * + * + * @generated + */ + public EList getAttributeValue() { + if (attributeValue == null) { + attributeValue = new EDataTypeUniqueEList(Integer.class, this, GenerictracePackage.MANY_INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + } + return attributeValue; + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.MANY_INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return getAttributeValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.MANY_INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + getAttributeValue().clear(); + getAttributeValue().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.MANY_INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + getAttributeValue().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.MANY_INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return attributeValue != null && !attributeValue.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeValue: "); + result.append(attributeValue); + result.append(')'); + return result.toString(); + } + +} //ManyIntegerAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java new file mode 100644 index 000000000..77dbc6aff --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java @@ -0,0 +1,147 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue; + +import java.util.Collection; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; + +/** + * + * An implementation of the model object 'Many String Attribute Value'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl#getAttributeValue Attribute Value}
    • + *
+ * + * @generated + */ +public class ManyStringAttributeValueImpl extends GenericAttributeValueImpl implements ManyStringAttributeValue { + /** + * The cached value of the '{@link #getAttributeValue() Attribute Value}' attribute list. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected EList attributeValue; + + /** + * + * + * @generated + */ + protected ManyStringAttributeValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.MANY_STRING_ATTRIBUTE_VALUE; + } + + /** + * + * + * @generated + */ + public EList getAttributeValue() { + if (attributeValue == null) { + attributeValue = new EDataTypeUniqueEList(String.class, this, GenerictracePackage.MANY_STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + } + return attributeValue; + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.MANY_STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return getAttributeValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.MANY_STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + getAttributeValue().clear(); + getAttributeValue().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.MANY_STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + getAttributeValue().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.MANY_STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return attributeValue != null && !attributeValue.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeValue: "); + result.append(attributeValue); + result.append(')'); + return result.toString(); + } + +} //ManyStringAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java index 225ae8499..80f1a634a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java @@ -125,6 +125,18 @@ public Adapter caseStringAttributeValue(StringAttributeValue object) { return createStringAttributeValueAdapter(); } @Override + public Adapter caseManyBooleanAttributeValue(ManyBooleanAttributeValue object) { + return createManyBooleanAttributeValueAdapter(); + } + @Override + public Adapter caseManyIntegerAttributeValue(ManyIntegerAttributeValue object) { + return createManyIntegerAttributeValueAdapter(); + } + @Override + public Adapter caseManyStringAttributeValue(ManyStringAttributeValue object) { + return createManyStringAttributeValueAdapter(); + } + @Override public Adapter caseGenericStep(GenericStep object) { return createGenericStepAdapter(); } @@ -360,6 +372,48 @@ public Adapter createStringAttributeValueAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue Many Boolean Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue + * @generated + */ + public Adapter createManyBooleanAttributeValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue Many Integer Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue + * @generated + */ + public Adapter createManyIntegerAttributeValueAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue Many String Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue + * @generated + */ + public Adapter createManyStringAttributeValueAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericStep Generic Step}'. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java index 326755094..d7cf1af04 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java @@ -172,6 +172,33 @@ protected T doSwitch(int classifierID, EObject theEObject) { if (result == null) result = defaultCase(theEObject); return result; } + case GenerictracePackage.MANY_BOOLEAN_ATTRIBUTE_VALUE: { + ManyBooleanAttributeValue manyBooleanAttributeValue = (ManyBooleanAttributeValue)theEObject; + T result = caseManyBooleanAttributeValue(manyBooleanAttributeValue); + if (result == null) result = caseGenericAttributeValue(manyBooleanAttributeValue); + if (result == null) result = caseGenericValue(manyBooleanAttributeValue); + if (result == null) result = caseValue(manyBooleanAttributeValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.MANY_INTEGER_ATTRIBUTE_VALUE: { + ManyIntegerAttributeValue manyIntegerAttributeValue = (ManyIntegerAttributeValue)theEObject; + T result = caseManyIntegerAttributeValue(manyIntegerAttributeValue); + if (result == null) result = caseGenericAttributeValue(manyIntegerAttributeValue); + if (result == null) result = caseGenericValue(manyIntegerAttributeValue); + if (result == null) result = caseValue(manyIntegerAttributeValue); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GenerictracePackage.MANY_STRING_ATTRIBUTE_VALUE: { + ManyStringAttributeValue manyStringAttributeValue = (ManyStringAttributeValue)theEObject; + T result = caseManyStringAttributeValue(manyStringAttributeValue); + if (result == null) result = caseGenericAttributeValue(manyStringAttributeValue); + if (result == null) result = caseGenericValue(manyStringAttributeValue); + if (result == null) result = caseValue(manyStringAttributeValue); + if (result == null) result = defaultCase(theEObject); + return result; + } case GenerictracePackage.GENERIC_STEP: { GenericStep genericStep = (GenericStep)theEObject; T result = caseGenericStep(genericStep); @@ -388,6 +415,51 @@ public T caseStringAttributeValue(StringAttributeValue object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Many Boolean Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Many Boolean Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseManyBooleanAttributeValue(ManyBooleanAttributeValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Many Integer Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Many Integer Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseManyIntegerAttributeValue(ManyIntegerAttributeValue object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Many String Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Many String Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseManyStringAttributeValue(ManyStringAttributeValue object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Generic Step'. * diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index d8f193618..5ef25474c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -46,12 +46,8 @@ class GenericEngineTraceAddonGenerator { // Transient private var String packageQN private var String className -// private var String traceManagerClassName private var String traceConstructorClassName -// private var String traceExplorerClassName private var String stateManagerClassName -// private var String traceExtractorClassName -// private var String traceNotifierClassName private var String stepFactoryClassName private var TraceMMGenerationTraceability traceability private var Set genPackages @@ -96,12 +92,8 @@ class GenericEngineTraceAddonGenerator { // Retrieving some info from the plugin generation packageQN = GenericTracePluginGenerator.packageQN className = GenericTracePluginGenerator.languageName.replaceAll(" ", "").toFirstUpper + "EngineAddon" -// traceManagerClassName = GenericTracePluginGenerator.traceManagerClassName traceConstructorClassName = GenericTracePluginGenerator.traceConstructorClassName -// traceExplorerClassName = GenericTracePluginGenerator.traceExplorerClassName stateManagerClassName = GenericTracePluginGenerator.stateManagerClassName -// traceExtractorClassName = GenericTracePluginGenerator.traceExtractorClassName -// traceNotifierClassName = GenericTracePluginGenerator.traceNotifierClassName stepFactoryClassName = GenericTracePluginGenerator.languageName.replaceAll(" ", "").toFirstUpper + "StepFactory" traceability = GenericTracePluginGenerator.traceability genPackages = GenericTracePluginGenerator.referencedGenPackages @@ -195,6 +187,7 @@ import org.eclipse.emf.ecore.resource.Resource; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.gemoc.api.IStateManager; import fr.inria.diverse.trace.gemoc.api.IStepFactory; +import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon; @@ -203,54 +196,15 @@ public class «className» extends AbstractTraceAddon { private «stepFactoryClassName» factory = null; @Override - public ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map exeToTraced) { + public ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map> exeToTraced) { return new «traceConstructorClassName»(modelResource, traceResource, exeToTraced); } @Override - public IStateManager> constructStateManager(Resource modelResource, Map tracedToExe) { + public IStateManager> constructStateManager(Resource modelResource, Map, EObject> tracedToExe) { return new «stateManagerClassName»(modelResource, tracedToExe); } -««« @Override -««« public ITraceExplorer constructTraceExplorer(Resource traceResource) { -««« «traceExplorerClassName» explorer = new «traceExplorerClassName»(); -««« EObject root = traceResource.getContents().get(0); -««« if (root instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») { -««« explorer.loadTrace((«getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») root); -««« return explorer; -««« } -««« return null; -««« } -««« -««« @Override -««« public ITraceExplorer constructTraceExplorer(Resource modelResource, Resource traceResource, Map tracedToExe) { -««« «traceExplorerClassName» explorer = new «traceExplorerClassName»(tracedToExe); -««« EObject root = traceResource.getContents().get(0); -««« if (root instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») { -««« explorer.loadTrace(modelResource, («getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») root); -««« return explorer; -««« } -««« return null; -««« } -««« -««« @Override -««« public ITraceExtractor constructTraceExtractor(Resource traceResource) { -««« «traceExtractorClassName» extractor = new «traceExtractorClassName»(); -««« EObject root = traceResource.getContents().get(0); -««« if (root instanceof «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») { -««« extractor.loadTrace((«getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)») root); -««« return extractor; -««« } -««« return null; -««« } -««« -««« -««« @Override -««« public ITraceNotifier constructTraceNotifier(BatchModelChangeListener traceListener) { -««« return new «traceNotifierClassName»(traceListener); -««« } - @Override public IStepFactory getFactory() { if (factory == null) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index 6f0c779d8..b82729837 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -25,11 +25,15 @@ import fr.inria.diverse.trace.gemoc.api.ITraceExplorer import fr.inria.diverse.trace.gemoc.api.ITraceExtractor import fr.inria.diverse.trace.gemoc.api.ITraceListener import fr.inria.diverse.trace.gemoc.api.ITraceNotifier +import java.io.File +import java.io.FileOutputStream +import java.io.PrintWriter import java.util.ArrayList import java.util.HashSet import java.util.List import java.util.Map import java.util.Set +import java.util.function.Consumer import org.eclipse.emf.common.util.URI import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EPackage @@ -59,6 +63,8 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi private var boolean needTransaction = true private BatchModelChangeListener listenerAddon + + public static AbstractTraceAddon instance abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map> exeToTraced) @@ -121,10 +127,27 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi manageStep(step, false) } + private var String tmpAddFilePath = System.getProperty("tmpAddFileProperty") + private var File outputAddTmp + private var FileOutputStream outputAddTmpStream + private var PrintWriter outputAddTmpWriter + private var String tmpRestoreFilePath = System.getProperty("tmpRestoreFileProperty") + private var File outputRestoreTmp + private var FileOutputStream outputRestoreTmpStream + private var PrintWriter outputRestoreTmpWriter + protected var Consumer restoreLogger + protected def manageStep(Step step, boolean add) { if (step != null) { modifyTrace([ - traceConstructor.addState(listenerAddon.getChanges(this)) + if (outputAddTmpWriter != null) { + val t = System.nanoTime + traceConstructor.addState(listenerAddon.getChanges(this)) + outputAddTmpWriter.println((System.nanoTime - t)) + } else { + traceConstructor.addState(listenerAddon.getChanges(this)) + } + if (add) { traceConstructor.addStep(step) } else { @@ -145,11 +168,38 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi } } } + + override engineAboutToStop(IExecutionEngine engine) { +// val path = System.getProperty("saveTracePath") +// if (path != null && path.length > 0) { +// traceConstructor.save(URI.createFileURI(path)) +// } + for (var i = 0; i < traceExtractor.statesTraceLength; i++) { + traceExplorer.jump(traceExtractor.getState(i)) + } + if (outputAddTmpWriter != null) { + outputAddTmpStream.close + outputAddTmpWriter.close + outputRestoreTmpStream.close + outputRestoreTmpWriter.close + } + } /** * To construct the trace manager */ override engineAboutToStart(IExecutionEngine engine) { + + tmpAddFilePath = System.getProperty("tmpAddFileProperty") + outputAddTmp = if (tmpAddFilePath != null && tmpAddFilePath.length > 0) new File(tmpAddFilePath) else null + outputAddTmpStream = if (outputAddTmp !=null) new FileOutputStream(outputAddTmp) else null + outputAddTmpWriter = if (outputAddTmpStream != null) new PrintWriter(outputAddTmpStream, true) else null + tmpRestoreFilePath = System.getProperty("tmpRestoreFileProperty") + outputRestoreTmp = if (tmpRestoreFilePath != null && tmpRestoreFilePath.length > 0) new File(tmpRestoreFilePath) else null + outputRestoreTmpStream = if (outputRestoreTmp !=null) new FileOutputStream(outputRestoreTmp) else null + outputRestoreTmpWriter = if (outputRestoreTmpStream != null) new PrintWriter(outputRestoreTmpStream, true) else null + restoreLogger = [l|if (outputRestoreTmpWriter != null) outputRestoreTmpWriter.println(l)] + if (_executionContext == null) { _executionContext = engine.executionContext @@ -194,6 +244,7 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi traceNotifier.addListener(traceExplorer) } } + instance = this; } /** diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java index e4c42a2a0..7de79572a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java @@ -1,7 +1,12 @@ package fr.inria.diverse.trace.gemoc.traceaddon; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.PrintWriter; import java.util.List; import java.util.Map; +import java.util.function.Consumer; import java.util.stream.Collectors; import org.eclipse.emf.common.util.BasicEList; @@ -31,9 +36,12 @@ public class GenericStateManager implements IStateManager> { private final Map, EObject> tracedToExe; - public GenericStateManager(Resource modelResource, Map, EObject> tracedToExe) { + private final Consumer logger; + + public GenericStateManager(Resource modelResource, Map, EObject> tracedToExe, Consumer logger) { this.modelResource = modelResource; this.tracedToExe = tracedToExe; + this.logger = logger; } @Override @@ -45,7 +53,13 @@ public void restoreState(State state) { if (ed != null) { final RecordingCommand command = new RecordingCommand(ed, "") { protected void doExecute() { - restoreStateExecute((GenericState) state); + if (logger != null) { + long t = System.nanoTime(); + restoreStateExecute((GenericState) state); + logger.accept((System.nanoTime() - t)); + } else { + restoreStateExecute((GenericState) state); + } } }; CommandExecution.execute(ed, command); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index 19f629a50..e22256658 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -272,7 +272,10 @@ else if (modelChange instanceof NonCollectionFieldModelChange) { .findFirst().orElse(null); if (dimension != null) { final List values = dimension.getValues(); - addNewObjectToStateIfDynamic((EObject) o.eGet(p), newState); + final Object pValue = o.eGet(p); + if (pValue instanceof EObject) { + addNewObjectToStateIfDynamic((EObject) pValue, newState); + } final GenericValue lastValue = values.isEmpty() ? null : values.get(values.size() - 1); if (lastValue != null) { newState.getValues().remove(lastValue); @@ -344,14 +347,6 @@ else if (modelChange instanceof PotentialCollectionFieldModelChange) { } } -// private List> getSubSteps(Step step) { -// if (step instanceof BigStep) { -// return ((BigStep) step).getSubSteps(); -// } else { -// return Collections.emptyList(); -// } -// } - private void addImplicitStep(BigStep currentStep, GenericState startingState, GenericState endingState) { GenericSmallStep implicitStep = GenerictraceFactory.eINSTANCE.createGenericSmallStep(); implicitStep.setStartingState(startingState); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java index 06428d4f1..7a88aebcf 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java @@ -10,6 +10,9 @@ *******************************************************************************/ package fr.inria.diverse.trace.gemoc.traceaddon; +import java.io.File; +import java.io.FileOutputStream; +import java.io.PrintWriter; import java.util.Map; import org.eclipse.emf.ecore.EObject; @@ -26,6 +29,11 @@ public class GenericTraceEngineAddon extends AbstractTraceAddon { private GenericTraceStepFactory factory = null; + private final String tmpFilePath = System.getProperty("tmpFileProperty"); + private File outputTmp; + private FileOutputStream outputTmpStream; + private PrintWriter outputTmpWriter; + @Override public IStepFactory getFactory() { if (factory == null) { @@ -47,7 +55,7 @@ public boolean isAddonForTrace(EObject traceRoot) { @Override public IStateManager> constructStateManager(Resource modelResource, Map, EObject> tracedToExe) { - return new GenericStateManager(modelResource, tracedToExe); + return new GenericStateManager(modelResource, tracedToExe, restoreLogger); } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index ff5678cdd..70fb41012 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -560,7 +560,7 @@ private void updateEquivalenceClasses(List> states) { @Override public void statesAdded(List> states) { - updateEquivalenceClasses(states); +// updateEquivalenceClasses(states); notifyListeners(); } @@ -611,7 +611,7 @@ public List> getSteps(int firstStateIndex, int lastStateIndex) { final Step rootStep = trace.getRootStep(); if (rootStep instanceof BigStep) { final List> steps = new ArrayList<>(((BigStep) rootStep).getSubSteps()); - steps.removeIf(s -> s.getEndingState() != null && getStateIndex(s.getEndingState()) < firstStateIndex + steps.removeIf(s -> (s.getEndingState() != null && getStateIndex(s.getEndingState()) < firstStateIndex) || getStateIndex(s.getStartingState()) > lastStateIndex); return steps; } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index 77399d065..f978c82bb 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -140,7 +140,6 @@ class TraceMMGeneratorStates { return result } - private def boolean isXmofConfClassOf(EClass c, EClass s) { if (c.name.endsWith("Configuration") && c.name.startsWith(s.name)) { traceability.addXmofExeToConf(s,c) @@ -152,7 +151,7 @@ class TraceMMGeneratorStates { private def void getAllInheritance(Set result, EClass c) { if (!result.contains(c)) { result.add(c) - for (sup : c.ESuperTypes // TODO ugly fix to not include AS classes in the XMOF case, to remove at some point + for (sup : c.ESuperTypes // TODO ugly fix to not include AS classes in the XMOF case, to remove at some point .filter[s|! isXmofConfClassOf(c,s)]) { getAllInheritance(result, sup) } @@ -175,11 +174,23 @@ class TraceMMGeneratorStates { val extendedExistingClass = c.extendedExistingClass allRuntimeClasses.add(extendedExistingClass) runtimeClass2ClassExtension.put(extendedExistingClass, c) - allRuntimeClasses.addAll(getAllInheritance(extendedExistingClass)) + val allInheritance = getAllInheritance(extendedExistingClass) + allRuntimeClasses.addAll(allInheritance) + } + + val baseClassToNewEClass = new HashMap + + for (c : allNewEClasses) { + baseClassToNewEClass.put(mm.eAllContents.toSet.filter(EClass).findFirst[cls|cls.name == c.name], c) } for (c : allNewEClasses) { - allRuntimeClasses.addAll(getAllInheritance(c)) + val allInheritance = getAllInheritance(mm.eAllContents.toSet.filter(EClass).findFirst[cls|cls.name == c.name]) + allRuntimeClasses.addAll(allInheritance.map[cls| + val newEClass = baseClassToNewEClass.get(cls) + if (newEClass == null) cls + else newEClass + ]) } // We also store the dual set of classes not linked to anything dynamic @@ -195,7 +206,9 @@ class TraceMMGeneratorStates { val tracedClasses = new ArrayList // We go through all dynamic classes and we create traced versions of them // we sort them by name to ensure reproducibility of the generated ecore file - for (runtimeClass : allRuntimeClasses.sortBy[name]) { + val runtimeClasses = allRuntimeClasses.toList + val runtimeClassesSorted = runtimeClasses.sortBy[name] + for (runtimeClass : runtimeClassesSorted) { val tracedClass = handleTraceClass(runtimeClass) tracedClasses.add(tracedClass) } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend index dce46982f..ba36949eb 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend @@ -180,30 +180,10 @@ class GenericTracePluginGenerator { traceConstructorClassName = tconstructorgen.className packageFragment.createCompilationUnit(traceConstructorClassName + ".java", tconstructorgen.generateCode, true, m) -// // Generate trace explorer -// val TraceExplorerGeneratorJava texplorergen = new TraceExplorerGeneratorJava(languageName, -// pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, -// abstractSyntax, partialTraceManagement) -// traceExplorerClassName = texplorergen.className -// packageFragment.createCompilationUnit(traceExplorerClassName + ".java", texplorergen.generateCode, true, m) - // Generate state manager val StateManagerGeneratorJava statemanagergem = new StateManagerGeneratorJava(languageName, pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages) stateManagerClassName = statemanagergem.className packageFragment.createCompilationUnit(stateManagerClassName + ".java", statemanagergem.generateCode, true, m) - -// // Generate trace extractor -// val TraceExtractorGeneratorJava textractorgen = new TraceExtractorGeneratorJava(languageName, -// pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, -// abstractSyntax, partialTraceManagement) -// traceExtractorClassName = textractorgen.className -// packageFragment.createCompilationUnit(traceExtractorClassName + ".java", textractorgen.generateCode, true, m) - -// // Generate trace notifier -// val TraceNotifierGeneratorJava tnotifiergen = new TraceNotifierGeneratorJava(languageName, -// pluginName + ".tracemanager", tmmgenerator.traceability, referencedGenPackages) -// traceNotifierClassName = tnotifiergen.className -// packageFragment.createCompilationUnit(traceNotifierClassName + ".java", tnotifiergen.generateCode, true, m) } } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend new file mode 100644 index 000000000..d949faa6e --- /dev/null +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend @@ -0,0 +1,1030 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package fr.inria.diverse.trace.plugin.generator.codegen + +import ecorext.ClassExtension +import ecorext.Rule +import fr.inria.diverse.trace.commons.CodeGenUtil +import fr.inria.diverse.trace.commons.EcoreCraftingUtil +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage +import fr.inria.diverse.trace.commons.model.trace.TracePackage +import fr.inria.diverse.trace.commons.tracemetamodel.StepStrings +import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability +import fr.inria.diverse.trace.metamodel.generator.TraceMMStrings +import java.util.ArrayList +import java.util.Collection +import java.util.HashMap +import java.util.HashSet +import java.util.List +import java.util.Map +import java.util.Set +import org.eclipse.emf.codegen.ecore.genmodel.GenPackage +import org.eclipse.emf.ecore.EAttribute +import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EClassifier +import org.eclipse.emf.ecore.EOperation +import org.eclipse.emf.ecore.EPackage +import org.eclipse.emf.ecore.EReference +import org.eclipse.emf.ecore.EStructuralFeature +import org.eclipse.emf.ecore.EcorePackage + +class GenericTraceConstructorGeneratorJava { + + // Inputs + private val String className + private val String packageQN + private val EPackage traceMM + private val EPackage abstractSyntax + private val TraceMMGenerationTraceability traceability + private val Set refGenPackages + private val boolean gemoc + private val boolean partialTraceManagement + + // Transient + private boolean getExeToTracedUsed = false + + + // Shortcuts + private val EClass stateClass + private val EClass stepClass + private val EClass tracedObjectClass + private val EStructuralFeature tracedObjectOriginalObject + private val EClass dimensionClass + private val EClass singleIntegerAttributeValueClass + private val EClass singleBooleanAttributeValueClass + private val EClass singleStringAttributeValueClass + private val EClass singleReferenceValueClass + private val EClass manyIntegerAttributeValueClass + private val EClass manyBooleanAttributeValueClass + private val EClass manyStringAttributeValueClass + private val EClass manyReferenceValueClass + + private val String stateFQN + private val String specificStepFQN + private val String tracedObjectFQN + private val String dimensionFQN + private val String singleIntegerAttributeValueFQN + private val String singleBooleanAttributeValueFQN + private val String singleStringAttributeValueFQN + private val String singleReferenceValueFQN + private val String manyIntegerAttributeValueFQN + private val String manyBooleanAttributeValueFQN + private val String manyStringAttributeValueFQN + private val String manyReferenceValueFQN + + public def String getClassName() { + return className + } + + new(String languageName, String packageQN, EPackage traceMM, TraceMMGenerationTraceability traceability, + Set refGenPackages, boolean gemoc, EPackage abstractSyntax, boolean partialTraceManagement) { + this.traceMM = GenerictracePackage.eINSTANCE + this.className = languageName.replaceAll(" ", "").toFirstUpper + "GenericConstructor" + this.packageQN = packageQN + this.traceability = traceability + this.refGenPackages = refGenPackages + this.gemoc = gemoc + this.abstractSyntax = abstractSyntax + this.stateClass = GenerictracePackage.eINSTANCE.genericState + this.stepClass = GenerictracePackage.eINSTANCE.genericStep + this.tracedObjectClass = GenerictracePackage.eINSTANCE.genericTracedObject + this.tracedObjectOriginalObject = GenerictracePackage.eINSTANCE.genericTracedObject_OriginalObject + this.dimensionClass = GenerictracePackage.eINSTANCE.genericDimension + this.singleIntegerAttributeValueClass = GenerictracePackage.eINSTANCE.integerAttributeValue + this.singleBooleanAttributeValueClass = GenerictracePackage.eINSTANCE.booleanAttributeValue + this.singleStringAttributeValueClass = GenerictracePackage.eINSTANCE.stringAttributeValue + this.singleReferenceValueClass = GenerictracePackage.eINSTANCE.singleReferenceValue + this.manyIntegerAttributeValueClass = GenerictracePackage.eINSTANCE.manyIntegerAttributeValue + this.manyBooleanAttributeValueClass = GenerictracePackage.eINSTANCE.manyBooleanAttributeValue + this.manyStringAttributeValueClass = GenerictracePackage.eINSTANCE.manyStringAttributeValue + this.manyReferenceValueClass = GenerictracePackage.eINSTANCE.manyReferenceValue + this.partialTraceManagement = partialTraceManagement + this.stateFQN = getJavaFQN(stateClass) + this.specificStepFQN = getJavaFQN(stepClass) + this.tracedObjectFQN = getJavaFQN(tracedObjectClass) + this.dimensionFQN = getJavaFQN(dimensionClass) + this.singleIntegerAttributeValueFQN = getJavaFQN(singleIntegerAttributeValueClass) + this.singleBooleanAttributeValueFQN = getJavaFQN(singleBooleanAttributeValueClass) + this.singleStringAttributeValueFQN = getJavaFQN(singleStringAttributeValueClass) + this.singleReferenceValueFQN = getJavaFQN(singleReferenceValueClass) + this.manyIntegerAttributeValueFQN = getJavaFQN(manyIntegerAttributeValueClass) + this.manyBooleanAttributeValueFQN = getJavaFQN(manyBooleanAttributeValueClass) + this.manyStringAttributeValueFQN = getJavaFQN(manyStringAttributeValueClass) + this.manyReferenceValueFQN = getJavaFQN(manyReferenceValueClass) + } + + private def String getActualFQN(EClass c, Rule r) { + val EOperation o = r.operation + return EcoreCraftingUtil.getBaseFQN(c) + "." + o.name + } + + def Set findAllConcreteSubTypes(EClass clazz) { + traceability.allMutableClasses.filter[c|!c.isAbstract && c.EAllSuperTypes.contains(clazz)].toSet + } + + def Set findAllDirectConcreteSubTypes(EClass clazz) { + traceability.allMutableClasses.filter[c|!c.isAbstract && c.ESuperTypes.contains(clazz)].toSet + } + + def Set findAllDirectSubTypes(EClass clazz) { + traceability.allMutableClasses.filter[c|c.ESuperTypes.contains(clazz)].toSet + } + + private def String getFQN(EStructuralFeature eFeature) { + return EcoreCraftingUtil.getBaseFQN(eFeature.EContainingClass) + "." + eFeature.name + } + + private static def boolean isNotSuperTypeOf(EClass c, Collection eclasses) { + for (eclass : eclasses) { + if (eclass.EAllSuperTypes.contains(c)) + return false + } + return true + } + + private static def boolean hasSuperTypeIn(EClass c, Collection eclasses) { + for (eclass : eclasses) { + if (c.EAllSuperTypes.contains(eclass)) + return true + } + return false + } + + private def String getTracedJavaFQN(EClassifier c) { + return getTracedJavaFQN(c,false) + } + + private def String getTracedJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { + if (c instanceof EClass) { + val tracedClass = traceability.getTracedClass(c) + if (tracedClass != null) + return getJavaFQN(traceability.getTracedClass(c),enforcePrimitiveJavaClass) + else + return getJavaFQN(c,enforcePrimitiveJavaClass) + } else { + return getJavaFQN(c,enforcePrimitiveJavaClass) + } + } + + private def String getJavaFQN(EClassifier c) { + return getJavaFQN(c,false) + } + + private def String getJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { + return EcoreCraftingUtil.getJavaFQN(c,refGenPackages,enforcePrimitiveJavaClass) + } + + + private def String stringSetter(EStructuralFeature f, String value) { + EcoreCraftingUtil.stringSetter(f,value,refGenPackages) + } + + private def String stringSetter(String f, String value) { + EcoreCraftingUtil.stringSetter(f,value) + } + + + private static def Set findTopSuperClasses(Iterable eclasses) { + val res = new HashSet + for (c : eclasses) { + // TODO ugly fix to not include AS classes in the XMOF case, to remove at some point + val filtered = c.ESuperTypes.filter[s|! ( c.name.endsWith("Configuration") && c.name.startsWith(s.name))] + if (filtered.empty) { + res.add(c) + } else { + val candidates = findTopSuperClasses(filtered) + res.addAll(candidates) + } + } + return res + } + + private static def List partialOrderSort (Iterable eclasses) { + val List result = new ArrayList + for (ci : eclasses) { + if (result.isEmpty) + result.add(ci) + else { + var boolean found = false + for (var int i = 0; i < result.size && !found; i++) { + val Set followings = result.subList(i, result.size).toSet + if (ci.isNotSuperTypeOf(followings)) { + result.add(i, ci) + found = true + } + } + + if (!found) + result.add(ci) + } + } + return result + + } + + public def String generateCode() { + val String code = generateTraceConstructorClass() + try { + return CodeGenUtil.formatJavaCode(code) + } catch (Throwable t) { + return code + } + } + + private Map counters = new HashMap + + private def String uniqueVar(String s) { + if (!counters.containsKey(s)) { + counters.put(s, 0) + } + return s + counters.get(s) + } + + private def void incVar(String s) { + if (!counters.containsKey(s)) { + counters.put(s, 0) + } + counters.put(s, counters.get(s) + 1) + } + + public static def String getBaseFQN(Rule r) { + val EOperation o = r.operation + val EClass c = r.containingClass + return EcoreCraftingUtil.getBaseFQN(c) + "." + o.name + } + + private def EClassifier getEventParamRuntimeType(EStructuralFeature f) { + var EClass res = null + if (f instanceof EAttribute) { + // TODO + } else if (f instanceof EReference) { + val potentialRealRuntimeClass = traceability.getRealMutableClass(f.EReferenceType) + if (potentialRealRuntimeClass != null) { + // TODO here in the general case we need to find the exe class + res = potentialRealRuntimeClass + } else { + // TODO same here + res = f.EReferenceType + } + } + return res + } + + private def String stringGetterTracedValue(String javaVarName, EStructuralFeature p) { + val pRealType = traceability.getRealMutableClass(p.EType) + if (p instanceof EReference && traceability.hasTracedClass(pRealType as EClass)) { + return ''' + ((«getJavaFQN(traceability.getTracedClass(pRealType as EClass))»)exeToTraced.get(«javaVarName».«EcoreCraftingUtil.stringGetter(p)»)) + ''' + } else { + return javaVarName + "." + EcoreCraftingUtil.stringGetter(p) + } + } + + private def Set getAllMutablePropertiesOf(EClass exeClass) { + val Set res = new HashSet + res.addAll(traceability.getMutablePropertiesOf(exeClass)) + res.addAll(exeClass.EAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); + return res + } + + private def Set getAllNonEmptyMutableClasses() { + return traceability.allMutableClasses.filter[c|!c.allMutablePropertiesOf.empty].toSet + } + + + private def String generateImports() { + return + ''' + «IF getExeToTracedUsed» + import java.util.ArrayList; + «ENDIF» + import java.util.Collection; + import java.util.Deque; + import java.util.HashSet; + import java.util.LinkedList; + import java.util.List; + import java.util.Map; + import java.util.Set; + + import org.eclipse.emf.common.util.TreeIterator; + import org.eclipse.emf.common.util.URI; + import org.eclipse.emf.ecore.EObject; + import org.eclipse.emf.ecore.resource.Resource; + + import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; + import fr.inria.diverse.trace.commons.model.trace.MSEModel; + import fr.inria.diverse.trace.commons.model.trace.SequentialStep; + import fr.inria.diverse.trace.commons.model.trace.TracedObject; + import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; + ''' + } + + private def String generateFields() { + return + ''' + private «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)» traceRoot; + private MSEModel mseModel; + private Resource executedModel; + private final Map> exeToTraced; + + private «stateFQN» lastState; + + private Resource traceResource; + private final Deque<«specificStepFQN»> context = new LinkedList<«specificStepFQN»>(); + ''' + } + + private def String generateConstructor() { + return + ''' + public «className» (Resource exeModel, Resource traceResource, Map> exeToTraced) { + this.traceResource = traceResource; + this.executedModel = exeModel; + this.exeToTraced = exeToTraced; + } + ''' + } + + + private def String getExeToTracedMethodName() { + getExeToTracedUsed = true + return "getExeToTraced" + } + + private def String stringFeatureID(EStructuralFeature p) { + val containingClass = if (p.eContainer instanceof EClass) p.eContainer as EClassifier else (p.eContainer as ClassExtension).extendedExistingClass + return EcoreCraftingUtil.stringFeatureID(p,containingClass,refGenPackages) + } + + private def String generateGetAllResourcesMethod() { + return + ''' + private Set getAllExecutedModelResources() { + Set allResources = new HashSet<>(); + allResources.add(executedModel); + «IF gemoc» + allResources.addAll(org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); + allResources.removeIf(r -> r== null); + «ENDIF» + return allResources; + } + ''' + } + + private def String generateAddInitialStateMethod() { + return ''' + + private void addInitialState() { + if (lastState == null) { + // Creation of the initial state + Set allResources = getAllExecutedModelResources(); + lastState = «EcoreCraftingUtil.stringCreate(stateClass)»; + for (Resource r : allResources) { + for (TreeIterator i = r.getAllContents(); i.hasNext();) { + EObject o = i.next(); + «FOR c : partialOrderSort(findTopSuperClasses(traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name].toSet)) SEPARATOR "else"» + + if (o instanceof «getJavaFQN(c)») { + «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; + addNewObjectToState(o_cast, lastState); + } + «ENDFOR» + } + } + this.traceRoot.getStates().add(lastState); + }} + ''' + } + + private def boolean shouldHaveAddNewObjectToStateMethod(EClass c){ + val subTypes = findAllDirectSubTypes(c) + + if (!c.abstract) + return true + if (subTypes.empty && c.abstract) + return false + else if (!subTypes.empty && c.abstract) { + val validSubTypes = subTypes.filter[s|shouldHaveAddNewObjectToStateMethod(s)] + if (!validSubTypes.empty) + return true + } + + return true + } + + private def String generateAddNewObjectToStateMethods() { + return + ''' + «FOR c : traceability.allMutableClasses.sortBy[name]» + «««»«FOR c : partialOrderSort(getAllNonEmptyMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList)» + «val subTypes = partialOrderSort(findAllDirectSubTypes(c))» + «IF shouldHaveAddNewObjectToStateMethod(c)» + «IF getAllMutablePropertiesOf(c).exists[p|p instanceof EReference && p.many]» + @SuppressWarnings("unchecked") + «ENDIF» + private boolean addNewObjectToState(«getJavaFQN(c)» o_cast, «stateFQN» newState) { + boolean added = false; + «val subTypesWithMethods = subTypes.filter[sub|shouldHaveAddNewObjectToStateMethod(sub)]» + «FOR subType : subTypesWithMethods SEPARATOR " else " » + if (o_cast instanceof «getJavaFQN(subType)») { + added = addNewObjectToState((«getJavaFQN(subType)»)o_cast, newState); + } + «ENDFOR» + + «IF ! c.abstract» + + if (!added && !exeToTraced.containsKey(o_cast)) { + «tracedObjectFQN» tracedObject = «EcoreCraftingUtil.stringCreate(tracedObjectClass)»; + tracedObject.«stringSetter(tracedObjectOriginalObject, "o_cast")»; + exeToTraced.put(o_cast, tracedObject); + traceRoot.getTracedObjects().add(tracedObject); + + «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» + + // Creation of the dimension corresponding to the field «p.name» + «dimensionFQN» dimension = «EcoreCraftingUtil.stringCreate(dimensionClass)»; + tracedObject.getDimensions().add(dimension); + + «IF p.many» + + «IF p instanceof EReference» + + // Creation of the first value of the field «p.name» + «manyReferenceValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyReferenceValueClass)»; + + «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { + addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)aValue, newState); + } + «ENDIF» + + firstValue_«p.name».getReferenceValues().addAll((Collection) + «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState) + «ELSE» + o_cast.«EcoreCraftingUtil.stringGetter(p)» + «ENDIF» + ); + «ELSE» ««« If attribute + // Creation of the first value of the field «p.name» + «IF p.EType == EcorePackage.Literals.EINT» + «manyIntegerAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyIntegerAttributeValueClass)»; + «ELSEIF p.EType == EcorePackage.Literals.EBOOLEAN» + «manyBooleanAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyBooleanAttributeValueClass)»; + «ELSEIF p.EType == EcorePackage.Literals.ESTRING» + «manyStringAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyStringAttributeValueClass)»; + «ENDIF» + firstValue_«p.name».getAttributeValues().addAll + ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); + + «ENDIF» ««« End IF EReference/EAttribute + + «ELSE» ««« If !many + + «IF p instanceof EReference» + + // Creation of the first value of the field «p.name» + «singleReferenceValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleReferenceValueClass)»; + + «val realMutableType = traceability.getRealMutableClass(p.EType)» + if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { + «IF traceability.allMutableClasses.contains(realMutableType)» + addNewObjectToState((«getJavaFQN(realMutableType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); + firstValue_«p.name».setReferenceValue(«stringGetterTracedValue("o_cast", p)»; + «ELSE» + firstValue_«p.name».setReferenceValue(o_cast.«EcoreCraftingUtil.stringGetter(p)»)»; + «ENDIF» ««« End IF traceability.isSomehowMutable(p.EType) + } else { + firstValue_«p.name».setReferenceValue(null); + } + + «ELSE» ««« If attribute + «IF p.EType == EcorePackage.Literals.EINT» + «singleIntegerAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleIntegerAttributeValueClass)»; + «ELSEIF p.EType == EcorePackage.Literals.EBOOLEAN» + «singleBooleanAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleBooleanAttributeValueClass)»; + «ELSEIF p.EType == EcorePackage.Literals.ESTRING» + «singleStringAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleStringAttributeValueClass)»; + «ENDIF» + firstValue_«p.name».setValue(o_cast.«EcoreCraftingUtil.stringGetter(p)»); + «ENDIF» ««« End IF EReference + «ENDIF» ««« End IF p.many + + dimension.getValues().add(firstValue_«p.name»); + newState.getValues().add(firstValue_«p.name»); + + «ENDFOR» ««« End FOR p : getAllMutableProperties + } // end if (!exeToTraced.containsKey + «ENDIF» ««« End IF ! c.abstract» + return added; + }// end addNewObjectToState + «ENDIF» + «ENDFOR» ««« end FOR c : traceability.allMutableClasses.sortBy[name] + ''' + } + +private def String generateAddStateUsingListenerMethods() { + val newClassesNotEmpty = traceability.getNewClasses.filter[c|!c.EStructuralFeatures.empty].toSet + val newAbstractClassesNotEmpty = partialOrderSort(newClassesNotEmpty.filter[c|!c.isAbstract].toSet) + val newConcreteClassesNotEmpty = traceability.getNewClasses.filter[c| + val superTypes = new ArrayList(c.EAllSuperTypes) + superTypes.retainAll(newAbstractClassesNotEmpty) + return !c.isAbstract && (!c.EStructuralFeatures.empty || !superTypes.empty) + ].toList + //val newClassesNotEmptyWithMutableProperties = newClassesNotEmpty.filter[c|!traceability.getMutablePropertiesOf(c).empty] +// val newClassesNotEmptyClosure = partialOrderSort(newClassesNotEmpty.filter[c| +// val superTypes = new ArrayList(c.EAllSuperTypes) +// superTypes.retainAll(newClassesNotEmpty) +// !(c.EStructuralFeatures.empty && !superTypes.empty) +// ].toList) + val allConcreteMutableClasses = partialOrderSort(getAllNonEmptyMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList) + //val mutableClassesWithNonCollectionMutableFields = allConcreteMutableClasses.filter[c|getAllMutablePropertiesOf(c).exists[p|!p.many]] + //val mutableClassesWithCollectionMutableFields = allConcreteMutableClasses.filter[c|getAllMutablePropertiesOf(c).exists[p| p.many]] + val mutableClassesWithNonCollectionMutableFields = traceability.allMutableClasses.filter[c|!traceability.getMutablePropertiesOf(c).empty && traceability.getMutablePropertiesOf(c).exists[p|!p.many]] + val mutableClassesWithCollectionMutableFields = traceability.allMutableClasses.filter[c|!traceability.getMutablePropertiesOf(c).empty && traceability.getMutablePropertiesOf(c).exists[p|p.many]] + return + ''' + private boolean copiedState = false; + + private «stateFQN» copyState(«stateFQN» oldState) { + «stateFQN» newState = «EcoreCraftingUtil.stringCreate(stateClass)»; +««« «FOR p : traceability.allMutableProperties.sortBy[FQN]» +««« newState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))».addAll(oldState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))»); +««« «ENDFOR» + newState.getValues().addAll(oldState.getValues()); + copiedState = true; + return newState; + } + + @SuppressWarnings("unchecked") + @Override + public void addState(List changes) { + if (lastState == null) { + addInitialState(); + }««« end if laststate null + if (!changes.isEmpty()) { + boolean stateChanged = false; + // We start by a (shallow) copy of the last state + // But we will have to rollback a little by replacing values that changed + «stateFQN» newState = copyState(lastState); + for (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) { + EObject o = modelChange.getChangedObject(); + «IF !newConcreteClassesNotEmpty.empty» + // We only look at constructable objects that have mutable fields + // Here we have nothing to rollback, just a new object to add + if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange) { + stateChanged = true; + ««« Loop over all classes that may be constructed and that have mutable fields + «FOR c : partialOrderSort(findTopSuperClasses(newConcreteClassesNotEmpty))» + if (o instanceof «getJavaFQN(c)») { + «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; + addNewObjectToState(o_cast, newState); + } ««« end if instanceof + «ENDFOR» + }««« end if NewObjectModelChange + + // We only look at constructable objects that have mutable fields + // Here we must rollback to remove the values of the removed object from the copied state + else if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.RemovedObjectModelChange) { + stateChanged = true; + ««« Loop over all classes that may type something constructed and that have mutable fields + «FOR c : partialOrderSort(newClassesNotEmpty)» + «val traced = traceability.getTracedClass(c)» + if (o instanceof «getJavaFQN(c)») { + «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; + «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o_cast); + ««« Loop over the fields of this class, which are all mutable + «FOR p : c.EStructuralFeatures» + «val EReference pvalues = traceability.getStateClassToValueClass(p)» + «val EReference pdimension = traceability.getDimensionRef(p)» +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); + newState.getValues().remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); + «ENDFOR» + }««« end if instanceof + «ENDFOR» + }««« end if RemovedObjectModelChange + «ENDIF» + «IF !mutableClassesWithNonCollectionMutableFields.empty» + // Here we must look at non-collection mutable fields + // We must rollback the last values from the copied state, and add new values as well + // ie. mix of remove and new + «IF !newConcreteClassesNotEmpty.empty» else «ENDIF» if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) { + stateChanged = true; + + org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange; + «EStructuralFeature.canonicalName » p = modelChange_cast.getChangedField(); + «FOR c : partialOrderSort(mutableClassesWithNonCollectionMutableFields)» + «val nonCollectionMutableFields = traceability.getMutablePropertiesOf(c).filter[p|!p.many]» + + «val traced = traceability.getTracedClass(c)» + if (o instanceof «getJavaFQN(c)») { + «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; + + «FOR p : nonCollectionMutableFields SEPARATOR " else "» + + «val EClass valueClass = traceability.getValueClass(p)» + «val EReference pvalues = traceability.getStateClassToValueClass(p)» + «val EReference pdimension = traceability.getDimensionRef(p)» + + if (p.getFeatureID() == «stringFeatureID(p)») { + + // Rollback: we remove the last value of this field from the new state + «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o); + «getJavaFQN(valueClass)» lastValue = traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1); +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); + newState.getValues().remove(lastValue); + + // And we create a proper new value + ««« «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + ««« addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); + ««« «ENDIF» + «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; + «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» + + «IF p instanceof EReference» + «getJavaFQN(valueProperty.EType)» value = null; + if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { + addNewObjectToState(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); + value = «stringGetterTracedValue("o_cast", p)»; + } + «ELSE» + «getJavaFQN(valueProperty.EType)» value = o_cast.«EcoreCraftingUtil.stringGetter(p)»; + «ENDIF» + + newValue.«stringSetter(valueProperty,"value")»; + + traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().add(newValue); +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); + newState.getValues().add(newValue); + } + ««« end if feature id + «ENDFOR» + } + ««« end if instance of + «ENDFOR» + } + ««« end if NonCollectionFieldModelChange + «ENDIF» + «IF !mutableClassesWithCollectionMutableFields.empty» + // Here we look at collection mutable fields + // We must first manually find out if the collection changed... + // If it changed we must rollback the last values from the copied state, and add new values as well + «IF !newConcreteClassesNotEmpty.empty || !mutableClassesWithNonCollectionMutableFields.empty » else «ENDIF» if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange) { + org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange) modelChange; + «EStructuralFeature.canonicalName » p = modelChange_cast.getChangedField(); + «FOR c : partialOrderSort(mutableClassesWithCollectionMutableFields) » + «val collectionMutableFields = traceability.getMutablePropertiesOf(c).filter[p|p.many]» + «val traced = traceability.getTracedClass(c)» + if (o instanceof «getJavaFQN(c)») { + «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; + «getJavaFQN(traced)» tracedObject = («getJavaFQN(traced)») exeToTraced.get(o_cast); + «FOR p : collectionMutableFields SEPARATOR " else "» + «val EClass valueClass = traceability.getValueClass(p)» + «val EReference pvalues = traceability.getStateClassToValueClass(p)» + «val EReference pdimension = traceability.getDimensionRef(p)» + if (p.getFeatureID() == «stringFeatureID(p)») { + // We compare the last collection in the value sequence, and the current one in the potentially changed object + List<«getJavaFQN(valueClass)»> valueSequence = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues(); + «getJavaFQN(valueClass)» previousValue = null; + if (!valueSequence.isEmpty()) { + previousValue = valueSequence.get(valueSequence.size() - 1); + } + ««« If instances of new class, we have to make sure that there are traced versions + «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { + addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)aValue, newState); + }««« end for loop on values + «ENDIF» + boolean change = false; + if (previousValue != null) { + if (previousValue.«EcoreCraftingUtil.stringGetter(p)».size() == o_cast + .«EcoreCraftingUtil.stringGetter(p)».size()) { + ««« We this is an ordered collection, we have to compare in the correct order + «IF p.ordered» + java.util.Iterator<«getJavaFQN(p.EType,true)»> it = o_cast.«EcoreCraftingUtil.stringGetter(p)».iterator(); + for («getTracedJavaFQN(traceability.getValuePropertyOfMutableProperty(p).EType,true)» aPreviousValue : previousValue + .«EcoreCraftingUtil.stringGetter(p)») { + «getJavaFQN(p.EType)» aCurrentValue = it.next(); + «IF p instanceof EReference» + if (aPreviousValue != exeToTraced.get(aCurrentValue)) + «ELSE» + if (!aPreviousValue.equals(aCurrentValue)) + «ENDIF» + { + change = true; + break; + } + } + ««« Else we simply check that the content is the same + «ELSE» + change = !previousValue.«EcoreCraftingUtil.stringGetter(p)».containsAll(«getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)»), newState); + «ENDIF» + ««« end case ordered + }««« end if same size + else { + change = true; + }««« end else + } else { + change = true; + }««« end else + if (change) { + stateChanged = true; + // Rollback: we remove the last value of this field from the new state + «getJavaFQN(valueClass)» lastValue = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1); +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); + newState.getValues().remove(lastValue); + // And we create a proper new value + «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; + «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» + «IF p.many» + «IF p instanceof EReference» + newValue.«EcoreCraftingUtil.stringGetter(valueProperty)».addAll + ((Collection) «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState)); + «ELSE» + newValue.«EcoreCraftingUtil.stringGetter(valueProperty)».addAll + ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); + «ENDIF» + «ELSE» + newValue.«stringSetter(valueProperty,stringGetterTracedValue("o_cast", p))»; + «ENDIF» + tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().add(newValue); +««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); + newState.getValues().add(newValue); + }««« end if change + }««« end if featureid + «ENDFOR» + } ««« end if instanceof + «ENDFOR» + }««« end if PotentialCollectionFieldModelChange + «ENDIF» + }««« end for all changes + if (stateChanged) { + final «specificStepFQN» currentStep = context.peekFirst(); + if (currentStep != null && currentStep instanceof «getJavaFQN(TracePackage.eINSTANCE.bigStep)») { + final «stateFQN» startingState = lastState; + final «stateFQN» endingState = newState; + addImplicitStep(currentStep, startingState, endingState); + } + lastState = newState; + traceRoot.getStates().add(lastState); +««« traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_TraceToStates)».add(lastState); + }««« end if (stateChanged) + else if (copiedState) { + «FOR p : traceability.allMutableProperties.sortBy[FQN]» +««« newState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))».clear(); + newState.getValues().clear(); + «ENDFOR» + } + copiedState = false; + }««« end if (!changes.isEmpty()) + }««« end method + ''' + } + + + + private def String generateAddStepMethods() { + return + ''' + «val stepRules = traceability.mmext.rules» + «IF gemoc» + @SuppressWarnings("unchecked") + @Override + public void addStep(fr.inria.diverse.trace.commons.model.trace.Step step) { + «specificStepFQN» step_cast = null; + if (step != null && step instanceof «specificStepFQN») { + step_cast = («specificStepFQN») step; + if (mseModel == null) { + mseModel = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEModel(); + traceResource.getContents().add(mseModel); + } + mseModel.getOwnedMSEs().add(step_cast.getMseoccurrence().getMse()); + + // Creating generic (or almost generic) links + «stateFQN» state = traceRoot.getStates().get(traceRoot.getStates().size()-1); + step_cast.setStartingState(state); + if (!context.isEmpty() && context.getFirst() != null) { + ((SequentialStep<«specificStepFQN», «stateFQN»>) context.getFirst()).getSubSteps().add(step_cast); + } else { + ((SequentialStep<«specificStepFQN», «stateFQN»>) traceRoot.getRootStep()).getSubSteps().add(step_cast); + } + + // Adding step in its dedicated sequence/dimension + «IF !stepRules.empty» + «FOR stepRule : stepRules.sortBy[baseFQN] SEPARATOR "else"» + «val EClass stepClass = traceability.getStepClassFromStepRule(stepRule)» + «val String varName = stepClass.name.toFirstLower.replace(" ", "") + "Instance"» + if (step_cast instanceof «getJavaFQN(stepClass)») { + «getJavaFQN(stepClass)» «varName» = («getJavaFQN(stepClass)») step_cast; + traceRoot.«EcoreCraftingUtil.stringGetter(traceability.getStepSequence(stepClass))».add(«varName»); + } + «ENDFOR» + «ENDIF» + } + context.push(step_cast); + } + «ELSE» + @Override + public void addStep(String stepRule, Map params) { + addStep(stepRule, params, this.getTraceSize()-1); + } + + private void addStep(String stepRule, Map params, int stateIndex) { + «specificStepFQN» toPush = null; + if (stateIndex >= 0) { + «stateFQN» state = this.traceRoot.getStates().get(stateIndex); + «IF !stepRules.empty» + «FOR stepRule : stepRules.sortBy[baseFQN] SEPARATOR "else"» + «val stepCallerClass = stepRule.containingClass» + «val possibleCallerClasses = abstractSyntax.EClassifiers + .filter[c|c instanceof EClass] + .map[c|c as EClass] + .filter[c|c.equals(stepCallerClass)||c.EAllSuperTypes.contains(stepCallerClass)] + .toSet» + «val EClass stepClass = traceability.getStepClassFromStepRule(stepRule)» + «val String varName = stepClass.name.toFirstLower.replace(" ", "") + "Instance"» + «IF possibleCallerClasses.empty» + if (stepRule.equalsIgnoreCase("«getBaseFQN(stepRule)»")) { + «ELSE» + if ( + «FOR possibleCallerClass: possibleCallerClasses.sortBy[name] SEPARATOR " || "» + stepRule.equalsIgnoreCase("«getActualFQN(possibleCallerClass, stepRule)»") + «ENDFOR» + ) { + «ENDIF» + // First we create the step + «getJavaFQN(stepClass)» «varName» = «EcoreCraftingUtil.stringCreate(stepClass)»; + «varName».«stringSetter(TraceMMStrings.ref_StepToState_starting, "state")»; + + if (!context.isEmpty() && context.getFirst() != null){ + ((fr.inria.diverse.trace.commons.model.trace.SequentialStep) context.getFirst()).getSubSteps().add(«varName»); + } else { + traceRoot.getRootSteps().add(«varName»); + } + toPush = «varName»; + ««« TODO rely on information in Rule instead of the structural features? + «val properties = stepClass.EAllStructuralFeatures.filter[f| + !TracePackage.eINSTANCE.smallStep.EStructuralFeatures.contains(f) && + !TracePackage.eINSTANCE.bigStep.EStructuralFeatures.contains(f) && + !traceability.traceMMExplorer.getSpecificStepClass.EStructuralFeatures.contains(f) && + !f.name.equals(StepStrings.ref_BigStepToSub) + && !f.EContainingClass.name.equals("MSEOccurrence")]» + «IF !properties.empty» + if (params != null) { + for (String k : params.keySet()) { + switch(k) { + «FOR p : properties.sortBy[name]» + case "«p.name»": + Object «uniqueVar("v")» = params.get(k); + «val type = getEventParamRuntimeType(p)» + if («uniqueVar("v")» instanceof «getJavaFQN(type)») { + «IF type == p.EType» + «varName».«stringSetter(p, "(" + getJavaFQN(p.EType) + ")"+uniqueVar("v"))»; + «ELSE» + «varName».«stringSetter(p, "(" + getJavaFQN(p.EType) + ")exeToTraced.get("+uniqueVar("v"+")"))»; + «ENDIF» + } + break; + «incVar("v")» + «ENDFOR» + } + } + } + «ENDIF» + // Then we add it to its trace + this.traceRoot.«EcoreCraftingUtil.stringGetter(traceability.getStepSequence(stepClass))».add(«varName»); + } + «ENDFOR» + «ENDIF» + } + context.push(toPush); + } + «ENDIF» + + @SuppressWarnings("unchecked") + private void addImplicitStep(«specificStepFQN» currentStep, + «stateFQN» startingState, + «stateFQN» endingState) { + + «IF !stepRules.empty && !traceability.bigStepClasses.empty» + «specificStepFQN» implicitStep = null; + «FOR bigStepClass : traceability.bigStepClasses.sortBy[name] SEPARATOR "else"» + if (currentStep instanceof «getJavaFQN(bigStepClass)») { + implicitStep = «EcoreCraftingUtil.stringCreateImplicitStep(bigStepClass)»; + } + «ENDFOR» + if (implicitStep != null) { + implicitStep.setStartingState(startingState); + implicitStep.setEndingState(endingState); + ((SequentialStep<«specificStepFQN», «stateFQN»>) currentStep).getSubSteps().add(implicitStep); + + } + «ENDIF» + } + + @Override + public void endStep(fr.inria.diverse.trace.commons.model.trace.Step step) { + «specificStepFQN» popped = context.pop(); + if (popped != null) + popped.setEndingState(lastState); + } + ''' + } + + private def String generateInitAndSaveTraceMethods() { + return + ''' + @Override + public EObject initTrace(LaunchConfiguration launchConfiguration) { + // Create root + traceRoot = «EcoreCraftingUtil.stringCreate(traceability.traceMMExplorer.getSpecificTraceClass)»; + traceRoot.setLaunchconfiguration(launchConfiguration); + + // Create root sequential step + fr.inria.diverse.trace.commons.model.trace.SequentialStep<«specificStepFQN», «stateFQN»> rootStep = «EcoreCraftingUtil.stringCreate(traceability.traceMMExplorer.getSpecificRootStepClass)»; + traceRoot.setRootStep(rootStep); + + // Put in the resource + traceResource.getContents().add(traceRoot); + + return traceRoot; + } + + @Override + public void save() { + try { + traceResource.save(null); + } catch (java.io.IOException e) { + e.printStackTrace(); + } + } + + @Override + public void save(URI uri) { + try { + traceResource.setURI(uri); + traceResource.save(null); + } catch (java.io.IOException e) { + e.printStackTrace(); + } + } + ''' + } + + private def String generateExeToFromTracedGenericMethods() { + return + ''' + «IF getExeToTracedUsed» + private Collection «getExeToTracedMethodName»(Collection exeObjects, «getJavaFQN(stateClass)» newState) { + Collection result = new ArrayList(); + for(EObject exeObject : exeObjects) { + result.add(exeToTraced.get(exeObject)); + } + return result; + } + «ENDIF» + ''' + } + + private def String generateTraceConstructorClass() { + + val body = + ''' + public class «className» implements ITraceConstructor { + «generateFields» + «generateConstructor» + «generateAddInitialStateMethod» + «generateAddNewObjectToStateMethods» + «generateAddStateUsingListenerMethods» + «generateAddStepMethods» + «generateInitAndSaveTraceMethods» + «generateGetAllResourcesMethod» + «generateExeToFromTracedGenericMethods» + + @Override + public boolean isPartialTraceConstructor() { + return false; + } + } + ''' + + return + ''' + package «packageQN»; + + «generateImports» + + «body» + ''' + } + +} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend index 158571072..88221872e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend @@ -14,7 +14,6 @@ import ecorext.ClassExtension import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import java.util.Collection import java.util.HashSet import java.util.Set import org.eclipse.emf.codegen.ecore.genmodel.GenPackage @@ -121,6 +120,7 @@ class StateManagerGeneratorJava { import org.gemoc.executionframework.engine.core.CommandExecution; import fr.inria.diverse.trace.commons.model.trace.State; + import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.gemoc.api.IStateManager; ''' } @@ -130,14 +130,14 @@ class StateManagerGeneratorJava { ''' private final Resource modelResource; - private final Map tracedToExe; + private final Map, EObject> tracedToExe; ''' } private def String generateConstructors() { return ''' - public «className»(Resource modelResource, Map tracedToExe) { + public «className»(Resource modelResource, Map, EObject> tracedToExe) { this.modelResource = modelResource; this.tracedToExe = tracedToExe; } @@ -181,59 +181,28 @@ class StateManagerGeneratorJava { @SuppressWarnings("unchecked") private void restoreStateExecute(«stateFQN» state) { for («valueFQN» value : state.getValues()) { - final EObject parent = value.eContainer().eContainer(); «FOR p : traceability.allMutableProperties.sortBy[FQN] SEPARATOR "else"» «val EReference pdimension = traceability.getDimensionRef(p)» + «val EClass tracedObjectClass = pdimension.getEContainingClass» «val EClass valueClass = traceability.getValueClass(p)» if (value instanceof «getJavaFQN(valueClass)») { - ««« Case in which we can use the "originalObject" reference and simply set its values + final «getJavaFQN(tracedObjectClass)» tracedObject = («getJavaFQN(tracedObjectClass)») value.eContainer().eContainer(); «IF p.eContainer instanceof ClassExtension» - ««« We have to test at runtime be can't know at design time the type of the object containing the property - ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. - «val concreteSubTypes = getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» - «IF concreteSubTypes.size > 1» - «FOR concreteSubType : concreteSubTypes» - if (parent instanceof «getJavaFQN(concreteSubType)») { - «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» - «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; - «IF !origRefs.isEmpty» - «val EReference origRef = origRefs.get(0)» - «IF p.many» - «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; - originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); - originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value", p, valueClass)»); - «ELSE» - «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p, valueClass)»; - «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; - if (current != toset) { - ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; - } - «ENDIF» - «ENDIF» - } - «ENDFOR» - «ELSEIF concreteSubTypes.size == 1» - «val concreteSubType = concreteSubTypes.head» - «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» - «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; - «IF !origRefs.isEmpty» - «val EReference origRef = origRefs.get(0)» + «val extendedClass = (p.eContainer as ClassExtension).extendedExistingClass» + final «getJavaFQN(extendedClass)» originalObject = («getJavaFQN(extendedClass)») tracedToExe.get(tracedObject); «IF p.many» - «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value", p, valueClass)»); «ELSE» - «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p, valueClass)»; - «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; - if (current != toset) { - ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; + final «getJavaFQN(p.EType)» toSet = «stringGetterExeValue("value", p, valueClass)»; + final «getJavaFQN(p.EType)» current = originalObject.«EcoreCraftingUtil.stringGetter(p)»; + if (current != toSet) { + originalObject.«EcoreCraftingUtil.stringSetter(p, "toSet", refGenPackages)»; } «ENDIF» - «ENDIF» - «ENDIF» - ««« Case in which we have to recreate/restore execution objects in the model «ELSEIF p.eContainer instanceof EClass» - «getJavaFQN(p.EContainingClass)» exeObject = («getJavaFQN(p.EContainingClass)») «getTracedToExeMethodName»(parent); + «val containingClass = p.EContainingClass» + «getJavaFQN(containingClass)» exeObject = («getJavaFQN(containingClass)») «getTracedToExeMethodName»(tracedObject); «IF p.many» exeObject.«EcoreCraftingUtil.stringGetter(p)».clear(); «IF p instanceof EReference» @@ -249,55 +218,6 @@ class StateManagerGeneratorJava { «ENDFOR» } } - -««« @SuppressWarnings("unchecked") -««« private void restoreStateExecute(«stateFQN» state) { -««« «FOR p : traceability.allMutableProperties.sortBy[FQN]» -««« «val EReference pdimension = traceability.getDimensionRef(p)» -««« «val EClass stateClass = traceability.getValueClass(p)» -««« for («valueFQN» value : state.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createGlobalToState(stateClass))») { -««« final EObject parent = value.eContainer().eContainer(); -««« ««« Case in which we can use the "originalObject" reference and simply set its values -««« «IF p.eContainer instanceof ClassExtension» -««« ««« We have to test at runtime be can't know at design time the type of the object containing the property -««« ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. -««« «FOR concreteSubType : getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» -««« if (parent instanceof «getJavaFQN(concreteSubType)») { -««« «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» -««« «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; -««« «IF !origRefs.isEmpty» -««« «val EReference origRef = origRefs.get(0)» -««« «IF p.many» -««« «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; -««« originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); -««« originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value",p)»); -««« «ELSE» -««« «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p)»; -««« «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; -««« if (current != toset) { -««« ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; -««« } -««« «ENDIF» -««« «ENDIF» -««« } -««« «ENDFOR» -««« ««« Case in which we have to recreate/restore execution objects in the model -««« «ELSEIF p.eContainer instanceof EClass» -««« «getJavaFQN(p.EContainingClass)» exeObject = («getJavaFQN(p.EContainingClass)») «getTracedToExeMethodName»(parent); -««« «IF p.many» -««« exeObject.«EcoreCraftingUtil.stringGetter(p)».clear(); -««« «IF p instanceof EReference» -««« exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) «getTracedToExeMethodName»(value.«EcoreCraftingUtil.stringGetter(p)»)); -««« «ELSE» -««« exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) value.«EcoreCraftingUtil.stringGetter(p)»); -««« «ENDIF» -««« «ELSE» -««« exeObject.«EcoreCraftingUtil.stringSetter(p, stringGetterExeValue("value",p), refGenPackages)»; -««« «ENDIF» -««« «ENDIF» -««« } -««« «ENDFOR» -««« } ''' } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index b018f61f8..696b5f13f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -280,6 +280,7 @@ class TraceConstructorGeneratorJava { import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.MSEModel; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; + import fr.inria.diverse.trace.commons.model.trace.TracedObject; import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; ''' } @@ -290,7 +291,7 @@ class TraceConstructorGeneratorJava { private «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)» traceRoot; private MSEModel mseModel; private Resource executedModel; - private final Map exeToTraced; + private final Map> exeToTraced; private «stateFQN» lastState; @@ -302,7 +303,7 @@ class TraceConstructorGeneratorJava { private def String generateConstructor() { return ''' - public «className» (Resource exeModel, Resource traceResource, Map exeToTraced) { + public «className» (Resource exeModel, Resource traceResource, Map> exeToTraced) { this.traceResource = traceResource; this.executedModel = exeModel; this.exeToTraced = exeToTraced; @@ -640,6 +641,7 @@ private def String generateAddStateUsingListenerMethods() { «IF p instanceof EReference» «getJavaFQN(valueProperty.EType)» value = null; if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { + addNewObjectToState(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); value = «stringGetterTracedValue("o_cast", p)»; } «ELSE» diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index 9e328c663..31592c89b 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -567,7 +567,7 @@ private void fillValueLine(HBox line, Dimension dimension, int start, int end } } - private NumberExpression createSteps(Step step, int depth, int currentStateIndex, int selectedStateIndex, + private NumberExpression createSteps(Step step, int depth, int currentStateIndex, int selectedStateIndex, int firstStateIndex, int lastStateIndex, List accumulator, Object[] stepTargets) { final int stepStartingIndex = traceExtractor.getStateIndex(step.getStartingState()); @@ -600,9 +600,10 @@ private NumberExpression createSteps(Step step, int depth, int currentStateIn NumberExpression yOffset = new SimpleDoubleProperty(0); if (subSteps != null && !subSteps.isEmpty()) { for (Step subStep : subSteps) { - if (subStep.getStartingState() != subStep.getEndingState()) { - yOffset = Bindings.max(yOffset, createSteps(subStep, depth + 1, currentStateIndex, - selectedStateIndex, accumulator, stepTargets)); + if (subStep.getStartingState() != subStep.getEndingState() +// && ((traceExtractor.getStateIndex(subStep.getEndingState()) < firstStateIndex) || traceExtractor.getStateIndex(subStep.getStartingState()) > lastStateIndex) + ) { + yOffset = Bindings.max(yOffset, createSteps(subStep, depth + 1, currentStateIndex, selectedStateIndex, firstStateIndex, lastStateIndex, accumulator, stepTargets)); } } } @@ -710,7 +711,7 @@ protected boolean computeValue() { for (Step step : rootSteps) { if (step.getStartingState() != step.getEndingState()) { - createSteps(step, 0, currentStateStartIndex, selectedStateIndex, steps, stepTargets); + createSteps(step, 0, currentStateStartIndex, selectedStateIndex, currentStateStartIndex - 1, currentStateEndIndex + 1, steps, stepTargets); } } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java index 92e43c3a9..2f8262d80 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java @@ -100,6 +100,8 @@ public List getStatesToBreakTo() { @Override public void dispose() { super.dispose(); + timelineRenderer.setTraceExplorer(null); + timelineRenderer.setTraceExtractor(null); } @Override diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/.classpath b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/.classpath index 248b4c5dc..88763a2b9 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/.classpath +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/.classpath @@ -4,5 +4,6 @@ + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Clone.launch b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Clone.launch new file mode 100644 index 000000000..3cf1f4354 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Clone.launch @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generated.launch b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generated.launch new file mode 100644 index 000000000..acb69f856 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generated.launch @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generic.launch b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generic.launch new file mode 100644 index 000000000..b9e0be063 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generic.launch @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-None.launch b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-None.launch new file mode 100644 index 000000000..9ba8b3fed --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-None.launch @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF index 2a338496f..ef4d698e7 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF @@ -11,24 +11,26 @@ Require-Bundle: com.google.guava, org.eclipse.emf;bundle-version="2.6.0", org.eclipse.emf.ecore;bundle-version="2.10.2", fr.inria.diverse.trace.api;bundle-version="1.0.0", - org.gemoc.execution.engine.trace.model;bundle-version="0.1.0", - org.gemoc.execution.engine.commons;bundle-version="0.1.0", org.eclipse.debug.core;bundle-version="3.9.1", org.eclipse.core.runtime;bundle-version="3.10.0", - org.gemoc.gemoc_language_workbench.api;bundle-version="0.1.0", - org.gemoc.gemoc_language_workbench.extensions.k3;bundle-version="0.1.0", fr.inria.diverse.trace.gemoc;bundle-version="1.0.0", - org.gemoc.execution.engine.io;bundle-version="0.1.0", - org.eclipse.mat.api, - org.eclipse.mat.parser, - org.eclipse.mat.hprof, - org.eclipse.mat.jdt, org.junit;bundle-version="4.11.0", org.eclipse.jdt.core, fr.inria.diverse.commons.provisionner4eclipse, fr.inria.diverse.trace.commons.testutil;bundle-version="1.0.0", org.eclipse.emf.transaction;bundle-version="1.8.0", fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="1.0.0", - org.gemoc.execution.engine;bundle-version="0.1.0" + org.gemoc.xdsmlframework.api, + org.gemoc.executionframework.engine, + org.gemoc.execution.sequential.javaengine;bundle-version="2.3.0", + org.eclipse.jdt.junit.core, + fr.inria.diverse.trace.gemoc.api;bundle-version="2.3.0", + org.gemoc.activitydiagram.sequential.xactivitydiagram;bundle-version="0.1.0", + org.eclipse.xtext;bundle-version="2.10.0", + org.gemoc.activitydiagram.sequential.xactivitydiagram.grammar;bundle-version="1.0.0", + org.eclipse.mat.api, + org.gemoc.activitydiagram.sequential.xactivitydiagram.trace;bundle-version="1.0.0", + org.apache.log4j;bundle-version="1.2.15" Import-Package: fr.obeo.timeline.model, - org.eclipse.jdt.core.search + org.eclipse.jdt.core.search, + org.gemoc.execution.sequential.javaengine diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_1.trace new file mode 100644 index 000000000..04a3de8f5 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_1.trace @@ -0,0 +1,2278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_2.trace new file mode 100644 index 000000000..61dc75389 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_2.trace @@ -0,0 +1,2150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_3.trace new file mode 100644 index 000000000..e9b052b1d --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_3.trace @@ -0,0 +1,2150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_4.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_4.trace new file mode 100644 index 000000000..691ea9afd --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_4.trace @@ -0,0 +1,2150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_5.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_5.trace new file mode 100644 index 000000000..8dbeb34fc --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_5.trace @@ -0,0 +1,2150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_6.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_6.trace new file mode 100644 index 000000000..a7e737f7d --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_6.trace @@ -0,0 +1,2150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_1.trace new file mode 100644 index 000000000..5d6e29ab4 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_1.trace @@ -0,0 +1,1774 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_2.trace new file mode 100644 index 000000000..1ae0f26a2 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_2.trace @@ -0,0 +1,1774 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_3.trace new file mode 100644 index 000000000..499eabc45 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_3.trace @@ -0,0 +1,1774 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_4.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_4.trace new file mode 100644 index 000000000..547e1f07d --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_4.trace @@ -0,0 +1,1774 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_5.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_5.trace new file mode 100644 index 000000000..c5002ec99 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_5.trace @@ -0,0 +1,1774 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_6.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_6.trace new file mode 100644 index 000000000..99cb9eaf7 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_6.trace @@ -0,0 +1,1774 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_1.trace new file mode 100644 index 000000000..7e6ae646e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_1.trace @@ -0,0 +1,1627 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_2.trace new file mode 100644 index 000000000..215e2af59 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_2.trace @@ -0,0 +1,1627 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_3.trace new file mode 100644 index 000000000..d9d51de75 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_3.trace @@ -0,0 +1,1627 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_1.trace new file mode 100644 index 000000000..ffc7b99c4 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_1.trace @@ -0,0 +1,1627 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_2.trace new file mode 100644 index 000000000..577fc3595 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_2.trace @@ -0,0 +1,1627 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_3.trace new file mode 100644 index 000000000..c18919629 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_3.trace @@ -0,0 +1,1627 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_false.trace new file mode 100644 index 000000000..086f7c62f --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_false.trace @@ -0,0 +1,960 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_true.trace new file mode 100644 index 000000000..e4ceba0fc --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_true.trace @@ -0,0 +1,1160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_false.trace new file mode 100644 index 000000000..17500c5d2 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_false.trace @@ -0,0 +1,1060 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_true.trace new file mode 100644 index 000000000..06f960fd1 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_true.trace @@ -0,0 +1,1060 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_false.trace new file mode 100644 index 000000000..6893e83c3 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_false.trace @@ -0,0 +1,960 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_true.trace new file mode 100644 index 000000000..fdbfabe38 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_true.trace @@ -0,0 +1,1160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_false.trace new file mode 100644 index 000000000..de94ee7da --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_false.trace @@ -0,0 +1,1060 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_true.trace new file mode 100644 index 000000000..9268de2ef --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_true.trace @@ -0,0 +1,1060 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_false.trace new file mode 100644 index 000000000..975bbf5fa --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_false.trace @@ -0,0 +1,1482 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_true.trace new file mode 100644 index 000000000..58f00343a --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_true.trace @@ -0,0 +1,1610 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_false.trace new file mode 100644 index 000000000..da4f5410f --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_false.trace @@ -0,0 +1,1482 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_true.trace new file mode 100644 index 000000000..52ddbe054 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_true.trace @@ -0,0 +1,1482 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_false.trace new file mode 100644 index 000000000..7f451fa9b --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_false.trace @@ -0,0 +1,1354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_true.trace new file mode 100644 index 000000000..2ecf7bba8 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_true.trace @@ -0,0 +1,1354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_false.trace new file mode 100644 index 000000000..9314ab866 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_false.trace @@ -0,0 +1,1354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_true.trace new file mode 100644 index 000000000..c44b2c33e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_true.trace @@ -0,0 +1,1354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_false.trace new file mode 100644 index 000000000..2a41b9ccb --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_false.trace @@ -0,0 +1,569 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_true.trace new file mode 100644 index 000000000..1e6cd62f4 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_true.trace @@ -0,0 +1,1316 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_false.trace new file mode 100644 index 000000000..bb50435bc --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_false.trace @@ -0,0 +1,608 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_true.trace new file mode 100644 index 000000000..e48bb2049 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_true.trace @@ -0,0 +1,1669 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_false.trace new file mode 100644 index 000000000..aa7e7ab77 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_false.trace @@ -0,0 +1,595 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_true.trace new file mode 100644 index 000000000..8cde6212e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_true.trace @@ -0,0 +1,1470 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_false.trace new file mode 100644 index 000000000..9fbc01c6d --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_false.trace @@ -0,0 +1,685 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_true.trace new file mode 100644 index 000000000..cfdf592fd --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_true.trace @@ -0,0 +1,1470 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_1.trace new file mode 100644 index 000000000..d12615910 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_1.trace @@ -0,0 +1,608 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_2.trace new file mode 100644 index 000000000..68b459f3d --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_2.trace @@ -0,0 +1,593 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_3.trace new file mode 100644 index 000000000..5e6a00ffb --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_3.trace @@ -0,0 +1,593 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_4.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_4.trace new file mode 100644 index 000000000..cdf8a2f69 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_4.trace @@ -0,0 +1,593 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_5.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_5.trace new file mode 100644 index 000000000..0057a5f81 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_5.trace @@ -0,0 +1,593 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_6.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_6.trace new file mode 100644 index 000000000..36c8383b4 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_6.trace @@ -0,0 +1,593 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_1.trace new file mode 100644 index 000000000..69dd55be2 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_1.trace @@ -0,0 +1,533 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_2.trace new file mode 100644 index 000000000..c672f6f3c --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_2.trace @@ -0,0 +1,533 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_3.trace new file mode 100644 index 000000000..550fd36ec --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_3.trace @@ -0,0 +1,533 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_4.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_4.trace new file mode 100644 index 000000000..79411e212 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_4.trace @@ -0,0 +1,533 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_5.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_5.trace new file mode 100644 index 000000000..0ddce7733 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_5.trace @@ -0,0 +1,533 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_6.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_6.trace new file mode 100644 index 000000000..5189f82ac --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_6.trace @@ -0,0 +1,533 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_1.trace new file mode 100644 index 000000000..bc5bc8372 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_1.trace @@ -0,0 +1,519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_2.trace new file mode 100644 index 000000000..2a6bbfb9d --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_2.trace @@ -0,0 +1,519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_3.trace new file mode 100644 index 000000000..315ec933a --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_3.trace @@ -0,0 +1,519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_1.trace new file mode 100644 index 000000000..1dee2d0d0 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_1.trace @@ -0,0 +1,519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_2.trace new file mode 100644 index 000000000..3b9543575 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_2.trace @@ -0,0 +1,519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_3.trace new file mode 100644 index 000000000..121a05529 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_3.trace @@ -0,0 +1,519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_false.trace new file mode 100644 index 000000000..4865f90ce --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_false.trace @@ -0,0 +1,411 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_true.trace new file mode 100644 index 000000000..736274ddc --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_true.trace @@ -0,0 +1,443 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_false.trace new file mode 100644 index 000000000..520e6c98e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_false.trace @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_true.trace new file mode 100644 index 000000000..a0f3467e3 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_true.trace @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_false.trace new file mode 100644 index 000000000..dbd178a88 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_false.trace @@ -0,0 +1,411 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_true.trace new file mode 100644 index 000000000..87d03ff54 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_true.trace @@ -0,0 +1,443 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_false.trace new file mode 100644 index 000000000..8102bda84 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_false.trace @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_true.trace new file mode 100644 index 000000000..c977719e0 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_true.trace @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_false.trace new file mode 100644 index 000000000..1e73848a8 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_false.trace @@ -0,0 +1,519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_true.trace new file mode 100644 index 000000000..e03ef8cbf --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_true.trace @@ -0,0 +1,536 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_false.trace new file mode 100644 index 000000000..c3fc0252a --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_false.trace @@ -0,0 +1,521 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_true.trace new file mode 100644 index 000000000..68389a62f --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_true.trace @@ -0,0 +1,521 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_false.trace new file mode 100644 index 000000000..2bb56a639 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_false.trace @@ -0,0 +1,506 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_true.trace new file mode 100644 index 000000000..5d16e5038 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_true.trace @@ -0,0 +1,506 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_false.trace new file mode 100644 index 000000000..1fc467690 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_false.trace @@ -0,0 +1,506 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_true.trace new file mode 100644 index 000000000..33acd42de --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_true.trace @@ -0,0 +1,506 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_false.trace new file mode 100644 index 000000000..1acbc3c08 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_false.trace @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_true.trace new file mode 100644 index 000000000..3426d67c6 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_true.trace @@ -0,0 +1,469 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_false.trace new file mode 100644 index 000000000..7d5eb66ca --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_false.trace @@ -0,0 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_true.trace new file mode 100644 index 000000000..3a1b975df --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_true.trace @@ -0,0 +1,531 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_false.trace new file mode 100644 index 000000000..b1cd96f18 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_false.trace @@ -0,0 +1,351 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_true.trace new file mode 100644 index 000000000..4a67b9500 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_true.trace @@ -0,0 +1,498 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_false.trace new file mode 100644 index 000000000..fe4f50fee --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_false.trace @@ -0,0 +1,366 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_true.trace new file mode 100644 index 000000000..c5aef6bd1 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_true.trace @@ -0,0 +1,498 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_1.trace new file mode 100644 index 000000000..f5e925ba3 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_1.trace @@ -0,0 +1,551 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_2.trace new file mode 100644 index 000000000..e718ca8d2 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_2.trace @@ -0,0 +1,537 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_3.trace new file mode 100644 index 000000000..f09cdf742 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_3.trace @@ -0,0 +1,537 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_4.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_4.trace new file mode 100644 index 000000000..edb652e7e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_4.trace @@ -0,0 +1,537 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_5.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_5.trace new file mode 100644 index 000000000..ef6c5da4b --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_5.trace @@ -0,0 +1,537 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_6.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_6.trace new file mode 100644 index 000000000..ef42a66bb --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_6.trace @@ -0,0 +1,537 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_1.trace new file mode 100644 index 000000000..d4654faf3 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_1.trace @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_2.trace new file mode 100644 index 000000000..9e025d3ad --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_2.trace @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_3.trace new file mode 100644 index 000000000..8e7ec3990 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_3.trace @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_4.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_4.trace new file mode 100644 index 000000000..d0f360ce0 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_4.trace @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_5.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_5.trace new file mode 100644 index 000000000..e6dda26f4 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_5.trace @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_6.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_6.trace new file mode 100644 index 000000000..5725c6266 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_6.trace @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_1.trace new file mode 100644 index 000000000..8f0ebea30 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_1.trace @@ -0,0 +1,475 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_2.trace new file mode 100644 index 000000000..cf8f1ee7f --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_2.trace @@ -0,0 +1,475 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_3.trace new file mode 100644 index 000000000..58b7e4ee1 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_3.trace @@ -0,0 +1,475 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_1.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_1.trace new file mode 100644 index 000000000..52a1c4744 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_1.trace @@ -0,0 +1,475 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_2.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_2.trace new file mode 100644 index 000000000..41b75b35a --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_2.trace @@ -0,0 +1,475 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_3.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_3.trace new file mode 100644 index 000000000..1f655b035 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_3.trace @@ -0,0 +1,475 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_false.trace new file mode 100644 index 000000000..09866615e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_false.trace @@ -0,0 +1,369 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_true.trace new file mode 100644 index 000000000..8ded0399e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_true.trace @@ -0,0 +1,399 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_false.trace new file mode 100644 index 000000000..5318d0fff --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_false.trace @@ -0,0 +1,385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_true.trace new file mode 100644 index 000000000..8a0b33806 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_true.trace @@ -0,0 +1,385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_false.trace new file mode 100644 index 000000000..094ae9dce --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_false.trace @@ -0,0 +1,369 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_true.trace new file mode 100644 index 000000000..75f338890 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_true.trace @@ -0,0 +1,399 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_false.trace new file mode 100644 index 000000000..ef7b22764 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_false.trace @@ -0,0 +1,385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_true.trace new file mode 100644 index 000000000..fb2854fae --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_true.trace @@ -0,0 +1,385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_false.trace new file mode 100644 index 000000000..a2902626e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_false.trace @@ -0,0 +1,467 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_true.trace new file mode 100644 index 000000000..3009f7ab2 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_true.trace @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_false.trace new file mode 100644 index 000000000..b956d668e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_false.trace @@ -0,0 +1,469 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_true.trace new file mode 100644 index 000000000..d277395c4 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_true.trace @@ -0,0 +1,469 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_false.trace new file mode 100644 index 000000000..21793bd29 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_false.trace @@ -0,0 +1,455 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_true.trace new file mode 100644 index 000000000..b4337163a --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_true.trace @@ -0,0 +1,455 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_false.trace new file mode 100644 index 000000000..c1dd71a57 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_false.trace @@ -0,0 +1,455 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_true.trace new file mode 100644 index 000000000..f12e07643 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_true.trace @@ -0,0 +1,455 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_false.trace new file mode 100644 index 000000000..16955dc8f --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_false.trace @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_true.trace new file mode 100644 index 000000000..97b746e1c --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_true.trace @@ -0,0 +1,422 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_false.trace new file mode 100644 index 000000000..4a7076223 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_false.trace @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_true.trace new file mode 100644 index 000000000..5b98cab01 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_true.trace @@ -0,0 +1,478 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_false.trace new file mode 100644 index 000000000..61b9eea3e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_false.trace @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_true.trace new file mode 100644 index 000000000..4a8bd50d4 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_true.trace @@ -0,0 +1,448 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_false.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_false.trace new file mode 100644 index 000000000..c5307eacb --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_false.trace @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_true.trace b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_true.trace new file mode 100644 index 000000000..9a265d6b5 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_true.trace @@ -0,0 +1,448 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.aird b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.aird new file mode 100644 index 000000000..84e19a701 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.aird @@ -0,0 +1,1037 @@ + + + + 2557-1_1.xsad + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + bold + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.xsad new file mode 100644 index 000000000..bb372685d --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.xsad @@ -0,0 +1,54 @@ +activity "IBM2557-1" { + int i = 1, + int one = 1, + int two = 2, + bool eq2, + bool eq1, + bool gr2 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e6 ) out ( e7 ), + action g in ( e7 ) out ( e8 ), + action h in ( e10 ) out ( e11 ), + action i in ( e17 ) out ( e18 ), + action j in ( e15 ) out ( e16 ), + action k in ( e12 ) out ( e13 ), + action l in ( e13 ) out ( e14 ), + initial ^initial out ( e0 ), + final ^final in ( e9 ), + fork ^fork in ( e4 ) out ( e5, e10 ), + join ^join in ( e8, e19 ) out ( e9 ), + decision ^decision in ( e11 ) out ( e12, e15, e17 ), + merge ^merge in ( e14, e16, e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to f, + flow e7 from f to g, + flow e8 from g to ^join, + flow e9 from ^join to ^final, + flow e10 from ^fork to h, + flow e11 from h to ^decision, + flow e12 from ^decision to k [ eq1 ], + flow e13 from k to l, + flow e14 from l to ^merge, + flow e15 from ^decision to j [ eq2 ], + flow e16 from j to ^merge, + flow e17 from ^decision to i [ gr2 ], + flow e18 from i to ^merge, + flow e19 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_2.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_2.xsad new file mode 100644 index 000000000..37743b720 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_2.xsad @@ -0,0 +1,60 @@ +activity "IBM2557-1" { + int i = 2, + int one = 1, + int two = 2, + bool eq2, + bool eq1, + bool gr2 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e6 ) out ( e7 ), + action g in ( e7 ) out ( e8 ), + action h in ( e10 ) out ( e11 ), + action i in ( e17 ) out ( e18 ), + action j in ( e15 ) out ( e16 ), + action k in ( e12 ) out ( e13 ), + action l in ( e13 ) out ( e14 ), + initial ^initial out ( e0 ), + final ^final in ( e9 ), + fork ^fork in ( e4 ) out ( e5, + e10 ), + join ^join in ( e8, + e19 ) out ( e9 ), + decision ^decision in ( e11 ) out ( e12, + e15, + e17 ), + merge ^merge in ( e14, + e16, + e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to f, + flow e7 from f to g, + flow e8 from g to ^join, + flow e9 from ^join to ^final, + flow e10 from ^fork to h, + flow e11 from h to ^decision, + flow e12 from ^decision to k [ eq1 ], + flow e13 from k to l, + flow e14 from l to ^merge, + flow e15 from ^decision to j [ eq2 ], + flow e16 from j to ^merge, + flow e17 from ^decision to i [ gr2 ], + flow e18 from i to ^merge, + flow e19 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_3.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_3.xsad new file mode 100644 index 000000000..3b4ce197b --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_3.xsad @@ -0,0 +1,60 @@ +activity "IBM2557-1" { + int i = 3, + int one = 1, + int two = 2, + bool eq2, + bool eq1, + bool gr2 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e6 ) out ( e7 ), + action g in ( e7 ) out ( e8 ), + action h in ( e10 ) out ( e11 ), + action i in ( e17 ) out ( e18 ), + action j in ( e15 ) out ( e16 ), + action k in ( e12 ) out ( e13 ), + action l in ( e13 ) out ( e14 ), + initial ^initial out ( e0 ), + final ^final in ( e9 ), + fork ^fork in ( e4 ) out ( e5, + e10 ), + join ^join in ( e8, + e19 ) out ( e9 ), + decision ^decision in ( e11 ) out ( e12, + e15, + e17 ), + merge ^merge in ( e14, + e16, + e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to f, + flow e7 from f to g, + flow e8 from g to ^join, + flow e9 from ^join to ^final, + flow e10 from ^fork to h, + flow e11 from h to ^decision, + flow e12 from ^decision to k [ eq1 ], + flow e13 from k to l, + flow e14 from l to ^merge, + flow e15 from ^decision to j [ eq2 ], + flow e16 from j to ^merge, + flow e17 from ^decision to i [ gr2 ], + flow e18 from i to ^merge, + flow e19 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_4.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_4.xsad new file mode 100644 index 000000000..46f2273b7 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_4.xsad @@ -0,0 +1,60 @@ +activity "IBM2557-1" { + int i = 4, + int one = 1, + int two = 2, + bool eq2, + bool eq1, + bool gr2 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e6 ) out ( e7 ), + action g in ( e7 ) out ( e8 ), + action h in ( e10 ) out ( e11 ), + action i in ( e17 ) out ( e18 ), + action j in ( e15 ) out ( e16 ), + action k in ( e12 ) out ( e13 ), + action l in ( e13 ) out ( e14 ), + initial ^initial out ( e0 ), + final ^final in ( e9 ), + fork ^fork in ( e4 ) out ( e5, + e10 ), + join ^join in ( e8, + e19 ) out ( e9 ), + decision ^decision in ( e11 ) out ( e12, + e15, + e17 ), + merge ^merge in ( e14, + e16, + e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to f, + flow e7 from f to g, + flow e8 from g to ^join, + flow e9 from ^join to ^final, + flow e10 from ^fork to h, + flow e11 from h to ^decision, + flow e12 from ^decision to k [ eq1 ], + flow e13 from k to l, + flow e14 from l to ^merge, + flow e15 from ^decision to j [ eq2 ], + flow e16 from j to ^merge, + flow e17 from ^decision to i [ gr2 ], + flow e18 from i to ^merge, + flow e19 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_5.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_5.xsad new file mode 100644 index 000000000..9a58a107a --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_5.xsad @@ -0,0 +1,60 @@ +activity "IBM2557-1" { + int i = 5, + int one = 1, + int two = 2, + bool eq2, + bool eq1, + bool gr2 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e6 ) out ( e7 ), + action g in ( e7 ) out ( e8 ), + action h in ( e10 ) out ( e11 ), + action i in ( e17 ) out ( e18 ), + action j in ( e15 ) out ( e16 ), + action k in ( e12 ) out ( e13 ), + action l in ( e13 ) out ( e14 ), + initial ^initial out ( e0 ), + final ^final in ( e9 ), + fork ^fork in ( e4 ) out ( e5, + e10 ), + join ^join in ( e8, + e19 ) out ( e9 ), + decision ^decision in ( e11 ) out ( e12, + e15, + e17 ), + merge ^merge in ( e14, + e16, + e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to f, + flow e7 from f to g, + flow e8 from g to ^join, + flow e9 from ^join to ^final, + flow e10 from ^fork to h, + flow e11 from h to ^decision, + flow e12 from ^decision to k [ eq1 ], + flow e13 from k to l, + flow e14 from l to ^merge, + flow e15 from ^decision to j [ eq2 ], + flow e16 from j to ^merge, + flow e17 from ^decision to i [ gr2 ], + flow e18 from i to ^merge, + flow e19 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_6.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_6.xsad new file mode 100644 index 000000000..83e2c06a8 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_6.xsad @@ -0,0 +1,60 @@ +activity "IBM2557-1" { + int i = 6, + int one = 1, + int two = 2, + bool eq2, + bool eq1, + bool gr2 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e6 ) out ( e7 ), + action g in ( e7 ) out ( e8 ), + action h in ( e10 ) out ( e11 ), + action i in ( e17 ) out ( e18 ), + action j in ( e15 ) out ( e16 ), + action k in ( e12 ) out ( e13 ), + action l in ( e13 ) out ( e14 ), + initial ^initial out ( e0 ), + final ^final in ( e9 ), + fork ^fork in ( e4 ) out ( e5, + e10 ), + join ^join in ( e8, + e19 ) out ( e9 ), + decision ^decision in ( e11 ) out ( e12, + e15, + e17 ), + merge ^merge in ( e14, + e16, + e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to f, + flow e7 from f to g, + flow e8 from g to ^join, + flow e9 from ^join to ^final, + flow e10 from ^fork to h, + flow e11 from h to ^decision, + flow e12 from ^decision to k [ eq1 ], + flow e13 from k to l, + flow e14 from l to ^merge, + flow e15 from ^decision to j [ eq2 ], + flow e16 from j to ^merge, + flow e17 from ^decision to i [ gr2 ], + flow e18 from i to ^merge, + flow e19 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_1.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_1.xsad new file mode 100644 index 000000000..3672f903d --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_1.xsad @@ -0,0 +1,56 @@ +activity "IBM2557-2" { + int one, + int two, + bool eq2, + bool eq1, + bool gr2, + int i = 1 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action h in ( e8 ) out ( e9 ), + action i in ( e15 ) out ( e16 ), + action j in ( e13 ) out ( e14 ), + action k in ( e10 ) out ( e11 ), + action l in ( e11 ) out ( e12 ), + initial ^initial out ( e0 ), + final ^final in ( e7 ), + fork ^fork in ( e4 ) out ( e5, + e8 ), + join ^join in ( e6, + e17 ) out ( e7 ), + decision ^decision in ( e9 ) out ( e10, + e13, + e15 ), + merge ^merge in ( e12, + e14, + e16 ) out ( e17 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to ^join, + flow e7 from ^join to ^final, + flow e8 from ^fork to h, + flow e9 from h to ^decision, + flow e10 from ^decision to k [ eq1 ], + flow e11 from k to l, + flow e12 from l to ^merge, + flow e13 from ^decision to j [ eq2 ], + flow e14 from j to ^merge, + flow e15 from ^decision to i [ gr2 ], + flow e16 from i to ^merge, + flow e17 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_2.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_2.xsad new file mode 100644 index 000000000..7495de025 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_2.xsad @@ -0,0 +1,56 @@ +activity "IBM2557-2" { + int one, + int two, + bool eq2, + bool eq1, + bool gr2, + int i = 2 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action h in ( e8 ) out ( e9 ), + action i in ( e15 ) out ( e16 ), + action j in ( e13 ) out ( e14 ), + action k in ( e10 ) out ( e11 ), + action l in ( e11 ) out ( e12 ), + initial ^initial out ( e0 ), + final ^final in ( e7 ), + fork ^fork in ( e4 ) out ( e5, + e8 ), + join ^join in ( e6, + e17 ) out ( e7 ), + decision ^decision in ( e9 ) out ( e10, + e13, + e15 ), + merge ^merge in ( e12, + e14, + e16 ) out ( e17 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to ^join, + flow e7 from ^join to ^final, + flow e8 from ^fork to h, + flow e9 from h to ^decision, + flow e10 from ^decision to k [ eq1 ], + flow e11 from k to l, + flow e12 from l to ^merge, + flow e13 from ^decision to j [ eq2 ], + flow e14 from j to ^merge, + flow e15 from ^decision to i [ gr2 ], + flow e16 from i to ^merge, + flow e17 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_3.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_3.xsad new file mode 100644 index 000000000..50a825ded --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_3.xsad @@ -0,0 +1,56 @@ +activity "IBM2557-2" { + int one, + int two, + bool eq2, + bool eq1, + bool gr2, + int i = 3 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action h in ( e8 ) out ( e9 ), + action i in ( e15 ) out ( e16 ), + action j in ( e13 ) out ( e14 ), + action k in ( e10 ) out ( e11 ), + action l in ( e11 ) out ( e12 ), + initial ^initial out ( e0 ), + final ^final in ( e7 ), + fork ^fork in ( e4 ) out ( e5, + e8 ), + join ^join in ( e6, + e17 ) out ( e7 ), + decision ^decision in ( e9 ) out ( e10, + e13, + e15 ), + merge ^merge in ( e12, + e14, + e16 ) out ( e17 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to ^join, + flow e7 from ^join to ^final, + flow e8 from ^fork to h, + flow e9 from h to ^decision, + flow e10 from ^decision to k [ eq1 ], + flow e11 from k to l, + flow e12 from l to ^merge, + flow e13 from ^decision to j [ eq2 ], + flow e14 from j to ^merge, + flow e15 from ^decision to i [ gr2 ], + flow e16 from i to ^merge, + flow e17 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_4.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_4.xsad new file mode 100644 index 000000000..b608c4c34 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_4.xsad @@ -0,0 +1,56 @@ +activity "IBM2557-2" { + int one, + int two, + bool eq2, + bool eq1, + bool gr2, + int i = 4 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action h in ( e8 ) out ( e9 ), + action i in ( e15 ) out ( e16 ), + action j in ( e13 ) out ( e14 ), + action k in ( e10 ) out ( e11 ), + action l in ( e11 ) out ( e12 ), + initial ^initial out ( e0 ), + final ^final in ( e7 ), + fork ^fork in ( e4 ) out ( e5, + e8 ), + join ^join in ( e6, + e17 ) out ( e7 ), + decision ^decision in ( e9 ) out ( e10, + e13, + e15 ), + merge ^merge in ( e12, + e14, + e16 ) out ( e17 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to ^join, + flow e7 from ^join to ^final, + flow e8 from ^fork to h, + flow e9 from h to ^decision, + flow e10 from ^decision to k [ eq1 ], + flow e11 from k to l, + flow e12 from l to ^merge, + flow e13 from ^decision to j [ eq2 ], + flow e14 from j to ^merge, + flow e15 from ^decision to i [ gr2 ], + flow e16 from i to ^merge, + flow e17 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_5.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_5.xsad new file mode 100644 index 000000000..5d213696b --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_5.xsad @@ -0,0 +1,56 @@ +activity "IBM2557-2" { + int one, + int two, + bool eq2, + bool eq1, + bool gr2, + int i = 5 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action h in ( e8 ) out ( e9 ), + action i in ( e15 ) out ( e16 ), + action j in ( e13 ) out ( e14 ), + action k in ( e10 ) out ( e11 ), + action l in ( e11 ) out ( e12 ), + initial ^initial out ( e0 ), + final ^final in ( e7 ), + fork ^fork in ( e4 ) out ( e5, + e8 ), + join ^join in ( e6, + e17 ) out ( e7 ), + decision ^decision in ( e9 ) out ( e10, + e13, + e15 ), + merge ^merge in ( e12, + e14, + e16 ) out ( e17 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to ^join, + flow e7 from ^join to ^final, + flow e8 from ^fork to h, + flow e9 from h to ^decision, + flow e10 from ^decision to k [ eq1 ], + flow e11 from k to l, + flow e12 from l to ^merge, + flow e13 from ^decision to j [ eq2 ], + flow e14 from j to ^merge, + flow e15 from ^decision to i [ gr2 ], + flow e16 from i to ^merge, + flow e17 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_6.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_6.xsad new file mode 100644 index 000000000..3ec8960cb --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_6.xsad @@ -0,0 +1,56 @@ +activity "IBM2557-2" { + int one, + int two, + bool eq2, + bool eq1, + bool gr2, + int i = 6 nodes { + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action h in ( e8 ) out ( e9 ), + action i in ( e15 ) out ( e16 ), + action j in ( e13 ) out ( e14 ), + action k in ( e10 ) out ( e11 ), + action l in ( e11 ) out ( e12 ), + initial ^initial out ( e0 ), + final ^final in ( e7 ), + fork ^fork in ( e4 ) out ( e5, + e8 ), + join ^join in ( e6, + e17 ) out ( e7 ), + decision ^decision in ( e9 ) out ( e10, + e13, + e15 ), + merge ^merge in ( e12, + e14, + e16 ) out ( e17 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to ^fork, + flow e5 from ^fork to e, + flow e6 from e to ^join, + flow e7 from ^join to ^final, + flow e8 from ^fork to h, + flow e9 from h to ^decision, + flow e10 from ^decision to k [ eq1 ], + flow e11 from k to l, + flow e12 from l to ^merge, + flow e13 from ^decision to j [ eq2 ], + flow e14 from j to ^merge, + flow e15 from ^decision to i [ gr2 ], + flow e16 from i to ^merge, + flow e17 from ^merge to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_1.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_1.xsad new file mode 100644 index 000000000..c11829740 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_1.xsad @@ -0,0 +1,71 @@ +activity "3651-1" { + int loop1, + bool gr2, + bool eq2, + bool eq1, + bool inf13, + bool eq13, + int one, + int two, + int thirteen, + int i = 1 nodes { + initial ^initial out ( e0 ), + final ^final in ( e9 ), + merge mergeE in ( e4, + e19 ) out ( e5 ), + merge mergeFinal in ( e8, + e12, + e17 ) out ( e9 ), + decision decisionI in ( e6 ) out ( e7, + e10, + e13 ), + decision decisionLoop1 in ( e15 ) out ( e16, + e18 ), + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e7 ) out ( e8 ), + action g in ( e10 ) out ( e11 ), + action h in ( e11 ) out ( e12 ), + action i in ( e13 ) out ( e14 ), + action j comp { + inf13 = loop1 < thirteen, + eq13 = loop1 == thirteen + } + in ( e14 ) out ( e15 ), + action k in ( e16 ) out ( e17 ), + action l comp { + loop1 = loop1 + one + } + in ( e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to mergeE, + flow e5 from mergeE to e, + flow e6 from e to decisionI, + flow e7 from decisionI to f [ gr2 ], + flow e8 from f to mergeFinal, + flow e9 from mergeFinal to ^final, + flow e10 from decisionI to g [ eq2 ], + flow e11 from g to h, + flow e12 from h to mergeFinal, + flow e13 from decisionI to i [ eq1 ], + flow e14 from i to j, + flow e15 from j to decisionLoop1, + flow e16 from decisionLoop1 to k [ eq13 ], + flow e17 from k to mergeFinal, + flow e18 from decisionLoop1 to l [ inf13 ], + flow e19 from l to mergeE + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_2.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_2.xsad new file mode 100644 index 000000000..9dc746c3b --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_2.xsad @@ -0,0 +1,71 @@ +activity "3651-1" { + int loop1, + bool gr2, + bool eq2, + bool eq1, + bool inf13, + bool eq13, + int one, + int two, + int thirteen, + int i = 2 nodes { + initial ^initial out ( e0 ), + final ^final in ( e9 ), + merge mergeE in ( e4, + e19 ) out ( e5 ), + merge mergeFinal in ( e8, + e12, + e17 ) out ( e9 ), + decision decisionI in ( e6 ) out ( e7, + e10, + e13 ), + decision decisionLoop1 in ( e15 ) out ( e16, + e18 ), + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e7 ) out ( e8 ), + action g in ( e10 ) out ( e11 ), + action h in ( e11 ) out ( e12 ), + action i in ( e13 ) out ( e14 ), + action j comp { + inf13 = loop1 < thirteen, + eq13 = loop1 == thirteen + } + in ( e14 ) out ( e15 ), + action k in ( e16 ) out ( e17 ), + action l comp { + loop1 = loop1 + one + } + in ( e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to mergeE, + flow e5 from mergeE to e, + flow e6 from e to decisionI, + flow e7 from decisionI to f [ gr2 ], + flow e8 from f to mergeFinal, + flow e9 from mergeFinal to ^final, + flow e10 from decisionI to g [ eq2 ], + flow e11 from g to h, + flow e12 from h to mergeFinal, + flow e13 from decisionI to i [ eq1 ], + flow e14 from i to j, + flow e15 from j to decisionLoop1, + flow e16 from decisionLoop1 to k [ eq13 ], + flow e17 from k to mergeFinal, + flow e18 from decisionLoop1 to l [ inf13 ], + flow e19 from l to mergeE + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_3.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_3.xsad new file mode 100644 index 000000000..7980fc762 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_3.xsad @@ -0,0 +1,71 @@ +activity "3651-1" { + int loop1, + bool gr2, + bool eq2, + bool eq1, + bool inf13, + bool eq13, + int one, + int two, + int thirteen, + int i = 3 nodes { + initial ^initial out ( e0 ), + final ^final in ( e9 ), + merge mergeE in ( e4, + e19 ) out ( e5 ), + merge mergeFinal in ( e8, + e12, + e17 ) out ( e9 ), + decision decisionI in ( e6 ) out ( e7, + e10, + e13 ), + decision decisionLoop1 in ( e15 ) out ( e16, + e18 ), + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e7 ) out ( e8 ), + action g in ( e10 ) out ( e11 ), + action h in ( e11 ) out ( e12 ), + action i in ( e13 ) out ( e14 ), + action j comp { + inf13 = loop1 < thirteen, + eq13 = loop1 == thirteen + } + in ( e14 ) out ( e15 ), + action k in ( e16 ) out ( e17 ), + action l comp { + loop1 = loop1 + one + } + in ( e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to mergeE, + flow e5 from mergeE to e, + flow e6 from e to decisionI, + flow e7 from decisionI to f [ gr2 ], + flow e8 from f to mergeFinal, + flow e9 from mergeFinal to ^final, + flow e10 from decisionI to g [ eq2 ], + flow e11 from g to h, + flow e12 from h to mergeFinal, + flow e13 from decisionI to i [ eq1 ], + flow e14 from i to j, + flow e15 from j to decisionLoop1, + flow e16 from decisionLoop1 to k [ eq13 ], + flow e17 from k to mergeFinal, + flow e18 from decisionLoop1 to l [ inf13 ], + flow e19 from l to mergeE + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_1.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_1.xsad new file mode 100644 index 000000000..1a1d163ed --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_1.xsad @@ -0,0 +1,71 @@ +activity "3651-2" { + int loop1, + bool gr2, + bool eq2, + bool eq1, + bool inf14, + bool eq14, + int one, + int two, + int fourteen, + int i = 1 nodes { + initial ^initial out ( e0 ), + final ^final in ( e9 ), + merge mergeE in ( e4, + e19 ) out ( e5 ), + merge mergeFinal in ( e8, + e12, + e17 ) out ( e9 ), + decision decisionI in ( e6 ) out ( e7, + e10, + e13 ), + decision decisionLoop1 in ( e15 ) out ( e16, + e18 ), + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e7 ) out ( e8 ), + action g in ( e10 ) out ( e11 ), + action h in ( e11 ) out ( e12 ), + action i in ( e13 ) out ( e14 ), + action j comp { + inf14 = loop1 < fourteen, + eq14 = loop1 == fourteen + } + in ( e14 ) out ( e15 ), + action k in ( e16 ) out ( e17 ), + action l comp { + loop1 = loop1 + one + } + in ( e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to mergeE, + flow e5 from mergeE to e, + flow e6 from e to decisionI, + flow e7 from decisionI to f [ gr2 ], + flow e8 from f to mergeFinal, + flow e9 from mergeFinal to ^final, + flow e10 from decisionI to g [ eq2 ], + flow e11 from g to h, + flow e12 from h to mergeFinal, + flow e13 from decisionI to i [ eq1 ], + flow e14 from i to j, + flow e15 from j to decisionLoop1, + flow e16 from decisionLoop1 to k [ eq14 ], + flow e17 from k to mergeFinal, + flow e18 from decisionLoop1 to l [ inf14 ], + flow e19 from l to mergeE + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_2.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_2.xsad new file mode 100644 index 000000000..9ff09f5c0 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_2.xsad @@ -0,0 +1,71 @@ +activity "3651-2" { + int loop1, + bool gr2, + bool eq2, + bool eq1, + bool inf14, + bool eq14, + int one, + int two, + int fourteen, + int i = 2 nodes { + initial ^initial out ( e0 ), + final ^final in ( e9 ), + merge mergeE in ( e4, + e19 ) out ( e5 ), + merge mergeFinal in ( e8, + e12, + e17 ) out ( e9 ), + decision decisionI in ( e6 ) out ( e7, + e10, + e13 ), + decision decisionLoop1 in ( e15 ) out ( e16, + e18 ), + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e7 ) out ( e8 ), + action g in ( e10 ) out ( e11 ), + action h in ( e11 ) out ( e12 ), + action i in ( e13 ) out ( e14 ), + action j comp { + inf14 = loop1 < fourteen, + eq14 = loop1 == fourteen + } + in ( e14 ) out ( e15 ), + action k in ( e16 ) out ( e17 ), + action l comp { + loop1 = loop1 + one + } + in ( e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to mergeE, + flow e5 from mergeE to e, + flow e6 from e to decisionI, + flow e7 from decisionI to f [ gr2 ], + flow e8 from f to mergeFinal, + flow e9 from mergeFinal to ^final, + flow e10 from decisionI to g [ eq2 ], + flow e11 from g to h, + flow e12 from h to mergeFinal, + flow e13 from decisionI to i [ eq1 ], + flow e14 from i to j, + flow e15 from j to decisionLoop1, + flow e16 from decisionLoop1 to k [ eq14 ], + flow e17 from k to mergeFinal, + flow e18 from decisionLoop1 to l [ inf14 ], + flow e19 from l to mergeE + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_3.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_3.xsad new file mode 100644 index 000000000..de2cc8826 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_3.xsad @@ -0,0 +1,71 @@ +activity "3651-2" { + int loop1, + bool gr2, + bool eq2, + bool eq1, + bool inf14, + bool eq14, + int one, + int two, + int fourteen, + int i = 3 nodes { + initial ^initial out ( e0 ), + final ^final in ( e9 ), + merge mergeE in ( e4, + e19 ) out ( e5 ), + merge mergeFinal in ( e8, + e12, + e17 ) out ( e9 ), + decision decisionI in ( e6 ) out ( e7, + e10, + e13 ), + decision decisionLoop1 in ( e15 ) out ( e16, + e18 ), + action a comp { + eq1 = i == one, + eq2 = i == two, + gr2 = i > two + } + in ( e0 ) out ( e1 ), + action b in ( e1 ) out ( e2 ), + action c in ( e2 ) out ( e3 ), + action d in ( e3 ) out ( e4 ), + action e in ( e5 ) out ( e6 ), + action f in ( e7 ) out ( e8 ), + action g in ( e10 ) out ( e11 ), + action h in ( e11 ) out ( e12 ), + action i in ( e13 ) out ( e14 ), + action j comp { + inf14 = loop1 < fourteen, + eq14 = loop1 == fourteen + } + in ( e14 ) out ( e15 ), + action k in ( e16 ) out ( e17 ), + action l comp { + loop1 = loop1 + one + } + in ( e18 ) out ( e19 ) + } + edges { + flow e0 from ^initial to a, + flow e1 from a to b, + flow e2 from b to c, + flow e3 from c to d, + flow e4 from d to mergeE, + flow e5 from mergeE to e, + flow e6 from e to decisionI, + flow e7 from decisionI to f [ gr2 ], + flow e8 from f to mergeFinal, + flow e9 from mergeFinal to ^final, + flow e10 from decisionI to g [ eq2 ], + flow e11 from g to h, + flow e12 from h to mergeFinal, + flow e13 from decisionI to i [ eq1 ], + flow e14 from i to j, + flow e15 from j to decisionLoop1, + flow e16 from decisionLoop1 to k [ eq14 ], + flow e17 from k to mergeFinal, + flow e18 from decisionLoop1 to l [ inf14 ], + flow e19 from l to mergeE + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_false.xsad new file mode 100644 index 000000000..c397e53b8 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_false.xsad @@ -0,0 +1,48 @@ +activity ExampleBV1 { + bool notExists, + bool notFound, + bool exists = false, + bool found = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action acc in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15 ) out ( e8 ), + merge mergeFinal in ( e9, + e14 ) out ( e10 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to acc [ exists ], + flow e7 from acc to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to mergeFinal, + flow e15 from cont to mergeDoRq + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_true.xsad new file mode 100644 index 000000000..0b9391c86 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_true.xsad @@ -0,0 +1,48 @@ +activity ExampleBV1 { + bool notExists, + bool notFound, + bool exists = false, + bool found = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action acc in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15 ) out ( e8 ), + merge mergeFinal in ( e9, + e14 ) out ( e10 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to acc [ exists ], + flow e7 from acc to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to mergeFinal, + flow e15 from cont to mergeDoRq + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_false.xsad new file mode 100644 index 000000000..7945d1733 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_false.xsad @@ -0,0 +1,48 @@ +activity ExampleBV1 { + bool notExists, + bool notFound, + bool exists = true, + bool found = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action acc in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15 ) out ( e8 ), + merge mergeFinal in ( e9, + e14 ) out ( e10 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to acc [ exists ], + flow e7 from acc to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to mergeFinal, + flow e15 from cont to mergeDoRq + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_true.xsad new file mode 100644 index 000000000..d81423c1c --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_true.xsad @@ -0,0 +1,48 @@ +activity ExampleBV1 { + bool notExists, + bool notFound, + bool exists = true, + bool found = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action acc in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15 ) out ( e8 ), + merge mergeFinal in ( e9, + e14 ) out ( e10 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to acc [ exists ], + flow e7 from acc to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to mergeFinal, + flow e15 from cont to mergeDoRq + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_false.xsad new file mode 100644 index 000000000..6fa5e440e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_false.xsad @@ -0,0 +1,47 @@ +activity ExampleBV2 { + bool notExists, + bool notFound, + bool exists = false, + bool found = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notExists = ! exists, + notFound = ! found + } in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15 ) out ( e8 ), + merge mergeFinal in ( e9, + e14 ) out ( e10 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to mergeFinal, + flow e15 from cont to mergeDoRq + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_true.xsad new file mode 100644 index 000000000..1db3e0ab3 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_true.xsad @@ -0,0 +1,47 @@ +activity ExampleBV2 { + bool notExists, + bool notFound, + bool exists = false, + bool found = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notExists = ! exists, + notFound = ! found + } in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15 ) out ( e8 ), + merge mergeFinal in ( e9, + e14 ) out ( e10 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to mergeFinal, + flow e15 from cont to mergeDoRq + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_false.xsad new file mode 100644 index 000000000..840080b5c --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_false.xsad @@ -0,0 +1,47 @@ +activity ExampleBV2 { + bool notExists, + bool notFound, + bool exists = true, + bool found = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notExists = ! exists, + notFound = ! found + } in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15 ) out ( e8 ), + merge mergeFinal in ( e9, + e14 ) out ( e10 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to mergeFinal, + flow e15 from cont to mergeDoRq + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_true.xsad new file mode 100644 index 000000000..58efa6f53 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_true.xsad @@ -0,0 +1,47 @@ +activity ExampleBV2 { + bool notExists, + bool notFound, + bool exists = true, + bool found = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notExists = ! exists, + notFound = ! found + } in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15 ) out ( e8 ), + merge mergeFinal in ( e9, + e14 ) out ( e10 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to mergeFinal, + flow e15 from cont to mergeDoRq + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_false.xsad new file mode 100644 index 000000000..7b5b9ae80 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_false.xsad @@ -0,0 +1,62 @@ +activity ExampleBV3 { + bool notExists, + bool notFound, + bool notAcc, + bool exists = false, + bool found = false, + bool acc = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notAcc = ! acc, + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15, + e18 ) out ( e8 ), + merge mergeFinal in ( e9, + e20 ) out ( e10 ), + decision acc1 in ( e14 ) out ( e16, + e17 ), + action acc2 in ( e17 ) out ( e18 ), + action val in ( e16 ) out ( e19 ), + action noacc in ( e19 ) out ( e20 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to acc1, + flow e15 from cont to mergeDoRq, + flow e16 from acc1 to val [ notAcc ], + flow e17 from acc1 to acc2 [ acc ], + flow e18 from acc2 to mergeDoRq, + flow e19 from val to noacc, + flow e20 from noacc to mergeFinal + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_true.xsad new file mode 100644 index 000000000..14f3e5923 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_true.xsad @@ -0,0 +1,62 @@ +activity ExampleBV3 { + bool notExists, + bool notFound, + bool notAcc, + bool exists = false, + bool found = false, + bool acc = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notAcc = ! acc, + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15, + e18 ) out ( e8 ), + merge mergeFinal in ( e9, + e20 ) out ( e10 ), + decision acc1 in ( e14 ) out ( e16, + e17 ), + action acc2 in ( e17 ) out ( e18 ), + action val in ( e16 ) out ( e19 ), + action noacc in ( e19 ) out ( e20 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to acc1, + flow e15 from cont to mergeDoRq, + flow e16 from acc1 to val [ notAcc ], + flow e17 from acc1 to acc2 [ acc ], + flow e18 from acc2 to mergeDoRq, + flow e19 from val to noacc, + flow e20 from noacc to mergeFinal + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_false.xsad new file mode 100644 index 000000000..b3a68af51 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_false.xsad @@ -0,0 +1,62 @@ +activity ExampleBV3 { + bool notExists, + bool notFound, + bool notAcc, + bool exists = false, + bool found = true, + bool acc = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notAcc = ! acc, + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15, + e18 ) out ( e8 ), + merge mergeFinal in ( e9, + e20 ) out ( e10 ), + decision acc1 in ( e14 ) out ( e16, + e17 ), + action acc2 in ( e17 ) out ( e18 ), + action val in ( e16 ) out ( e19 ), + action noacc in ( e19 ) out ( e20 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to acc1, + flow e15 from cont to mergeDoRq, + flow e16 from acc1 to val [ notAcc ], + flow e17 from acc1 to acc2 [ acc ], + flow e18 from acc2 to mergeDoRq, + flow e19 from val to noacc, + flow e20 from noacc to mergeFinal + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_true.xsad new file mode 100644 index 000000000..a046acc50 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_true.xsad @@ -0,0 +1,62 @@ +activity ExampleBV3 { + bool notExists, + bool notFound, + bool notAcc, + bool exists = false, + bool found = true, + bool acc = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notAcc = ! acc, + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15, + e18 ) out ( e8 ), + merge mergeFinal in ( e9, + e20 ) out ( e10 ), + decision acc1 in ( e14 ) out ( e16, + e17 ), + action acc2 in ( e17 ) out ( e18 ), + action val in ( e16 ) out ( e19 ), + action noacc in ( e19 ) out ( e20 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to acc1, + flow e15 from cont to mergeDoRq, + flow e16 from acc1 to val [ notAcc ], + flow e17 from acc1 to acc2 [ acc ], + flow e18 from acc2 to mergeDoRq, + flow e19 from val to noacc, + flow e20 from noacc to mergeFinal + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_false.xsad new file mode 100644 index 000000000..a4a4c6fef --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_false.xsad @@ -0,0 +1,62 @@ +activity ExampleBV3 { + bool notExists, + bool notFound, + bool notAcc, + bool exists = true, + bool found = false, + bool acc = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notAcc = ! acc, + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15, + e18 ) out ( e8 ), + merge mergeFinal in ( e9, + e20 ) out ( e10 ), + decision acc1 in ( e14 ) out ( e16, + e17 ), + action acc2 in ( e17 ) out ( e18 ), + action val in ( e16 ) out ( e19 ), + action noacc in ( e19 ) out ( e20 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to acc1, + flow e15 from cont to mergeDoRq, + flow e16 from acc1 to val [ notAcc ], + flow e17 from acc1 to acc2 [ acc ], + flow e18 from acc2 to mergeDoRq, + flow e19 from val to noacc, + flow e20 from noacc to mergeFinal + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_true.xsad new file mode 100644 index 000000000..18e8343cd --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_true.xsad @@ -0,0 +1,62 @@ +activity ExampleBV3 { + bool notExists, + bool notFound, + bool notAcc, + bool exists = true, + bool found = false, + bool acc = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notAcc = ! acc, + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15, + e18 ) out ( e8 ), + merge mergeFinal in ( e9, + e20 ) out ( e10 ), + decision acc1 in ( e14 ) out ( e16, + e17 ), + action acc2 in ( e17 ) out ( e18 ), + action val in ( e16 ) out ( e19 ), + action noacc in ( e19 ) out ( e20 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to acc1, + flow e15 from cont to mergeDoRq, + flow e16 from acc1 to val [ notAcc ], + flow e17 from acc1 to acc2 [ acc ], + flow e18 from acc2 to mergeDoRq, + flow e19 from val to noacc, + flow e20 from noacc to mergeFinal + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_false.xsad new file mode 100644 index 000000000..7cfeadac2 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_false.xsad @@ -0,0 +1,62 @@ +activity ExampleBV3 { + bool notExists, + bool notFound, + bool notAcc, + bool exists = true, + bool found = true, + bool acc = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notAcc = ! acc, + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15, + e18 ) out ( e8 ), + merge mergeFinal in ( e9, + e20 ) out ( e10 ), + decision acc1 in ( e14 ) out ( e16, + e17 ), + action acc2 in ( e17 ) out ( e18 ), + action val in ( e16 ) out ( e19 ), + action noacc in ( e19 ) out ( e20 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to acc1, + flow e15 from cont to mergeDoRq, + flow e16 from acc1 to val [ notAcc ], + flow e17 from acc1 to acc2 [ acc ], + flow e18 from acc2 to mergeDoRq, + flow e19 from val to noacc, + flow e20 from noacc to mergeFinal + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_true.xsad new file mode 100644 index 000000000..c8412603e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_true.xsad @@ -0,0 +1,62 @@ +activity ExampleBV3 { + bool notExists, + bool notFound, + bool notAcc, + bool exists = true, + bool found = true, + bool acc = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e10 ), + action req comp { + notAcc = ! acc, + notExists = ! exists, + notFound = ! found + } + in ( e0 ) out ( e1 ), + action nCode in ( e1 ) out ( e2 ), + action def in ( e2 ) out ( e3 ), + action contInt in ( e3 ) out ( e4 ), + action search in ( e5 ) out ( e11 ), + action ord in ( e6 ) out ( e7 ), + action cont in ( e12 ) out ( e15 ), + action contExt in ( e13 ) out ( e14 ), + action doReq in ( e8 ) out ( e9 ), + decision exists in ( e4 ) out ( e5, + e6 ), + decision found in ( e11 ) out ( e12, + e13 ), + merge mergeDoRq in ( e7, + e15, + e18 ) out ( e8 ), + merge mergeFinal in ( e9, + e20 ) out ( e10 ), + decision acc1 in ( e14 ) out ( e16, + e17 ), + action acc2 in ( e17 ) out ( e18 ), + action val in ( e16 ) out ( e19 ), + action noacc in ( e19 ) out ( e20 ) + } + edges { + flow e0 from ^initial to req, + flow e1 from req to nCode, + flow e2 from nCode to def, + flow e3 from def to contInt, + flow e4 from contInt to exists, + flow e5 from exists to search [ notExists ], + flow e6 from exists to ord [ exists ], + flow e7 from ord to mergeDoRq, + flow e8 from mergeDoRq to doReq, + flow e9 from doReq to mergeFinal, + flow e10 from mergeFinal to ^final, + flow e11 from search to found, + flow e12 from found to cont [ found ], + flow e13 from found to contExt [ notFound ], + flow e14 from contExt to acc1, + flow e15 from cont to mergeDoRq, + flow e16 from acc1 to val [ notAcc ], + flow e17 from acc1 to acc2 [ acc ], + flow e18 from acc2 to mergeDoRq, + flow e19 from val to noacc, + flow e20 from noacc to mergeFinal + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_false.xsad new file mode 100644 index 000000000..4e51e20c4 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_false.xsad @@ -0,0 +1,43 @@ +activity hireV1 { + bool notInternal, + bool internal = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e13 ), + decision internal in ( e1 ) out ( e2, + e3 ), + merge ^merge in ( e11, + e14 ) out ( e12 ), + action register comp { + notInternal = ! internal + } + in ( e0 ) out ( e1 ), + action assignToProjectExternal in ( e2 ) out ( e14 ), + action getWelcomePack in ( e3 ) out ( e4 ), + action assignToProjectInternal in ( e5 ) out ( e7 ), + action addToWebsite in ( e6 ) out ( e8 ), + action managerInterview in ( e9 ) out ( e10 ), + action managerReport in ( e10 ) out ( e11 ), + action authorizePayment in ( e12 ) out ( e13 ), + fork ^fork in ( e4 ) out ( e5, + e6 ), + join ^join in ( e7, + e8 ) out ( e9 ) + } + edges { + flow e0 from ^initial to register, + flow e1 from register to internal, + flow e2 from internal to assignToProjectExternal [ notInternal ], + flow e3 from internal to getWelcomePack [ internal ], + flow e4 from getWelcomePack to ^fork, + flow e5 from ^fork to assignToProjectInternal, + flow e6 from ^fork to addToWebsite, + flow e7 from assignToProjectInternal to ^join, + flow e8 from addToWebsite to ^join, + flow e9 from ^join to managerInterview, + flow e10 from managerInterview to managerReport, + flow e11 from managerReport to ^merge, + flow e12 from ^merge to authorizePayment, + flow e13 from authorizePayment to ^final, + flow e14 from assignToProjectExternal to ^merge + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_true.xsad new file mode 100644 index 000000000..cb8ec63d9 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_true.xsad @@ -0,0 +1,43 @@ +activity hireV1 { + bool notInternal, + bool internal = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e13 ), + decision internal in ( e1 ) out ( e2, + e3 ), + merge ^merge in ( e11, + e14 ) out ( e12 ), + action register comp { + notInternal = ! internal + } + in ( e0 ) out ( e1 ), + action assignToProjectExternal in ( e2 ) out ( e14 ), + action getWelcomePack in ( e3 ) out ( e4 ), + action assignToProjectInternal in ( e5 ) out ( e7 ), + action addToWebsite in ( e6 ) out ( e8 ), + action managerInterview in ( e9 ) out ( e10 ), + action managerReport in ( e10 ) out ( e11 ), + action authorizePayment in ( e12 ) out ( e13 ), + fork ^fork in ( e4 ) out ( e5, + e6 ), + join ^join in ( e7, + e8 ) out ( e9 ) + } + edges { + flow e0 from ^initial to register, + flow e1 from register to internal, + flow e2 from internal to assignToProjectExternal [ notInternal ], + flow e3 from internal to getWelcomePack [ internal ], + flow e4 from getWelcomePack to ^fork, + flow e5 from ^fork to assignToProjectInternal, + flow e6 from ^fork to addToWebsite, + flow e7 from assignToProjectInternal to ^join, + flow e8 from addToWebsite to ^join, + flow e9 from ^join to managerInterview, + flow e10 from managerInterview to managerReport, + flow e11 from managerReport to ^merge, + flow e12 from ^merge to authorizePayment, + flow e13 from authorizePayment to ^final, + flow e14 from assignToProjectExternal to ^merge + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_false.xsad new file mode 100644 index 000000000..731c9adc4 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_false.xsad @@ -0,0 +1,48 @@ +activity hireV2 { + bool noInternal, + bool internal = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e13 ), + decision internal in ( e1 ) out ( e2, + e3 ), + merge ^merge in ( e11, + e14 ) out ( e12 ), + action register comp { + noInternal = ! internal + } + in ( e0 ) out ( e1 ), + action assignToProjectExternal in ( e2 ) out ( e14 ), + action getWelcomePack in ( e3 ) out ( e4 ), + action assignToProjectInternal in ( e5 ) out ( e7 ), + action addToWebsite in ( e6 ) out ( e8 ), + action managerInterview in ( e9 ) out ( e10 ), + action managerReport in ( e10 ) out ( e11 ), + action authorizePayment in ( e12 ) out ( e13 ), + fork ^fork in ( e4 ) out ( e5, + e6, + e15 ), + join ^join in ( e7, + e8, + e16 ) out ( e9 ), + action assignKeys in ( e15 ) out ( e16 ) + } + edges { + flow e0 from ^initial to register, + flow e1 from register to internal, + flow e2 from internal to assignToProjectExternal [ noInternal ], + flow e3 from internal to getWelcomePack [ internal ], + flow e4 from getWelcomePack to ^fork, + flow e5 from ^fork to assignToProjectInternal, + flow e6 from ^fork to addToWebsite, + flow e7 from assignToProjectInternal to ^join, + flow e8 from addToWebsite to ^join, + flow e9 from ^join to managerInterview, + flow e10 from managerInterview to managerReport, + flow e11 from managerReport to ^merge, + flow e12 from ^merge to authorizePayment, + flow e13 from authorizePayment to ^final, + flow e14 from assignToProjectExternal to ^merge, + flow e15 from ^fork to assignKeys, + flow e16 from assignKeys to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_true.xsad new file mode 100644 index 000000000..00ba5744e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_true.xsad @@ -0,0 +1,48 @@ +activity hireV2 { + bool noInternal, + bool internal = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e13 ), + decision internal in ( e1 ) out ( e2, + e3 ), + merge ^merge in ( e11, + e14 ) out ( e12 ), + action register comp { + noInternal = ! internal + } + in ( e0 ) out ( e1 ), + action assignToProjectExternal in ( e2 ) out ( e14 ), + action getWelcomePack in ( e3 ) out ( e4 ), + action assignToProjectInternal in ( e5 ) out ( e7 ), + action addToWebsite in ( e6 ) out ( e8 ), + action managerInterview in ( e9 ) out ( e10 ), + action managerReport in ( e10 ) out ( e11 ), + action authorizePayment in ( e12 ) out ( e13 ), + fork ^fork in ( e4 ) out ( e5, + e6, + e15 ), + join ^join in ( e7, + e8, + e16 ) out ( e9 ), + action assignKeys in ( e15 ) out ( e16 ) + } + edges { + flow e0 from ^initial to register, + flow e1 from register to internal, + flow e2 from internal to assignToProjectExternal [ noInternal ], + flow e3 from internal to getWelcomePack [ internal ], + flow e4 from getWelcomePack to ^fork, + flow e5 from ^fork to assignToProjectInternal, + flow e6 from ^fork to addToWebsite, + flow e7 from assignToProjectInternal to ^join, + flow e8 from addToWebsite to ^join, + flow e9 from ^join to managerInterview, + flow e10 from managerInterview to managerReport, + flow e11 from managerReport to ^merge, + flow e12 from ^merge to authorizePayment, + flow e13 from authorizePayment to ^final, + flow e14 from assignToProjectExternal to ^merge, + flow e15 from ^fork to assignKeys, + flow e16 from assignKeys to ^join + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_false.xsad new file mode 100644 index 000000000..8bdb1238c --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_false.xsad @@ -0,0 +1,44 @@ +activity hireV3 { + bool notInternal, + bool internal = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e13 ), + decision internal in ( e1 ) out ( e2, + e3 ), + merge ^merge in ( e11, + e14 ) out ( e12 ), + action register comp { + notInternal = ! internal + } in ( e0 ) out ( e1 ), + action assignToProjectExternal in ( e2 ) out ( e14 ), + action getWelcomePack in ( e3 ) out ( e4 ), + action assignToProjectInternal in ( e5 ) out ( e7 ), + action addToWebsite in ( e6 ) out ( e8 ), + action managerInterview in ( e9 ) out ( e10 ), + action managerReport in ( e10 ) out ( e11 ), + action authorizePayment in ( e12 ) out ( e13 ), + fork ^fork in ( e4 ) out ( e6, + e15 ), + join ^join in ( e7, + e8 ) out ( e9 ), + action assignKeys in ( e15 ) out ( e5 ) + } + edges { + flow e0 from ^initial to register, + flow e1 from register to internal, + flow e2 from internal to assignToProjectExternal [ notInternal ], + flow e3 from internal to getWelcomePack [ internal ], + flow e4 from getWelcomePack to ^fork, + flow e5 from assignKeys to assignToProjectInternal, + flow e6 from ^fork to addToWebsite, + flow e7 from assignToProjectInternal to ^join, + flow e8 from addToWebsite to ^join, + flow e9 from ^join to managerInterview, + flow e10 from managerInterview to managerReport, + flow e11 from managerReport to ^merge, + flow e12 from ^merge to authorizePayment, + flow e13 from authorizePayment to ^final, + flow e14 from assignToProjectExternal to ^merge, + flow e15 from ^fork to assignKeys + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_true.xsad new file mode 100644 index 000000000..a0906d1ec --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_true.xsad @@ -0,0 +1,44 @@ +activity hireV3 { + bool notInternal, + bool internal = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e13 ), + decision internal in ( e1 ) out ( e2, + e3 ), + merge ^merge in ( e11, + e14 ) out ( e12 ), + action register comp { + notInternal = ! internal + } in ( e0 ) out ( e1 ), + action assignToProjectExternal in ( e2 ) out ( e14 ), + action getWelcomePack in ( e3 ) out ( e4 ), + action assignToProjectInternal in ( e5 ) out ( e7 ), + action addToWebsite in ( e6 ) out ( e8 ), + action managerInterview in ( e9 ) out ( e10 ), + action managerReport in ( e10 ) out ( e11 ), + action authorizePayment in ( e12 ) out ( e13 ), + fork ^fork in ( e4 ) out ( e6, + e15 ), + join ^join in ( e7, + e8 ) out ( e9 ), + action assignKeys in ( e15 ) out ( e5 ) + } + edges { + flow e0 from ^initial to register, + flow e1 from register to internal, + flow e2 from internal to assignToProjectExternal [ notInternal ], + flow e3 from internal to getWelcomePack [ internal ], + flow e4 from getWelcomePack to ^fork, + flow e5 from assignKeys to assignToProjectInternal, + flow e6 from ^fork to addToWebsite, + flow e7 from assignToProjectInternal to ^join, + flow e8 from addToWebsite to ^join, + flow e9 from ^join to managerInterview, + flow e10 from managerInterview to managerReport, + flow e11 from managerReport to ^merge, + flow e12 from ^merge to authorizePayment, + flow e13 from authorizePayment to ^final, + flow e14 from assignToProjectExternal to ^merge, + flow e15 from ^fork to assignKeys + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_false.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_false.xsad new file mode 100644 index 000000000..a6b689e25 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_false.xsad @@ -0,0 +1,44 @@ +activity hireV4 { + bool notInternal, + bool internal = false nodes { + initial ^initial out ( e0 ), + final ^final in ( e13 ), + decision internal in ( e1 ) out ( e2, + e3 ), + merge ^merge in ( e14, + e10 ) out ( e11 ), + action register comp { + notInternal = ! internal + } in ( e0 ) out ( e1 ), + action assignToProjectExternal in ( e2 ) out ( e14 ), + action getWelcomePack in ( e3 ) out ( e4 ), + action assignToProjectInternal in ( e5 ) out ( e7 ), + action addToWwebsite in ( e6 ) out ( e8 ), + action managerInterview in ( e9 ) out ( e10 ), + action managerReport in ( e11 ) out ( e12 ), + action authorizePayment in ( e12 ) out ( e13 ), + fork ^fork in ( e4 ) out ( e6, + e15 ), + join ^join in ( e7, + e8 ) out ( e9 ), + action assignKeys in ( e15 ) out ( e5 ) + } + edges { + flow e0 from ^initial to register, + flow e1 from register to internal, + flow e2 from internal to assignToProjectExternal [ notInternal ], + flow e3 from internal to getWelcomePack [ internal ], + flow e4 from getWelcomePack to ^fork, + flow e5 from assignKeys to assignToProjectInternal, + flow e6 from ^fork to addToWwebsite, + flow e7 from assignToProjectInternal to ^join, + flow e8 from addToWwebsite to ^join, + flow e9 from ^join to managerInterview, + flow e10 from managerInterview to ^merge, + flow e11 from ^merge to managerReport, + flow e12 from managerReport to authorizePayment, + flow e13 from authorizePayment to ^final, + flow e14 from assignToProjectExternal to ^merge, + flow e15 from ^fork to assignKeys + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_true.xsad b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_true.xsad new file mode 100644 index 000000000..477a08bdb --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_true.xsad @@ -0,0 +1,44 @@ +activity hireV4 { + bool notInternal, + bool internal = true nodes { + initial ^initial out ( e0 ), + final ^final in ( e13 ), + decision internal in ( e1 ) out ( e2, + e3 ), + merge ^merge in ( e14, + e10 ) out ( e11 ), + action register comp { + notInternal = ! internal + } in ( e0 ) out ( e1 ), + action assignToProjectExternal in ( e2 ) out ( e14 ), + action getWelcomePack in ( e3 ) out ( e4 ), + action assignToProjectInternal in ( e5 ) out ( e7 ), + action addToWwebsite in ( e6 ) out ( e8 ), + action managerInterview in ( e9 ) out ( e10 ), + action managerReport in ( e11 ) out ( e12 ), + action authorizePayment in ( e12 ) out ( e13 ), + fork ^fork in ( e4 ) out ( e6, + e15 ), + join ^join in ( e7, + e8 ) out ( e9 ), + action assignKeys in ( e15 ) out ( e5 ) + } + edges { + flow e0 from ^initial to register, + flow e1 from register to internal, + flow e2 from internal to assignToProjectExternal [ notInternal ], + flow e3 from internal to getWelcomePack [ internal ], + flow e4 from getWelcomePack to ^fork, + flow e5 from assignKeys to assignToProjectInternal, + flow e6 from ^fork to addToWwebsite, + flow e7 from assignToProjectInternal to ^join, + flow e8 from addToWwebsite to ^join, + flow e9 from ^join to managerInterview, + flow e10 from managerInterview to ^merge, + flow e11 from ^merge to managerReport, + flow e12 from managerReport to authorizePayment, + flow e13 from authorizePayment to ^final, + flow e14 from assignToProjectExternal to ^merge, + flow e15 from ^fork to assignKeys + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/output_memory_08-03-2017_16-32-39/results.csv b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/output_memory_08-03-2017_16-32-39/results.csv new file mode 100644 index 000000000..0564869dd --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/output_memory_08-03-2017_16-32-39/results.csv @@ -0,0 +1,43 @@ +SpecificTraceImplMemory,SpecificTraceImplStates,GenericTraceImplMemory,GenericTraceImplStates,ExecutionTraceModelImplMemory,ExecutionTraceModelImplStates +49064,32,50128,32,305880,32 +27944,12,27776,12,117472,13 +36712,18,36928,18,188280,19 +46440,21,46672,21,268032,21 +49064,32,50128,32,306136,32 +59080,34,60128,34,414248,34 +31872,14,31872,14,143344,15 +46400,21,46632,21,268032,21 +43616,30,44592,30,271080,30 +53184,35,54528,35,344248,35 +51248,30,52120,30,333656,30 +47552,21,47448,21,283992,21 +47552,21,47448,21,283992,21 +46400,21,46632,21,268032,21 +47776,22,48080,22,293472,23 +47552,21,47448,21,283992,21 +42008,23,42408,23,227784,23 +59080,34,60128,34,414248,34 +51248,30,52120,30,333656,30 +50360,25,50776,25,318912,25 +40008,21,40336,21,208056,21 +30480,12,30376,12,127248,13 +51248,30,52120,30,333656,30 +40008,21,40336,21,208056,21 +61120,36,62280,36,438760,36 +59080,34,60128,34,414248,34 +48400,23,48704,23,293472,23 +47552,21,47448,21,283992,21 +51248,30,52120,30,333656,30 +59080,34,60128,34,414248,34 +40056,21,40384,21,208056,21 +42008,23,42408,23,227784,23 +51248,30,52120,30,333656,30 +29968,12,29856,12,124232,13 +36712,18,36928,18,188280,19 +40056,21,40384,21,208056,21 +46352,21,46584,21,268032,21 +48400,23,48704,23,293472,23 +47552,21,47448,21,283992,21 +51248,30,52120,30,333656,30 +47552,21,47448,21,283992,21 +59080,34,60128,34,414248,34 diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Benchmark.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Benchmark.xtend deleted file mode 100644 index a6e34a891..000000000 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Benchmark.xtend +++ /dev/null @@ -1,164 +0,0 @@ -package fr.inria.diverse.trace.benchmark - -import fr.inria.diverse.trace.benchmark.api.IDebuggerHelper -import java.io.File -import java.io.IOException -import java.util.Collections -import java.util.HashSet -import java.util.List -import java.util.Map -import java.util.Set -import org.eclipse.core.runtime.CoreException -import org.eclipse.emf.common.util.URI -import org.eclipse.emf.ecore.EObject -import org.eclipse.emf.ecore.resource.Resource -import org.gemoc.execution.engine.commons.EngineContextException - -/** - * We want one line per tuple - * Each line has: - * language,model,debugger,model_size,nbMut,timeStep,traceSize,traceMemoryFootprint,meanJumpTime,allJumpTimes - */ -class Benchmark { - - private val Map> languagesAndModels - private val List debuggers - private val int nbRetries - private val File dumpFolder - private val waitTime = 500 - - /** - * TODO un set de models par language! - */ - new(Map> languagesAndModels, List debuggers, int nbRetries, - File dumpFolder) { - this.languagesAndModels = languagesAndModels - this.debuggers = debuggers - this.nbRetries = nbRetries - this.dumpFolder = dumpFolder - } - - def Results computeAll() throws CoreException, EngineContextException , IOException { - - println("Starting the benchmark...") - - // First variable here to be filled and thrown away - var Results results = new Results() - - val nbWarmup = 1 - - for (int w : 0 .. nbWarmup) { - - if(w == nbWarmup) { - - // This one is the real being used - results = new Results() - } - for (l : languagesAndModels.keySet) { - println("Language " + l.languageName) - for (debugger : debuggers) { - println("Debugger " + debugger.debuggerName) - for (model : languagesAndModels.get(l)) { - debugger.init(); - println("Model " + model.lastSegment) - val Set toMerge = new HashSet - for (int i : 1 .. nbRetries) { - println("Try " + i) - - val Result result = new Result() - - // General information - result.languageName = l.languageName - result.debuggerName = debugger.debuggerName - result.modelName = model.lastSegment - result.nbRetries = nbRetries - - // Preparing engine parameters - val EngineHelper engine = new EngineHelper(); - engine.removeStoppedEngines(); - - // Creating gemoc engine for the execution (up until first model state created...?) - println("Preparing engine...") - Thread.sleep(waitTime) - val long setUpBegin = System.nanoTime - engine.prepareEngine(model, debugger, l); - val long setUpEnd = System.nanoTime - result.timeInit = setUpEnd - setUpBegin - - // Information about the executed model - println("Getting information about model...") - result.modelNbElements = computeModelSize(engine.model) // number of eobjects - result.modelNbMutFields = computeNumberMutableElements(engine.model) // sum of : (number of instances) times (number of mutable properties in class) - - // Executing the model entirely - println("Execution the model...") - Thread.sleep(waitTime) - val long completeExeBegin = System.nanoTime - engine.execute() - val long completeExeEnd = System.nanoTime - result.timeExe = completeExeEnd - completeExeBegin - - // Retrieving information about the created trace - println("Getting information about the trace...") - val int traceSize = debugger.getTraceSize(); - result.traceNbStates = traceSize - - // We don't capture memory during warmups - if(w == nbWarmup) - result.traceMemoryFootprint = debugger.getTraceMemoryFootprint(l, dumpFolder, traceSize) - - println("... done") - - // Doing the jumps (or simply retrieving times that correspond) - println("Doing the jumps...") - if(debugger.canJump()) { - - // Mean jump time (hopping into all states, in a random order) - println("Mean jump time (hopping into all states, in a random order)") - val allJumps = (1 .. traceSize - 1).toList - Collections.shuffle(allJumps) - debugger.jump(0); - Thread.sleep(waitTime) - val long jumpAllBegin = System.nanoTime - for (toJump : allJumps) { - println("\tJumping to " + toJump) - debugger.jump(toJump); - } - val long jumpAllEnd = System.nanoTime - result.timeJumpMean = (jumpAllEnd - jumpAllBegin) / (allJumps.size) - - } - - println("Done! Result:") - println(result) - - // We do the warmup once per measure - toMerge.add(result) - - engine.clearCommandStackAndAdapters - debugger.unloadTraceResource - - } - results.addResult(Result.merge(toMerge)) - - } - } - - } - } - - return results - } - - def int computeModelSize(Resource resource) { - return resource.allContents.filter(EObject).size - } - - def int computeNumberMutableElements(Resource r) { - val allProperties = r.allContents.filter(EObject).map[o|o.eClass.EAllStructuralFeatures].toList.flatten - // TODO replace by usage of DynamicAnnotationHelper - val annotatedProps = allProperties.filter[f|f.EAnnotations.size > 0] - return annotatedProps.size() - } - -} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkData.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkData.xtend new file mode 100644 index 000000000..202b282ed --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkData.xtend @@ -0,0 +1,76 @@ +package fr.inria.diverse.trace.benchmark + +import fr.inria.diverse.trace.benchmark.languages.ActivityDiagram + +class BenchmarkData { + + // Constants + public static val String modelFolderName = "models" + public static val String outputFolderName = "output" + public static val int NBMEASURES = 1 + public static val String projectName = "benchmark-project" + + static val activitydiagram = new ActivityDiagram(#{ + "2557-1_1.xsad", + "2557-1_2.xsad", + "2557-1_3.xsad", + "2557-1_4.xsad", + "2557-1_5.xsad", + "2557-1_6.xsad", + "2557-2_1.xsad", + "2557-2_2.xsad", + "2557-2_3.xsad", + "2557-2_4.xsad", + "2557-2_5.xsad", + "2557-2_6.xsad", + "3561-1_1.xsad", + "3561-1_2.xsad", + "3561-1_3.xsad", + "3561-2_1.xsad", + "3561-2_2.xsad", + "3561-2_3.xsad", + "ExampleBV1_false_false.xsad", + "ExampleBV1_false_true.xsad", + "ExampleBV1_true_false.xsad", + "ExampleBV1_true_true.xsad", + "ExampleBV2_false_false.xsad", + "ExampleBV2_false_true.xsad", + "ExampleBV2_true_false.xsad", + "ExampleBV2_true_true.xsad", + "ExampleBV3_false_false_false.xsad", + "ExampleBV3_false_false_true.xsad", + "ExampleBV3_false_true_false.xsad", + "ExampleBV3_false_true_true.xsad", + "ExampleBV3_true_false_false.xsad", + "ExampleBV3_true_false_true.xsad", + "ExampleBV3_true_true_false.xsad", + "ExampleBV3_true_true_true.xsad", + "hireV1_false.xsad", + "hireV1_true.xsad", + "hireV2_false.xsad", + "hireV2_true.xsad", + "hireV3_false.xsad", + "hireV3_true.xsad", + "hireV4_false.xsad", + "hireV4_true.xsad" + }) + + // Input data for all tests + public static val tracingCases = #[ +// "Clone", + "None" +// "Generic", +// "Generated" + ] + public static val languages = #{activitydiagram} + + public static val tracePackages = #{ + "SpecificTraceImpl" -> #["activitydiagramTrace.impl", + "activitydiagramTrace.States.impl", + "activitydiagramTrace.States.activitydiagram.impl", + "activitydiagramTrace.Steps.impl"], + "GenericTraceImpl" -> #["generictrace.impl"], + "ExecutionTraceModelImpl" -> #["org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl", + "org.gemoc.activitydiagram.sequential.xactivitydiagram.activitydiagram.impl"] + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkMemoryTestSuite.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkMemoryTestSuite.xtend new file mode 100644 index 000000000..a5c64fb6d --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkMemoryTestSuite.xtend @@ -0,0 +1,230 @@ +package fr.inria.diverse.trace.benchmark + +import fr.inria.diverse.trace.benchmark.memory.MemoryAnalyzer +import fr.inria.diverse.trace.benchmark.utils.MemoryCSVHelper +import fr.inria.diverse.trace.commons.testutil.EclipseTestUtil +import fr.inria.diverse.trace.commons.testutil.Investigation +import java.io.File +import java.io.FileOutputStream +import java.io.PrintWriter +import java.nio.file.Files +import java.nio.file.Path +import java.text.SimpleDateFormat +import java.util.ArrayList +import java.util.Calendar +import java.util.Collection +import java.util.List +import java.util.Random +import java.util.function.Consumer +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.resource.Resource +import org.eclipse.emf.ecore.resource.ResourceSet +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl +import org.eclipse.emf.ecore.util.EcoreUtil +import org.junit.AfterClass +import org.junit.BeforeClass +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.junit.runners.Parameterized +import org.junit.runners.Parameterized.Parameters +import fr.inria.diverse.trace.commons.model.generictrace.GenericTrace +import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel + +@RunWith(Parameterized) +class BenchmarkMemoryTestSuite { + + val String tmpFolderContainer = "/home/dorian/tmp/yay" + + @Rule public TemporaryFolder tmpFolderCreator = new TemporaryFolder(new File(tmpFolderContainer)); + + private def File createTmpFolder() { + // return tmpFolderCreator.newFolder + val rand = new Random + val id = rand.nextInt(1000) + val fileFriendlyTestCaseName = this.testCaseName.replaceAll(",", "-").replaceAll("/", "_") + val folder = new File(tmpFolderContainer, fileFriendlyTestCaseName + "_" + id) + folder.mkdirs + return folder + } + + // Parameters specific to each test + val String testCaseName + val String traceType + val List tracePackages + val URI traceURI + + // Common to all tests + static var File outputFolder + static var File outputCSV + static var PrintWriter outputCSVWriter + static var FileOutputStream outputCSVStream + static var MemoryCSVHelper csv + + new(String testCaseName, String traceType, List tracePackages, URI traceURI) { + this.traceURI = traceURI + this.traceType = traceType + this.tracePackages = tracePackages + this.testCaseName = testCaseName + } + + @BeforeClass + def static void before() { + // Create output folder in test project + val Calendar currentDate = Calendar::getInstance(); + val SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-YYYY_HH-mm-ss"); + val String dateNow = formatter.format(currentDate.getTime()); + outputFolder = new File("output_memory" + "_" + dateNow) + if (!outputFolder.exists) + outputFolder.mkdir + + // Prepare CSV file in output folder + outputCSV = new File(outputFolder, "results.csv") + outputCSVStream = new FileOutputStream(outputCSV) + outputCSVWriter = new PrintWriter(outputCSVStream, true) + // Prepare csv helper + csv = new MemoryCSVHelper + csv.traceTypes.addAll("SpecificTraceImpl", "GenericTraceImpl", "ExecutionTraceModelImpl") + } + + @AfterClass + def static void after() { + outputCSVWriter.println(csv.exportLines) + outputCSVStream.close + outputCSVWriter.close + EclipseTestUtil.waitForJobs + } + + @Test + def void test() { + + + // Loading + println("Loading model") + val ResourceSet rs = new ResourceSetImpl + val Resource traceResource = rs.createResource(traceURI) + traceResource.load(null) + EcoreUtil::resolveAll(traceResource) + + // Confuse the memory by preserving refs to all EClasses + val List allEClasses = new ArrayList + val allStuff = Investigation::findAllReachableObjects(traceResource) + for (o : allStuff) { + allEClasses.add(o?.eClass) + } + allStuff.clear + + // GC (in case...) + println("GC...") + System.gc + + // Measure memory + // Dump memory and compute memory usage of the trace + val heapFolder = createTmpFolder + val heap = new File(heapFolder, traceType) + println("Dumping memory") + MemoryAnalyzer.dumpHeap(heap) + println("Analyzing dump") + + var lMemory = csv.memoryFootprints.get(traceType) + if (lMemory == null) { + lMemory = new ArrayList + csv.memoryFootprints.put(traceType, lMemory) + } + lMemory.add(computeMemoryUsage(heap)) + + var nbStates = 0 + switch (traceType) { + case "SpecificTraceImpl": nbStates = (traceResource.contents.get(0) as activitydiagramTrace.SpecificTrace).states.length + case "GenericTraceImpl": nbStates = (traceResource.contents.get(0) as GenericTrace).states.length + case "ExecutionTraceModelImpl": nbStates = (traceResource.contents.get(0) as ExecutionTraceModel).reachedStates.length + } + + var lStates = csv.numberOfStates.get(traceType) + if (lStates == null) { + lStates = new ArrayList + csv.numberOfStates.put(traceType, lStates) + } + lStates.add(nbStates) + + // Unloading + println("Unloading model") + for (c : traceResource.allContents.toSet) { + c.eAdapters.clear + } + traceResource.eAdapters.clear + traceResource.contents.clear + traceResource.unload + rs.resources.clear + + } + + static val String queryStart = '''SELECT * FROM "''' + static val String queryEnd = '''"''' + + static val String queryAllUtil = '''SELECT * FROM ".*(PackageImpl|FactoryImpl|AdapterFactory|Switch)$"''' + + static def String createQuery(String... packagesNames) { + '''«queryStart»(«packagesNames.map[s|'''.*«s».*'''].join("|")»)«queryEnd»''' + } + + def long computeMemoryUsage(File heap) { + val analyzer = new MemoryAnalyzer(heap) + + // First we make sure that there is only one trace + val String queryCheck = '''SELECT * FROM ".*«traceType».*"''' + println(queryCheck) + val resCheck = analyzer.computeRetainedSizeWithOQLQuery(queryCheck) + if (resCheck.nbElements != 1) { + throw new Exception("Wrong number of traces: " + resCheck.nbElements) + } + + val List queries = new ArrayList() + val query = '''«queryStart»(«tracePackages.map[s|'''.*«s».*'''].join("|")»)«queryEnd»''' + queries.add(query) + + val resquery = analyzer.computeRetainedSizeWithOQLQuery(queries, #[queryAllUtil]) + + analyzer.cleanUp + + return resquery.memorySum + } + + @Parameters(name="{0}") + public def static Collection data() { + + val Collection data = new ArrayList(); + + for (entry : BenchmarkData::tracePackages.entrySet) { + + val File traceFolder = new File("model_traces") + if (traceFolder.exists) { + val File traceTypeFolder = new File(traceFolder, entry.key) + if (traceTypeFolder.exists) { + val forEachFunc = new Consumer() { + override accept(Path f) { + val URI traceURI = URI.createFileURI(f.toAbsolutePath.toString) + // Preparing test case name + val String testCaseName = f.toString + // Creating test case input data + val Object[] testCaseData = #[ + testCaseName, + entry.key, + entry.value, + traceURI + ]; + data.add(testCaseData) + } + } + Files.walk(traceTypeFolder.toPath).filter([f|Files::isRegularFile(f)]).forEach(forEachFunc); + } + } + } + + return data + + } + +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkRunConfiguration.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkRunConfiguration.xtend deleted file mode 100644 index f718e14a0..000000000 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkRunConfiguration.xtend +++ /dev/null @@ -1,80 +0,0 @@ -package fr.inria.diverse.trace.benchmark - -import java.util.ArrayList -import java.util.List -import org.gemoc.gemoc_language_workbench.api.core.IRunConfiguration -import org.gemoc.gemoc_language_workbench.api.extensions.engine_addon.EngineAddonSpecificationExtension -import org.gemoc.gemoc_language_workbench.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint -import org.eclipse.emf.common.util.URI -import java.util.HashSet -import fr.inria.diverse.trace.benchmark.api.IDebuggerHelper -import fr.inria.diverse.trace.benchmark.debuggers.DSTraceDebuggerHelper - -class BenchmarkRunConfiguration implements IRunConfiguration { - - val IDebuggerHelper debugger - val Language language - val URI model - - new(IDebuggerHelper debugger, Language language, URI model) { - this.debugger = debugger - this.language = language - this.model = model - } - - override getAnimationDelay() { - return 0; - } - - override getAnimatorURI() { - return null; - } - - override getDeadlockDetectionDepth() { - return 0; - } - - override getDeciderName() { - return "Random decider" - } - - override getEngineAddonExtensions() { - - // We find the addons we need - val addons = new HashSet() - - addons.addAll(debugger.getAddons()) - if(debugger instanceof DSTraceDebuggerHelper) - addons.add(language.traceAddonName) - - // Then we find all corresponing addon objects and return them - val List result = new ArrayList(); - val loadedAddons = EngineAddonSpecificationExtensionPoint.getSpecifications() - for (ext : loadedAddons) { - if(addons.contains(ext.name)) - result.add(ext) - } - return result - } - - override getExecutedModelAsMelangeURI() { - return getExecutedModelURI(); - } - - override getExecutedModelURI() { - return model - } - - override getExecutionEntryPoint() { - return language.entryPoint - } - - override getLanguageName() { - return language.languageName - } - - override getMelangeQuery() { - throw new UnsupportedOperationException("TODO: auto-generated method stub") - } - -} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkSingleJVMTestSuite.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkSingleJVMTestSuite.xtend new file mode 100644 index 000000000..ee607cef8 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkSingleJVMTestSuite.xtend @@ -0,0 +1,202 @@ +package fr.inria.diverse.trace.benchmark + +import fr.inria.diverse.trace.benchmark.languages.ActivityDiagram +import fr.inria.diverse.trace.benchmark.languages.BenchmarkLanguage +import fr.inria.diverse.trace.benchmark.tracingcases.BenchmarkTracingCase +import fr.inria.diverse.trace.benchmark.tracingcases.CloneBasedTracingCase +import fr.inria.diverse.trace.benchmark.tracingcases.GeneratedTracingCase +import fr.inria.diverse.trace.benchmark.tracingcases.GenericTracingCase +import fr.inria.diverse.trace.benchmark.tracingcases.NoTracingCase +import fr.inria.diverse.trace.commons.testutil.EclipseTestUtil +import java.io.BufferedReader +import java.io.File +import java.io.FileOutputStream +import java.io.FileReader +import java.io.PrintWriter +import java.io.StringWriter +import java.util.ArrayList +import java.util.HashMap +import java.util.List +import java.util.Map +import org.eclipse.core.resources.ResourcesPlugin +import org.eclipse.core.runtime.IProgressMonitor +import org.eclipse.core.runtime.Status +import org.eclipse.core.runtime.jobs.Job +import org.eclipse.emf.common.util.URI +import org.junit.After +import org.junit.Test + +import static fr.inria.diverse.trace.benchmark.BenchmarkData.* +import static fr.inria.diverse.trace.benchmark.utils.BenchmarkHelpers.* +import fr.inria.diverse.trace.benchmark.utils.CSVHelper + +class BenchmarkSingleJVMTestSuite { + + public static val String modelProperty = "modelProperty" + public static val String paramProperty = "paramProperty" + public static val String languageProperty = "languageProperty" + public static val String tracingCaseProperty = "tracingCaseProperty" + public static val String outputFolderProperty = "outputFolderProperty" + public static val String tmpAddFileProperty = "tmpAddFileProperty" + public static val String tmpRestoreFileProperty = "tmpRestoreFileProperty" + public static val String tmpExecuteFileProperty = "tmpExecuteFileProperty" + + public static val String errorString = "!!!!ERROR" + + var BenchmarkLanguage language + var URI modelURI + var BenchmarkTracingCase tracingCase + + public def void log(String s) { + println("### [single test case] " + s) + } + + private def execute(IProgressMonitor m) { + // Create engine parameterized with inputs + log("Preparing engine") + System.gc + Thread.sleep(3000) + log("Running engine") + tracingCase.execute + } + + val Map streams = new HashMap + val Map writers = new HashMap + + private def void addCSV(String filename, String folder) { + val csv = new File(folder + "/" + filename) + val csvStream = new FileOutputStream(csv) + val csvWriter = new PrintWriter(csvStream, true) + streams.put(filename, csvStream) + writers.put(filename, csvWriter) + } + + private def List getResults(File file) { + val FileReader fileReader = new FileReader(file) + val BufferedReader bufferedReader = new BufferedReader(fileReader) + val List lines = new ArrayList + for (var String l = bufferedReader.readLine(); l != null; l = bufferedReader.readLine()) { + lines.add(l) + } + fileReader.close + file.delete + return lines + } + + @Test + def void test() { + // Disable logs + val emptyPrintStream = createEmptyPrintStream + System.setOut(emptyPrintStream) + System.setErr(emptyPrintStream) + + // Read properties + val String model = System.getProperty(modelProperty) + val String tracingCaseString = System.getProperty(tracingCaseProperty) + val String languageName = System.getProperty(languageProperty) + val String outputFolder = System.getProperty(outputFolderProperty) + + val String addCSVFilename = "add"+tracingCaseString+".csv" + val String restoreCSVFilename = "restore"+tracingCaseString+".csv" + val String executionCSVFilename = "execute"+tracingCaseString+".csv" + val String initializationCSVFilename = "initialize"+tracingCaseString+".csv" + + System.setProperty(tmpAddFileProperty,"") + System.setProperty(tmpRestoreFileProperty,"") + System.setProperty(tmpExecuteFileProperty,"") + + val csv = new CSVHelper + + addCSV(addCSVFilename, outputFolder) + addCSV(restoreCSVFilename, outputFolder) + addCSV(executionCSVFilename, outputFolder) + addCSV(initializationCSVFilename, outputFolder) + + switch (tracingCaseString) { + case "Clone": tracingCase = new CloneBasedTracingCase + case "Generic": tracingCase = new GenericTracingCase + case "Generated": tracingCase = new GeneratedTracingCase + case "None" : tracingCase = new NoTracingCase + } + + switch (languageName) { + case "ActivityDiagram": language = new ActivityDiagram(null) + } + + val job = new Job("single test case") { + + override protected run(IProgressMonitor m) { + + try { + // Create eclipse project in test WS + val eclipseProject = ResourcesPlugin::getWorkspace().getRoot().getProject(projectName); + if (eclipseProject.exists) + eclipseProject.delete(true, m) + eclipseProject.create(m) + eclipseProject.open(m) + + // Copy all the models in the test WS + // TODO copy single model + val modelFolder = new File(modelFolderName); + val modelFolderInWS = copyFolderInWS(modelFolder, eclipseProject, m) + + // Create model URI + val modelFileInProject = modelFolderInWS.getFile(model) + modelURI = URI.createPlatformResourceURI(modelFileInProject.fullPath.toString, true) + + log("Warming up.") + for (var i = 0; i < 10; i++) { + tracingCase.initialize(modelURI, language) + execute(m) + } + + for (var i = 0; i < 20; i++) { + log("Starting measure "+i) + val long initTime = tracingCase.initialize(modelURI, language) + val tmpAddFile = File.createTempFile("benchmarkAdd", "benchmark") + val tmpRestoreFile = File.createTempFile("benchmarkRestore", "benchmark") + val tmpExecuteFile = File.createTempFile("benchmarkExecute", "benchmark") + System.setProperty(tmpAddFileProperty,tmpAddFile.absolutePath) + System.setProperty(tmpRestoreFileProperty,tmpRestoreFile.absolutePath) + System.setProperty(tmpExecuteFileProperty,tmpExecuteFile.absolutePath) + execute(m) + val addResults = getResults(tmpAddFile) + val restoreResults = getResults(tmpRestoreFile) + csv.addStateExecutionTimes.add(addResults.map[s|Long.parseLong(s)]) + csv.restoreStateExecutionTimes.add(restoreResults.map[s|Long.parseLong(s)]) + csv.totalExecutionTimes.add(Long.parseLong(getResults(tmpExecuteFile).head)) + csv.initializationTimes.add(initTime) + } + + writers.get(addCSVFilename).println(csv.exportAddStateExecutionTimes) + writers.get(restoreCSVFilename).println(csv.exportRestoreStateExecutionTimes) + writers.get(executionCSVFilename).println(csv.exportExecutionTimes) + writers.get(initializationCSVFilename).println(csv.exportInitializationTimes) + + // Done + return Status.OK_STATUS + + } catch (Throwable t) { + log("Exception caught.") + t.printStackTrace + val StringWriter sw = new StringWriter(); + t.printStackTrace(new PrintWriter(sw)); + val status = new Status(Status.ERROR, "trace single time test", "An error occured in the test case", t) + return status + } + } + } + job.schedule + EclipseTestUtil.waitForJobs + + if (job.result != Status.OK_STATUS) { + throw job.result.exception + } + } + + @After + def void closeCSV() { + streams.values.forEach[v|v.close] + writers.values.forEach[v|v.close] + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkTimeTestSuite.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkTimeTestSuite.xtend new file mode 100644 index 000000000..44b582100 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkTimeTestSuite.xtend @@ -0,0 +1,160 @@ +package fr.inria.diverse.trace.benchmark + +import fr.inria.diverse.trace.benchmark.languages.BenchmarkLanguage +import fr.inria.diverse.trace.benchmark.utils.PDETestResultsCollector +import java.io.File +import java.util.ArrayList +import java.util.Collection +import java.util.List +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.junit.runners.Parameterized +import org.junit.runners.Parameterized.Parameters + +import static fr.inria.diverse.trace.benchmark.BenchmarkData.* + +@RunWith(Parameterized) +class BenchmarkTimeTestSuite { + + @Rule + public TemporaryFolder tmpFolderCreator = new TemporaryFolder(); + + // Parameters specific to each test + val BenchmarkLanguage language + val String tracingCase + val String model + val String testCaseName + val int modelID + + var String outputFolderPath + + // Constants + static val int port = 7777 + static val int minMemory = 1024 + static val int maxMemory = 5120 + static val String javaHome = "/usr/lib/jvm/java-8-oracle/bin/java" + static val String wsPath = "file:/home/dorian/workspace" + static val String rWdPath = "/home/dorian/workspace/R" + static val String outputRPath = "results" + + // Test case constructor + new(String testCaseName, int modelID, BenchmarkLanguage language, String tracingCase, String model) { + this.modelID = modelID + this.language = language + this.tracingCase = tracingCase + this.model = model + this.testCaseName = testCaseName + } + + static def String prepareProperty(String key, String value) { + return '''-D«key»=«value»''' + } + + @Before + def void prepareOutput() { + // Create output folder + val languageSimpleName = language.languageName.substring(language.languageName.lastIndexOf(".")+1) + val modelSimpleName = model.substring(0,model.lastIndexOf(".")) + val outputFolder = new File(rWdPath + "/" + outputRPath + "/" + languageSimpleName + "_" + modelSimpleName) + if (!outputFolder.exists) + outputFolder.mkdir + outputFolderPath = outputFolder.absolutePath + } + + public def void log(String s) { + println("### [" + testCaseName + "] " + s) + } + + @Test + def void test() { + // These params are completely specific to an environment, + // and they need the PDE test suite (there, BenchmarkPhase1SingleJVMTestSuite) to have + // been executed at least one before via Eclispe, so that its conf files + // are ready. + // NOTE: requires passwordless sudo! + + log ("Preparing tmp folder") + val tmpWs = tmpFolderCreator.root + + val List params = #["sudo", "ionice", "-c", "2", "-n", "0", "nice", "-19", + javaHome, "-Xms" + minMemory + "m", "-Xmx" + maxMemory + "m", + "-Declipse.pde.launch=true", "-Declipse.p2.data.area=@config.dir/p2", "-Dfile.encoding=UTF-8", + prepareProperty(BenchmarkSingleJVMTestSuite::modelProperty, model), + prepareProperty(BenchmarkSingleJVMTestSuite::languageProperty, language.class.simpleName), + prepareProperty(BenchmarkSingleJVMTestSuite::tracingCaseProperty, tracingCase), + prepareProperty(BenchmarkSingleJVMTestSuite::outputFolderProperty, outputFolderPath), "-classpath", + "/home/dorian/Downloads/gemoc-studio/plugins/org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar", + "org.eclipse.equinox.launcher.Main", "-os", "linux", "-ws", "gtk", "-arch", "x86_64", "-nl", "fr_FR", + "-consoleLog", "-version", "3", "-port", port.toString, "-testLoaderClass", + "org.eclipse.jdt.internal.junit4.runner.JUnit4TestLoader", "-loaderpluginname", + "org.eclipse.jdt.junit4.runtime", "-classNames", BenchmarkSingleJVMTestSuite.name, "-application", + "org.eclipse.pde.junit.runtime.uitestapplication", "-product org.eclipse.platform.ide", + "-testApplication", "org.eclipse.ui.ide.workbench", "-data", tmpWs.absolutePath, "-configuration", + wsPath + "/.metadata/.plugins/org.eclipse.pde.core/pde-junit/", "-dev", + wsPath + "/.metadata/.plugins/org.eclipse.pde.core/pde-junit/dev.properties", + "-os", "linux", "-ws", "gtk", "-arch", "x86_64", "-nl", "fr_FR", "-consoleLog", "-testpluginname", + "fr.inria.diverse.trace.benchmark"] + + // Start Junit listener in separate job + log ("Start dummy junit listener") + val junitListener = new Runnable() { + override run() { + val PDETestResultsCollector collector = new PDETestResultsCollector( + "listening for measure") + collector.run(port); + } + } + val junitListenerThread = new Thread(junitListener) + junitListenerThread.start + + // Run actual test + log ("Start test in dedicated JVM") + val ProcessBuilder processBuilder = new ProcessBuilder(params) + val Process process = processBuilder.start() + process.waitFor() + + // Finish test listener + log ("Kill dummy junit listener") + junitListenerThread.stop + } + + @Parameters(name="{0}") + public def static Collection data() { + + val Collection data = new ArrayList(); + + // For each language + for (language : languages) { + + // For each kind of trace metamodel + for (tracingCase : tracingCases) { + + var int i = 1; + + // For each model + for (model : language.models) { + // Preparing test case name + val testCaseNameElements = new ArrayList + testCaseNameElements.addAll(#[i, language.folderName, tracingCase, model]) + + val testCaseName = testCaseNameElements.join(",") + + // Creating test case input data + val Object[] testCaseData = #[ + testCaseName, + i, + language, + tracingCase, + model + ]; + data.add(testCaseData) + i++ + } + } + } + return data + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/EngineHelper.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/EngineHelper.java deleted file mode 100644 index 13ea0e89b..000000000 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/EngineHelper.java +++ /dev/null @@ -1,172 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.benchmark; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Map.Entry; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.transaction.util.TransactionUtil; -import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.search.IJavaSearchConstants; -import org.eclipse.jdt.core.search.IJavaSearchScope; -import org.eclipse.jdt.core.search.SearchEngine; -import org.eclipse.jdt.core.search.SearchMatch; -import org.eclipse.jdt.core.search.SearchParticipant; -import org.eclipse.jdt.core.search.SearchPattern; -import org.eclipse.jdt.core.search.SearchRequestor; -import org.gemoc.execution.engine.commons.EngineContextException; -import org.gemoc.execution.engine.commons.ModelExecutionContext; -import org.gemoc.gemoc_language_workbench.api.core.ExecutionMode; -import org.gemoc.gemoc_language_workbench.api.core.IExecutionContext; -import org.gemoc.gemoc_language_workbench.api.core.IExecutionEngine; -import org.gemoc.gemoc_language_workbench.api.core.IRunConfiguration; -import org.gemoc.gemoc_language_workbench.extensions.k3.PlainK3ExecutionEngine; -import org.kermeta.utils.provisionner4eclipse.Provisionner; -import org.osgi.framework.Bundle; - -import fr.inria.diverse.trace.benchmark.api.IDebuggerHelper; - -public class EngineHelper { - - static class DefaultSearchRequestor extends SearchRequestor { - - public IType _binaryType; - - @Override - public void acceptSearchMatch(SearchMatch match) throws CoreException { - _binaryType = (IType) match.getElement(); - System.out.println(match.getElement()); - } - - } - - private PlainK3ExecutionEngine _executionEngine; - - // Parameters to create execution engine - private IExecutionContext executionContext; - private Object o; - private Method method; - private ArrayList parameters; - - public void prepareEngine(URI model, IDebuggerHelper debugger, Language language) throws CoreException, - EngineContextException { - - IRunConfiguration runConfiguration = new BenchmarkRunConfiguration(debugger, language, model); - - // We don't want to debug actually, ie we don't want the animator - ExecutionMode executionMode = ExecutionMode.Run; - - // In this construction, the addons are created and loaded as well - executionContext = new ModelExecutionContext(runConfiguration, executionMode); - - String className = executionContext.getRunConfiguration().getExecutionEntryPoint(); - SearchPattern pattern = SearchPattern.createPattern(className, IJavaSearchConstants.CLASS, - IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH); - IJavaSearchScope scope = SearchEngine.createWorkspaceScope(); - DefaultSearchRequestor requestor = new DefaultSearchRequestor(); - SearchEngine engine = new SearchEngine(); - - engine.search(pattern, new SearchParticipant[] { SearchEngine.getDefaultSearchParticipant() }, scope, - requestor, null); - - IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) requestor._binaryType.getPackageFragment() - .getParent(); - - parameters = new ArrayList<>(); - parameters.add(executionContext.getResourceModel().getContents().get(0)); - String bundleName = null; - bundleName = packageFragmentRoot.getPath().removeLastSegments(1).lastSegment().toString(); - - Class c = null; - - Bundle bundle = Platform.getBundle(bundleName); - - // If not found, we try again with projects - if (bundle == null) { - - String projectName = requestor._binaryType.getJavaProject().getElementName(); - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - if (project != null && project.exists() - && !project.getFullPath().equals(executionContext.getWorkspace().getProjectPath())) { - Provisionner p = new Provisionner(); - IStatus status = p.provisionFromProject(project, null); - if (!status.isOK()) { - throw new CoreException(new Status(1, "EngineHelper", "couldn't provision project :(")); - } - } - bundleName = project.getName(); - bundle = Platform.getBundle(bundleName); - - } - - try { - c = bundle.loadClass(executionContext.getRunConfiguration().getExecutionEntryPoint()); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - throw new CoreException(new Status(1, "EngineHelper", "couldn't load Main class")); - } - method = null; - try { - method = c.getMethod("main", parameters.get(0).getClass().getInterfaces()[0]); - } catch (Exception e) { - e.printStackTrace(); - throw new CoreException(new Status(1, "EngineHelper", "couldn't find main method")); - } - o = null; - try { - o = c.newInstance(); - } catch (Exception e) { - e.printStackTrace(); - throw new CoreException(new Status(1, "EngineHelper", "couldn't create Main object")); - } - - _executionEngine = new PlainK3ExecutionEngine(executionContext, o, method, parameters); - debugger.setExecutionEngine(_executionEngine); - - } - - public void execute() { - _executionEngine.start(); - _executionEngine.joinThread(); - } - - public Resource getModel() { - return _executionEngine.getExecutionContext().getResourceModel(); - } - - public void removeStoppedEngines() { - for (Entry engineEntry : org.gemoc.execution.engine.Activator.getDefault().gemocRunningEngineRegistry - .getRunningEngines().entrySet()) { - switch (engineEntry.getValue().getRunningStatus()) { - case Stopped: - org.gemoc.execution.engine.Activator.getDefault().gemocRunningEngineRegistry - .unregisterEngine(engineEntry.getKey()); - break; - default: - } - } - } - - public void clearCommandStackAndAdapters() { - TransactionUtil.getEditingDomain(executionContext.getResourceModel()).getCommandStack().flush();; - executionContext.getResourceModel().eAdapters().clear(); - executionContext.getResourceModel().unload(); - } -} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Language.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Language.java index ee492db74..ad90017c1 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Language.java +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Language.java @@ -18,9 +18,6 @@ public enum Language { "org.modelexecution.operationalsemantics.gemoc.sequential.dynamic.Main", "xad_sequential","activitydiagramTrace", "activitydiagram.impl.ActivityImpl", "activitydiagramTrace.impl.TraceImpl"); - - - private Language(String traceAddonName,String entryPoint, String languageName, String javaTracePackageName, String languageRootClassName, String javaTraceRootName) { this.traceAddonName = traceAddonName; this.entryPoint = entryPoint; @@ -30,13 +27,10 @@ private Language(String traceAddonName,String entryPoint, String languageName, S this.javaTraceRootName = javaTraceRootName; } - public final String traceAddonName; public final String entryPoint; public final String languageName; public final String javaTracePackageName; public final String languageRootClassName; public final String javaTraceRootName; - - } diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Result.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Result.xtend deleted file mode 100644 index bd3947145..000000000 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Result.xtend +++ /dev/null @@ -1,73 +0,0 @@ -package fr.inria.diverse.trace.benchmark - -import java.util.Set - -//model_size,nbMut,timeStep,traceSize,traceMemoryFootprint,meanJumpTime,allJumpTimes -class Result { - - public String languageName = "" - public String debuggerName = "" - public String modelName = "" - public Integer modelNbElements = 0 - public Integer modelNbMutFields = 0 - public Long timeExe = new Long(0) - public Long timeInit = new Long(0) - public Long timeJumpMean = new Long(0) - public Integer traceNbStates = 0 - public Integer traceMemoryFootprint = 0 - public Integer nbRetries = 0 - - - /** - * TODO - */ - def static Result merge(Set results) { - -// if (results.size < 2) -// throw new Exception ("Cannot merge less than two results!") - - val ret = new Result - - for (p : Result.declaredFields) { - switch (p.type) { - Class: { - p.set(ret, p.get(results.get(0))) - } - Class: { - var long sum = 0 - for (r : results) { - sum = sum + p.getLong(r) - } - val long mean = sum / results.size - p.setLong(ret, mean) - } - Class: { - var int sum = 0 - for (r : results) { - sum = sum + p.getInt(r) - } - val int mean = sum / results.size - p.setInt(ret, mean) - } - } - } - - return ret - } - - def static String getColumnNames() { - val allNames = Result.declaredFields.map[f|f.name] - return allNames.join(",") - } - - override toString() { - return Result.declaredFields.map[f| - try { - f.get(this) - } catch(IllegalAccessException exc) { - throw new RuntimeException("auto-generated try/catch", exc) - }].join(",") - - } - -} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Results.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Results.xtend deleted file mode 100644 index e7a1c2411..000000000 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Results.xtend +++ /dev/null @@ -1,39 +0,0 @@ -package fr.inria.diverse.trace.benchmark - -import java.util.HashSet -import java.util.List -import java.util.Set -import java.util.ArrayList - -class Results { - - private List results = new ArrayList - - new() { - } - - def void addResult(Result r) { - results.add(r) - } - - static def Results merge(Set manyResults) { - val Results someResults = manyResults.get(0); - val ret = new Results() - for (var int i = 0; i < someResults.results.size; i++) { - val Set iLines = new HashSet() - for (results : manyResults) { - iLines.add(results.results.get(i)) - } - ret.addResult(Result.merge(iLines)) - } - return ret - } - - override public String toString() { - return '''«Result.getColumnNames» -«FOR r : results» -«r.toString» -«ENDFOR»''' - } - -} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextConverter.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextConverter.java new file mode 100644 index 000000000..e3cb3f292 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextConverter.java @@ -0,0 +1,45 @@ +package fr.inria.diverse.trace.benchmark; + +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; +import org.eclipse.xtext.resource.XtextResource; +import org.eclipse.xtext.serializer.ISerializer; +import org.gemoc.activitydiagram.sequential.xactivitydiagram.ActivityDiagramStandaloneSetup; +import org.junit.Test; + +import com.google.inject.Injector; + +public class XTextConverter { + + @Test + public void test() { + Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; + Map m = reg.getExtensionToFactoryMap(); + m.put("xmi", new XMIResourceFactoryImpl()); + ResourceSet resSet = new ResourceSetImpl(); + Resource resource = resSet.getResource(URI.createURI("models/hireV4.xmi"), true); + XtextResource xtextResource = new XtextResource(URI.createURI("models/hireV4_false.xsad")); + try { + resource.load(Collections.EMPTY_MAP); + xtextResource.getContents().addAll(resource.getContents()); + Map options = new HashMap<>(); + options.put(XtextResource.OPTION_ENCODING, "UTF-8"); + + Injector injector = new ActivityDiagramStandaloneSetup().createInjectorAndDoEMFRegistration(); + ISerializer serializer = injector.getInstance(ISerializer.class); + + xtextResource.setSerializer(serializer); + xtextResource.save(options); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextFixer2.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextFixer2.java new file mode 100644 index 000000000..bbdf86d88 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextFixer2.java @@ -0,0 +1,45 @@ +package fr.inria.diverse.trace.benchmark; + +import java.io.File; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +public class XTextFixer2 { + + public static void main(String[] args) { + try { + String path = "/home/dorian/workspace/ModelDebugging/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4.xmi"; + File inputFile = new File(path); + DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder dBuilder; + dBuilder = dbFactory.newDocumentBuilder(); + Document doc = dBuilder.parse(inputFile); + doc.getDocumentElement().normalize(); + NodeList nList = doc.getElementsByTagName("edges"); + for (int i = 0; i < nList.getLength(); i++) { + ((Element) nList.item(i)).setAttribute("name", "e"+i); + } + + Transformer transformer = TransformerFactory.newInstance().newTransformer(); + Result output = new StreamResult(new File(path)); + Source input = new DOMSource(doc); + + transformer.transform(input, output); + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/api/IDebuggerHelper.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/api/IDebuggerHelper.java index de188c473..86f72c573 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/api/IDebuggerHelper.java +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/api/IDebuggerHelper.java @@ -13,7 +13,7 @@ import java.io.File; import java.util.Collection; -import org.gemoc.gemoc_language_workbench.extensions.k3.PlainK3ExecutionEngine; +import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; import fr.inria.diverse.trace.benchmark.Language; @@ -39,5 +39,4 @@ public interface IDebuggerHelper { void unloadTraceResource(); - } \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/AbstractTraceDebugger.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/AbstractTraceDebugger.java deleted file mode 100644 index 7e72b8249..000000000 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/AbstractTraceDebugger.java +++ /dev/null @@ -1,98 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.benchmark.debuggers; - -import java.io.File; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; - -import org.eclipse.emf.ecore.resource.Resource; - -import fr.inria.diverse.trace.benchmark.Language; -import fr.inria.diverse.trace.benchmark.api.IDebuggerHelper; -import fr.inria.diverse.trace.benchmark.memory.HeapDump; -import fr.inria.diverse.trace.benchmark.memory.MemoryAnalyzer; - -public abstract class AbstractTraceDebugger implements IDebuggerHelper { - - @Override - public void init() { - memory = -1; - } - - int memory = -1; - - public static void deleteFolder(File folder) { - File[] files = folder.listFiles(); - if (files != null) { // some JVMs return null for empty dirs - for (File f : files) { - if (f.isDirectory()) { - deleteFolder(f); - } else { - f.delete(); - } - } - } - folder.delete(); - } - - @Override - /** - * TODO - * In fact we forget lots of stuff: clones are stored at the root of the resource! - */ - public int getTraceMemoryFootprint(Language l, File dumpFolder, int traceSize) throws Exception { - - DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); - Date date = new Date(); - String dateString = dateFormat.format(date); - String folderName = dateString + "_" + this.getDebuggerName() + "_" + l.languageName; - - if (memory == -1) { - - - // MemoryAnalyzer.dumpHeap(dumpFile); - - boolean ok = false; - for (int i = 0; i < 5 && !ok; i++) { - - try { - - if (dumpFolder == null) { - dumpFolder = File.createTempFile(folderName, ""); - dumpFolder.delete(); - dumpFolder.mkdir(); - } - - deleteFolder(dumpFolder); - - File innerDumpFolder = new File(dumpFolder, folderName); - innerDumpFolder.mkdirs(); - - File dumpFile = new File(innerDumpFolder, "heapDump"); - HeapDump.dumpHeap(dumpFile.getAbsolutePath(), true); - memory = computeTraceMemoryFootprint(l, dumpFile, traceSize); - deleteFolder(dumpFolder); - ok = true; - } catch (Exception e) { - e.printStackTrace(); - System.out.println("ERROR while analyzing memory - attempt "+i+"/4"); - if (i == 5) - throw e; - } - } - - } - return memory; - - } -} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/DSTraceDebuggerHelper.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/DSTraceDebuggerHelper.xtend deleted file mode 100644 index 6b5ce0295..000000000 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/DSTraceDebuggerHelper.xtend +++ /dev/null @@ -1,73 +0,0 @@ -package fr.inria.diverse.trace.benchmark.debuggers - -import fr.inria.diverse.trace.benchmark.api.IDebuggerHelper -import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon -import java.util.Collections -import java.io.File -import fr.inria.diverse.trace.benchmark.memory.MemoryAnalyzer -import fr.inria.diverse.trace.benchmark.Language -import org.gemoc.gemoc_language_workbench.extensions.k3.PlainK3ExecutionEngine - -class DSTraceDebuggerHelper extends AbstractTraceDebugger implements IDebuggerHelper { - - var AbstractTraceAddon traceAddon - - override getAddons() { - return Collections.singleton("TimeLineProviderProvider"); - } - - override getDebuggerName() { - return "DomainSpecificTraceDebugger" - } - - override canJump() { - return true; - } - - override getTraceSize() { - return traceAddon.traceManager.traceSize - } - - override jump(int i) { - traceAddon.goToNoTimelineNotification(i) - } - - override setExecutionEngine(PlainK3ExecutionEngine _executionEngine) { - traceAddon = _executionEngine.getAddonsTypedBy(AbstractTraceAddon).get(0) - traceAddon.disableTraceSaving - } - - override computeTraceMemoryFootprint(Language l, File dumpFile, int traceSize) { - - val analyzer = new MemoryAnalyzer(dumpFile); - - // First we make sure that there is only one trace - val String queryCheck = "SELECT * FROM " + l.javaTraceRootName; - val resCheck = analyzer.computeRetainedSizeWithOQLQuery(queryCheck, dumpFile); - if(resCheck.nbElements != 1) { - //println("SLEEPING WHILE TOO MANY TRACES"); - //Thread.sleep(100000000); - throw new Exception("Wrong number of traces: " + resCheck.nbElements); - } - - val queryAll = "select a.@retainedHeapSize from \".*" + l.javaTracePackageName + ".*\" a"; - val queryRemove = "select a.@retainedHeapSize from \".*" + l.javaTracePackageName + - ".*(PackageImpl|FactoryImpl|AdapterFactory|Switch)$\" a"; - - println("QueryAll: "+queryAll) - println("QueryRemove: "+queryRemove) - - val resAll = analyzer.computeRetainedSizeWithOQLQuery(queryAll, dumpFile); - val resRemove = analyzer.computeRetainedSizeWithOQLQuery(queryRemove, dumpFile); - - println("Memory all package: " + resAll.memorySum) - println("Memory to remove: " + resRemove.memorySum) - - return resAll.memorySum - resRemove.memorySum - } - - override unloadTraceResource() { - traceAddon.traceManager.getExecutionState(0).eContainer.eResource.unload - } - -} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/NoTraceDebuggerHelper.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/NoTraceDebuggerHelper.java deleted file mode 100644 index eba7ee9d5..000000000 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/NoTraceDebuggerHelper.java +++ /dev/null @@ -1,77 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.benchmark.debuggers; - -import java.io.File; -import java.util.Collection; -import java.util.Collections; - -import org.gemoc.gemoc_language_workbench.extensions.k3.PlainK3ExecutionEngine; - -import fr.inria.diverse.trace.benchmark.Language; -import fr.inria.diverse.trace.benchmark.api.IDebuggerHelper; - -public class NoTraceDebuggerHelper implements IDebuggerHelper { - - @Override - public boolean canJump() { - return false; - } - - @Override - public void jump(int i) { - - } - - @Override - public int getTraceSize() { - return 0; - } - - @Override - public int getTraceMemoryFootprint(Language l, File dumpFolder, int traceSize) { - return 0; - } - - @Override - public String getDebuggerName() { - return "NoTraceDebuggerHelper"; - } - - @Override - public Collection getAddons() { - return Collections.emptySet(); - } - - @Override - public void setExecutionEngine(PlainK3ExecutionEngine _executionEngine) { - - } - - @Override - public void init() { - // TODO Auto-generated method stub - - } - - @Override - public int computeTraceMemoryFootprint(Language l, File dumpFile, int traceSize) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public void unloadTraceResource() { - // TODO Auto-generated method stub - - } - -} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/SnapshotDebugger.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/SnapshotDebugger.java deleted file mode 100644 index c5f3c1029..000000000 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/debuggers/SnapshotDebugger.java +++ /dev/null @@ -1,127 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.benchmark.debuggers; - -import java.io.File; -import java.util.Collection; -import java.util.Collections; - -import org.gemoc.execution.engine.commons.trace.ModelExecutionTracingAddon; -import org.gemoc.execution.engine.trace.gemoc_execution_trace.ModelState; -import org.gemoc.gemoc_language_workbench.extensions.k3.PlainK3ExecutionEngine; - -import fr.inria.diverse.trace.benchmark.Language; -import fr.inria.diverse.trace.benchmark.api.IDebuggerHelper; -import fr.inria.diverse.trace.benchmark.memory.MemoryAnalyzer; -import fr.inria.diverse.trace.benchmark.memory.MemoryAnalyzer.QueryResult; - -public class SnapshotDebugger extends AbstractTraceDebugger implements IDebuggerHelper { - - private static final String javaPackageName = "org.gemoc.execution.engine.trace"; - private static final String javaTraceRootName = "org.gemoc.execution.engine.trace.gemoc_execution_trace.impl.ExecutionTraceModelImpl"; - - ModelExecutionTracingAddon traceAddon; - - @Override - public boolean canJump() { - return true; - } - - @Override - public void jump(int i) { - - ModelState state = traceAddon.getExecutionTrace().getReachedStates().get(i); - traceAddon.jump(state); - } - - @Override - public int getTraceSize() { - return traceAddon.getExecutionTrace().getReachedStates().size(); - } - - @Override - public String getDebuggerName() { - return "SnapshotDebugger"; - } - - @Override - public void setExecutionEngine(PlainK3ExecutionEngine executionEngine) { - traceAddon = executionEngine.getAddon(ModelExecutionTracingAddon.class); - traceAddon.disableTraceSaving(); - } - - @Override - public Collection getAddons() { - return Collections.singleton("Execution tracing"); - } - - @Override - public int computeTraceMemoryFootprint(Language l, File dumpFile, int traceSize) throws Exception { - - System.out.println("Parsing the dump..."); - MemoryAnalyzer analyzer = new MemoryAnalyzer(dumpFile); - - // First we make sure that there is only one trace - String queryCheck = "SELECT * FROM " + javaTraceRootName; - - System.out.println("Query check..."); - QueryResult resCheck = analyzer.computeRetainedSizeWithOQLQuery(queryCheck, dumpFile); - - if (resCheck.nbElements != 1) { - //System.out.println("SLEEPING WHILE TOO MANY TRACES"); - //Thread.sleep(100000000); - throw new Exception("Wrong number of traces: " + resCheck.nbElements); - } - - // Then we prepare the queries - String queryClones = "SELECT a.@retainedHeapSize FROM " - + l.languageRootClassName + " a " - + " WHERE (" - + " (a.eStorage.toString() LIKE \".*Object.*\")" - + " and (a.eStorage[1].toString() LIKE \".*XMI.*\")" - + " and (a.eStorage[1].uri.segments[2].toString() LIKE \"gemoc-gen\")" - + ")"; - String queryAll = "select a.@retainedHeapSize from \".*" + javaPackageName + ".*\" a"; - String queryRemove = "select a.@retainedHeapSize from \".*" + javaPackageName - + ".*(PackageImpl|FactoryImpl|AdapterFactory|Switch)$\" a"; - - // Memory used by trace structure - System.out.println("Query all..."); - QueryResult resAll = analyzer.computeRetainedSizeWithOQLQuery(queryAll, dumpFile); - - System.out.println("Query to remove..."); - QueryResult resRemove = analyzer.computeRetainedSizeWithOQLQuery(queryRemove, dumpFile); - - // Memory used by clones - System.out.println("Query clones..."); - QueryResult resClones = analyzer.computeRetainedSizeWithOQLQuery(queryClones, dumpFile); - - // To be sure that our weird clone query works - if (resClones.nbElements != traceSize) { - //System.out.println("SLEEPING WHILE: "+"Wrong trace size: " + resClones.nbElements + " instead of " + traceSize); - //Thread.sleep(100000000); - throw new Exception("Wrong trace size: " + resClones.nbElements + " instead of " + traceSize); - } - - // Debug prints - System.out.println("Memory all package: " + resAll.memorySum); - System.out.println("Memory to remove: " + resRemove.memorySum); - System.out.println("Memory clones: " + resClones.memorySum); - - return resAll.memorySum - resRemove.memorySum + resClones.memorySum; - } - - @Override - public void unloadTraceResource() { - traceAddon.getExecutionTrace().eResource().unload(); - } - -} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/ActivityDiagram.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/ActivityDiagram.xtend new file mode 100644 index 000000000..8ec67466b --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/ActivityDiagram.xtend @@ -0,0 +1,27 @@ +package fr.inria.diverse.trace.benchmark.languages + +import java.util.Set + +class ActivityDiagram extends BenchmarkLanguage { + + new(Set models) { + super(models) + } + + override getFolderName() { + "activitydiagram" + } + + override getEntryPoint() { + "public static void org.gemoc.activitydiagram.sequential.xactivitydiagram.aspects.ActivityAspect.main(org.gemoc.activitydiagram.sequential.xactivitydiagram.activitydiagram.Activity)" + } + + override getLanguageName() { + "org.gemoc.activitydiagram.sequential.XActivityDiagram" + } + + override getInitializationMethod() { + "org.gemoc.activitydiagram.sequential.xactivitydiagram.aspects.ActivityAspect.initializeModel" + } + +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/BenchmarkLanguage.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/BenchmarkLanguage.xtend new file mode 100644 index 000000000..604cf683a --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/BenchmarkLanguage.xtend @@ -0,0 +1,29 @@ +package fr.inria.diverse.trace.benchmark.languages + +import java.util.Set + +abstract class BenchmarkLanguage { + + val Set models + + new(Set models) { + this.models = models + } + + def getModels() { + return models + } + + def getJavaTraceRootName() { + "SpecificTraceImpl" + } + + def String getEntryPoint() + + def String getLanguageName() + + def String getFolderName() + + def String getInitializationMethod() + +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/memory/MemoryAnalyzer.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/memory/MemoryAnalyzer.java index c66766232..03f9c21c5 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/memory/MemoryAnalyzer.java +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/memory/MemoryAnalyzer.java @@ -12,9 +12,14 @@ import java.io.File; import java.lang.management.ManagementFactory; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import org.eclipse.mat.SnapshotException; import org.eclipse.mat.internal.acquire.HeapDumpProviderRegistry; @@ -29,13 +34,14 @@ import org.eclipse.mat.util.IProgressListener; import org.eclipse.mat.util.VoidProgressListener; +@SuppressWarnings("restriction") public class MemoryAnalyzer { public static final IProgressListener progressListener = new VoidProgressListener(); public static class QueryResult { public int nbElements; - public int memorySum; + public long memorySum; } public ISnapshot snapshot; @@ -46,11 +52,71 @@ public MemoryAnalyzer(File dumpFile) { } catch (SnapshotException e) { System.err.println("Error while parsing dump!"); e.printStackTrace(); + throw new RuntimeException(e); } assert (snapshot != null); } - public QueryResult computeRetainedSizeWithOQLQuery(String query, File dumpFile) { + public QueryResult computeRetainedSizeWithOQLQuery(String queryWith, String queryWithout) throws Exception { + List queryWithList = Arrays.asList(queryWith); + List queryWithoutList = Arrays.asList(queryWith); + return computeRetainedSizeWithOQLQuery(queryWithList, queryWithoutList); + + } + + private Object executeQuery( String q) throws Exception { + IOQLQuery queryWithObj = SnapshotFactory.createQuery(q); + return queryWithObj.execute(snapshot, new VoidProgressListener()); + } + + private Set arrayToSet(int[] array) { + return Arrays.stream(array).boxed().collect(Collectors.toSet()); + } + + private int[] setToArray(Set set) { + return set.stream().mapToInt(Integer::intValue).toArray(); + } + + public QueryResult computeRetainedSizeWithOQLQuery(List queryWith, List queryWithout) + throws Exception { + QueryResult res = new QueryResult(); + + List resultsWith = new ArrayList(); + List resultsWithout = new ArrayList(); + + for (String q : queryWith) { + Object r = executeQuery(q); + if (r != null) { + resultsWith.add((int[]) r); + } + } + + for (String q : queryWithout) { + Object r = executeQuery(q); + if (r != null) { + resultsWithout.add((int[]) r); + } + } + + Set allResults_set = new HashSet(); + + // Note: could probably be replaced efficiently by: + // select * from union ( select * from ) + for (int[] resultWith : resultsWith) { + allResults_set.addAll(arrayToSet(resultWith)); + } + for (int[] resultWithout : resultsWithout) { + allResults_set.removeAll(arrayToSet(resultWithout)); + } + + int[] retainedSet = snapshot.getRetainedSet(setToArray(allResults_set), progressListener); + long heapSizeOfRetainedSet = snapshot.getHeapSize(retainedSet); + res.memorySum = heapSizeOfRetainedSet; + + return res; + } + + public QueryResult computeRetainedSizeWithOQLQuery(String query) throws Exception { // We open the dump with Eclipse Memory Analyzer, and obtain a snapshot // object QueryResult res = new QueryResult(); @@ -58,9 +124,11 @@ public QueryResult computeRetainedSizeWithOQLQuery(String query, File dumpFile) IOQLQuery queryObj = SnapshotFactory.createQuery(query); Object result = queryObj.execute(snapshot, new VoidProgressListener()); - //System.out.println("OQL result: " + result); - //System.out.println("OQL class: " + result.getClass().getCanonicalName()); + // System.out.println("OQL result: " + result); + // System.out.println("OQL class: " + + // result.getClass().getCanonicalName()); + // Case list of amounts if (result instanceof IOQLQuery.Result) { IResultTable castResult2 = (IResultTable) result; int sum = 0; @@ -69,23 +137,27 @@ public QueryResult computeRetainedSizeWithOQLQuery(String query, File dumpFile) } res.memorySum = sum; res.nbElements = castResult2.getRowCount(); - } else if (result instanceof int[]) { + } + // Case list of objects + else if (result instanceof int[]) { int[] castResult = (int[]) result; res.nbElements = castResult.length; + int[] retainedSet = snapshot.getRetainedSet(castResult, progressListener); + long heapSizeOfRetainedSet = snapshot.getHeapSize(retainedSet); + res.memorySum = heapSizeOfRetainedSet; } } catch (OQLParseException e) { - System.out.println("Error: parsing of the OQL query failed. Line " + e.getLine() + ", Column " - + e.getColumn() + "."); - e.printStackTrace(); + String message = "Error: parsing of the OQL query failed. " + e.getMessage() + "."; + throw new Exception(message, e); } catch (SnapshotException e) { - System.err.println("Error while computing memory consumption!"); - e.printStackTrace(); + String message = "Error while computing memory consumption! " + e.getMessage(); + throw new Exception(message, e); } return res; } - public int computeRetainedSizeOfClass(String className, File dumpFile) { + public int computeRetainedSizeOfClass(String className) { // We open the dump with Eclipse Memory Analyzer, and obtain a snapshot // object @@ -108,38 +180,35 @@ public int computeRetainedSizeOfClass(String className, File dumpFile) { } } - SnapshotFactory.dispose(snapshot); - } catch (SnapshotException e) { System.err.println("Error while computing memory consumption!"); e.printStackTrace(); + throw new RuntimeException(e); } return sum; } - - + + public void cleanUp() { + SnapshotFactory.dispose(snapshot); + } + public static void dumpHeap(File dumpFile) throws SnapshotException { - HeapDumpProviderRegistry registry = HeapDumpProviderRegistry.instance(); - IHeapDumpProvider dumpProvider = registry.getHeapDumpProvider("jmapheapdumpprovider").getHeapDumpProvider(); - List vms = dumpProvider.getAvailableVMs(progressListener); - VmInfo currentVm = null; - int pid = Integer.parseInt(ManagementFactory.getRuntimeMXBean().getName().split("@")[0]); - for (VmInfo vm : vms) { - if (vm.getPid() == pid) { - currentVm = vm; - break; - } + HeapDumpProviderRegistry registry = HeapDumpProviderRegistry.instance(); + IHeapDumpProvider dumpProvider = registry.getHeapDumpProvider("jmapheapdumpprovider").getHeapDumpProvider(); + List vms = dumpProvider.getAvailableVMs(progressListener); + VmInfo currentVm = null; + int pid = Integer.parseInt(ManagementFactory.getRuntimeMXBean().getName().split("@")[0]); + for (VmInfo vm : vms) { + if (vm.getPid() == pid) { + currentVm = vm; + break; } - - dumpProvider.acquireDump(currentVm, dumpFile, progressListener); - - - - - } + } + dumpProvider.acquireDump(currentVm, dumpFile, progressListener); + } } diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend new file mode 100644 index 000000000..5524fd25c --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend @@ -0,0 +1,93 @@ +package fr.inria.diverse.trace.benchmark.runconf + +import fr.inria.diverse.trace.benchmark.languages.BenchmarkLanguage +import java.util.ArrayList +import java.util.List +import java.util.Set +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.EObject +import org.gemoc.activitydiagram.sequential.xactivitydiagram.activitydiagram.NamedElement; +import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine +import org.gemoc.xdsmlframework.api.core.IRunConfiguration +import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension +import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint + +class BenchmarkRunConfiguration implements IRunConfiguration { + + private val BenchmarkLanguage language + private val URI model + private val Set addonsToLoad + + new(URI model, BenchmarkLanguage language, Set addonsToLoad) { + this.language = language + this.model = model + this.addonsToLoad = addonsToLoad + } + + override getAnimationDelay() { + return 0; + } + + override getAnimatorURI() { + return null; + } + + override getDeadlockDetectionDepth() { + return 0; + } + + override getEngineAddonExtensions() { + val List result = new ArrayList(); + val loadedAddons = EngineAddonSpecificationExtensionPoint.getSpecifications() + for (ext : loadedAddons) { + if(addonsToLoad.contains(ext.name)) { + result.add(ext) + } + } + return result + } + + override getExecutedModelAsMelangeURI() { + getExecutedModelURI(); + } + + override getExecutedModelURI() { + model + } + + override getExecutionEntryPoint() { + language.entryPoint + } + + override getLanguageName() { + language.languageName + } + + override getMelangeQuery() { + "" + } + + override getBreakStart() { + false + } + + override getDebugModelID() { + "org.gemoc.execution.sequential.javaengine.ui.debugModel" + } + + override getModelEntryPoint() { + val modelResource = PlainK3ExecutionEngine.loadModel(model) + modelResource.allContents + .filter(NamedElement) + .findFirst[true].name + } + + override getModelInitializationArguments() { + "" + } + + override getModelInitializationMethod() { + language.initializationMethod + } + +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/start/BenchmarkStart.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/start/BenchmarkStart.xtend deleted file mode 100644 index 1af14a3fe..000000000 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/start/BenchmarkStart.xtend +++ /dev/null @@ -1,112 +0,0 @@ -package fr.inria.diverse.trace.benchmark.start - -import fr.inria.diverse.trace.benchmark.Benchmark -import fr.inria.diverse.trace.benchmark.Language -import fr.inria.diverse.trace.benchmark.Results -import fr.inria.diverse.trace.benchmark.debuggers.DSTraceDebuggerHelper -import fr.inria.diverse.trace.benchmark.debuggers.NoTraceDebuggerHelper -import fr.inria.diverse.trace.benchmark.debuggers.SnapshotDebugger -import fr.inria.diverse.trace.commons.testutil.EclipseTestUtil -import java.io.BufferedWriter -import java.io.File -import java.io.FileWriter -import java.text.DateFormat -import java.text.SimpleDateFormat -import java.util.ArrayList -import java.util.Date -import java.util.List -import java.util.Map -import org.eclipse.core.resources.IWorkspace -import org.eclipse.core.resources.ResourcesPlugin -import org.eclipse.core.runtime.IProgressMonitor -import org.eclipse.core.runtime.Status -import org.eclipse.core.runtime.jobs.Job -import org.eclipse.emf.common.util.URI -import org.junit.Test - -class BenchmarkStart { - - - private val String heapDumpFolder = "/home/ebousse/tmp/bench-debugging" - private val String outputFolder = "/home/ebousse/Documents/Thèse/2015-02 Omniscient debugging of xDSMLs/results/" - - private def URI createURI(String s) { - return URI.createPlatformResourceURI(s, true); - } - - @Test - /** - * Needs to be run in a workspace with the model! - */ - def void test() { - - EclipseTestUtil.waitForJobs - - val Job j = new Job("Running the benchmark") { - - override protected run(IProgressMonitor monitor) { - - val IWorkspace workspace = ResourcesPlugin.getWorkspace(); - val project = workspace.root.getProjects().get(0); - val folder = project.getFolder("model") - val List modelsList = new ArrayList(); - for (m : folder.members) { - val String fullPath = m.fullPath.toString - if(fullPath.endsWith("xmi")) - modelsList.add(createURI(fullPath)) - } - - val Map> languagesAndModels = newLinkedHashMap( - Language.AD -> modelsList - ) - - val debuggers = #[ - new SnapshotDebugger(), - new DSTraceDebuggerHelper(), - new NoTraceDebuggerHelper() - ] - - val int nbRetries = 4 - - val Benchmark bench = new Benchmark(languagesAndModels, debuggers, nbRetries, - new File(heapDumpFolder)); - try { - - // Executing the benchmark - val Results results = bench.computeAll - - // Printing results - println("\n\n Final Results:\n") - println(results) - - // Writing them in a file - val DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); - val Date date = new Date(); - val String dateString = dateFormat.format(date); - val String fileName = dateString + "_benchmarkResults.csv" - val File output = new File(outputFolder,fileName) - val FileWriter fstream = new FileWriter(output); - val BufferedWriter out = new BufferedWriter(fstream); - try { - out.write(results.toString) - } finally { - out.close - } - - } catch(Exception exc) { - exc.printStackTrace - //println("Major,error, SLEEEPING") - //Thread.sleep(100000000) - return new Status(Status.ERROR, "benchmark", "something went wrong :'("); - } - return Status.OK_STATUS - - } - - } - j.schedule(); - EclipseTestUtil.waitForJobsThenWindowClosed - - } - -} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/BenchmarkTracingCase.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/BenchmarkTracingCase.xtend new file mode 100644 index 000000000..4436f8169 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/BenchmarkTracingCase.xtend @@ -0,0 +1,36 @@ +package fr.inria.diverse.trace.benchmark.tracingcases + +import fr.inria.diverse.trace.benchmark.languages.BenchmarkLanguage +import fr.inria.diverse.trace.benchmark.runconf.BenchmarkRunConfiguration +import fr.inria.diverse.trace.benchmark.utils.EngineHelper +import java.util.Set +import org.eclipse.emf.common.util.URI + +abstract class BenchmarkTracingCase { + + private val engineHelper = new EngineHelper + private val Set traceAddons + public val String traceFolder + + protected new(Set traceAddons, String traceFolder) { + this.traceAddons = traceAddons + this.traceFolder = traceFolder + } + + def long initialize(URI model, BenchmarkLanguage language) { + val runConf = new BenchmarkRunConfiguration(model, language, traceAddons) + engineHelper.removeStoppedEngines + val t = System.nanoTime + engineHelper.prepareEngine(runConf) + System.nanoTime - t + } + + def execute() { + engineHelper.execute + } + + def getSimpleName() { + "generated_traces" + } + +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/CloneBasedTracingCase.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/CloneBasedTracingCase.xtend new file mode 100644 index 000000000..1ddb59d14 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/CloneBasedTracingCase.xtend @@ -0,0 +1,8 @@ +package fr.inria.diverse.trace.benchmark.tracingcases + +class CloneBasedTracingCase extends BenchmarkTracingCase { + new() { + super(#{"MultiBranch Reflective Trace"}, + "/home/dorian/workspace/ModelDebugging/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl") + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GeneratedTracingCase.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GeneratedTracingCase.xtend new file mode 100644 index 000000000..59b825faa --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GeneratedTracingCase.xtend @@ -0,0 +1,9 @@ +package fr.inria.diverse.trace.benchmark.tracingcases + +class GeneratedTracingCase extends BenchmarkTracingCase { + new() { + super(#{"activitydiagram MultiDimensional Trace"}, + "/home/dorian/workspace/ModelDebugging/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl" + ) + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GenericTracingCase.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GenericTracingCase.xtend new file mode 100644 index 000000000..0528d4cc2 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GenericTracingCase.xtend @@ -0,0 +1,9 @@ +package fr.inria.diverse.trace.benchmark.tracingcases + +class GenericTracingCase extends BenchmarkTracingCase { + new() { + super(#{"Generic MultiDimensional Trace"}, + "/home/dorian/workspace/ModelDebugging/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl" + ) + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/HybridTracingCase.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/HybridTracingCase.xtend new file mode 100644 index 000000000..563b43fc4 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/HybridTracingCase.xtend @@ -0,0 +1,8 @@ +package fr.inria.diverse.trace.benchmark.tracingcases + +class HybridTracingCase extends BenchmarkTracingCase { + new() { + super(#{"Generic MultiDimensional Trace"}, + "/home/dorian/workspace/ModelDebugging/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl") + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/NoTracingCase.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/NoTracingCase.xtend new file mode 100644 index 000000000..85f61c10e --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/NoTracingCase.xtend @@ -0,0 +1,7 @@ +package fr.inria.diverse.trace.benchmark.tracingcases + +class NoTracingCase extends BenchmarkTracingCase { + new() { + super(#{},"") + } +} \ No newline at end of file diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend new file mode 100644 index 000000000..f5b9d9ffd --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend @@ -0,0 +1,14 @@ +package fr.inria.diverse.trace.benchmark.utils + +import org.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext +import org.gemoc.executionframework.engine.commons.EngineContextException +import org.gemoc.xdsmlframework.api.core.ExecutionMode +import org.gemoc.xdsmlframework.api.core.IRunConfiguration + +class BenchmarkExecutionModelContext extends SequentialModelExecutionContext { + + new(IRunConfiguration runConfiguration) throws EngineContextException { + super(runConfiguration, ExecutionMode.Run) + } + +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkHelpers.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkHelpers.xtend new file mode 100644 index 000000000..8b86fb9ee --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkHelpers.xtend @@ -0,0 +1,156 @@ +package fr.inria.diverse.trace.benchmark.utils + +import java.io.IOException +import java.io.PrintStream +import java.io.OutputStream +import java.util.Locale +import java.io.File +import java.io.FileInputStream +import org.eclipse.core.resources.IFolder +import org.eclipse.core.resources.IResource +import org.eclipse.core.resources.IProject +import org.eclipse.core.runtime.IProgressMonitor +import org.eclipse.emf.transaction.util.TransactionUtil +import org.eclipse.emf.transaction.RecordingCommand +import org.eclipse.emf.ecore.resource.ResourceSet +import java.util.HashMap +import java.util.Map +import java.util.Collection +import java.util.ArrayList +import java.util.List + +class BenchmarkHelpers { + + public static def void copyFileInWS(File file, IFolder destination, IProgressMonitor m) { + val fileInProject = destination.getFile(file.name) + if (!fileInProject.exists) + fileInProject.create(new FileInputStream(file), true, m); + } + + public static def IFolder copyFolderInWS(File folder, IResource destination, IProgressMonitor m) { + val folderCopy = if (destination instanceof IProject) { + destination.getFolder(folder.name) + } else if (destination instanceof IFolder) { + destination.getFolder(folder.name) + } else + null + + if (!folderCopy.exists) + folderCopy.create(true, true, m) + for (File f : folder.listFiles) { + if (f.isFile) { + copyFileInWS(f, folderCopy, m) + } else if (f.isDirectory) { + copyFolderInWS(f, folderCopy, m) + } + } + return folderCopy + } + + public static def createEmptyPrintStream() { + val emptyOutStream = new OutputStream() { + override write(int b) throws IOException {} + } + + val emptyPrintStream = new PrintStream(emptyOutStream) { + override flush() {} + + override close() {} + + override write(int b) {} + + override write(byte[] b) {} + + override write(byte[] buf, int off, int len) {} + + override print(boolean b) {} + + override print(char c) {} + + override print(int i) {} + + override print(long l) {} + + override print(float f) {} + + override print(double d) {} + + override print(char[] s) {} + + override print(String s) {} + + override print(Object obj) {} + + override println() {} + + override println(boolean x) {} + + override println(char x) {} + + override println(int x) {} + + override println(long x) {} + + override println(float x) {} + + override println(double x) {} + + override println(char[] x) {} + + override println(String x) {} + + override println(Object x) {} + + override printf(String format, Object... args) { return this; } + + override printf(Locale l, String format, Object... args) { return this; } + + override format(String format, Object... args) { return this; } + + override format(Locale l, String format, Object... args) { return this; } + + override append(CharSequence csq) { return this; } + + override append(CharSequence csq, int start, int end) { return this; } + + override append(char c) { return this; } + + } + return emptyPrintStream + } + + public static def void clearResourceSet(ResourceSet rs) { + val ed = TransactionUtil.getEditingDomain(rs) + // Clean resource + val command = new RecordingCommand(ed, "Clean resources") { + override protected doExecute() { + for (c : rs.allContents.toSet) + c.eAdapters.clear + for (r : rs.resources) { + r.eAdapters.clear + } + rs.eAdapters.clear + } + } + ed.commandStack.execute(command) + } + + public static def > Map mergeMaps(Map... maps) { + val result = new HashMap() + for (m : maps) { + for (k : m.keySet) { + if (result.containsKey(k)) { + val Collection value = result.get(k) + val Collection test = m.get(k) + value.addAll(test) + } else { + val List value = new ArrayList + value.addAll(m.get(k)) + result.put(k, value as V) + } + } + + } + return result + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVHelper.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVHelper.xtend new file mode 100644 index 000000000..ec48759a6 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVHelper.xtend @@ -0,0 +1,51 @@ +package fr.inria.diverse.trace.benchmark.utils + +import java.util.List +import java.util.ArrayList + +class CSVHelper { + + public List> addStateExecutionTimes = new ArrayList + public List> restoreStateExecutionTimes = new ArrayList + public List totalExecutionTimes = new ArrayList + public List initializationTimes = new ArrayList + public Long memoryFootprint = 0L + + public def exportAddStateExecutionTimes() { + val List result = new ArrayList + val maxSize = addStateExecutionTimes.maxBy[l|l.size].size + for (var i = 0; i < maxSize; i++) { + val List line = new ArrayList + for (List l : addStateExecutionTimes) { + line.add(if (i < l.size) l.get(i) else -1L) + } + result.add(line.map[t|if(t == -1L) "" else (t/1000000.0)].join(",")) + } + return result.join("\n") + } + + public def exportRestoreStateExecutionTimes() { + val List result = new ArrayList + val maxSize = restoreStateExecutionTimes.maxBy[l|l.size].size + for (var i = 0; i < maxSize; i++) { + val List line = new ArrayList + for (List l : restoreStateExecutionTimes) { + line.add(if (i < l.size) l.get(i) else -1L) + } + result.add(line.map[t|if(t == -1L) "" else (t/1000000.0)].join(",")) + } + return result.join("\n") + } + + public def exportExecutionTimes() { + totalExecutionTimes.map[t|t/1000000.0].join("\n") + } + + public def exportInitializationTimes() { + initializationTimes.map[t|t/1000000.0].join("\n") + } + + public def exportMemoryFootprint() { + memoryFootprint + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVLine.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVLine.xtend new file mode 100644 index 000000000..46f145f66 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVLine.xtend @@ -0,0 +1,37 @@ +package fr.inria.diverse.trace.benchmark.utils + +import java.util.List +import java.util.ArrayList + +//model_size,nbMut,timeStep,traceSize,traceMemoryFootprint,meanJumpTime,allJumpTimes +class CSVLine { + + public String languageName = "" + public String traceMetamodel = "" + public String modelName = "" + public String inputName = "" + public Integer modelID = -1 + public Long timeExe = new Long(0) + public List timeWarms = new ArrayList() + public List timeExes = new ArrayList() + public Integer traceNbStates = 0 + public Long traceMemoryFootprint = new Long(0) + public Integer nbWarmups = -1 + public Integer nbMeasurements = -1 + + private static val separator = ";"; + + private static def getAllFields() { + CSVLine.declaredFields.filter[f|!f.name.contentEquals("separator")] + } + + def static String getColumnNames() { + val allNames = getAllFields.map[f|f.name] + return allNames.join(separator) + } + + def String customToString() { + return getAllFields.map[f|f.get(this)].join(separator) + } + +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/EngineHelper.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/EngineHelper.java new file mode 100644 index 000000000..b60f6f470 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/EngineHelper.java @@ -0,0 +1,89 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package fr.inria.diverse.trace.benchmark.utils; + +import java.util.Map.Entry; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.transaction.util.TransactionUtil; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.search.SearchMatch; +import org.eclipse.jdt.core.search.SearchRequestor; +import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; +import org.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext; +import org.gemoc.executionframework.engine.Activator; +import org.gemoc.executionframework.engine.commons.EngineContextException; +import org.gemoc.xdsmlframework.api.core.ExecutionMode; +import org.gemoc.xdsmlframework.api.core.IExecutionContext; +import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; + +import fr.inria.diverse.trace.benchmark.runconf.BenchmarkRunConfiguration; +import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; + +public class EngineHelper { + + static class DefaultSearchRequestor extends SearchRequestor { + + public IType _binaryType; + + @Override + public void acceptSearchMatch(SearchMatch match) throws CoreException { + _binaryType = (IType) match.getElement(); + System.out.println(match.getElement()); + } + } + + private PlainK3ExecutionEngine _executionEngine; + + // Parameter to create execution engine + private IExecutionContext executionContext; + + public void prepareEngine(BenchmarkRunConfiguration runConf) throws CoreException, EngineContextException { + ExecutionMode executionMode = ExecutionMode.Run; + executionContext = new SequentialModelExecutionContext(runConf, executionMode); + executionContext.initializeResourceModel(); + _executionEngine = new PlainK3ExecutionEngine(); + _executionEngine.initialize(executionContext); + _executionEngine.stopOnAddonError = true; + } + + public void execute() { + _executionEngine.start(); + _executionEngine.joinThread(); + } + + public IMultiDimensionalTraceAddon getEngineAddon() { + return _executionEngine.getAddon(IMultiDimensionalTraceAddon.class); + } + + public Resource getModel() { + return _executionEngine.getExecutionContext().getResourceModel(); + } + + public void removeStoppedEngines() { + for (Entry engineEntry : Activator.getDefault().gemocRunningEngineRegistry.getRunningEngines().entrySet()) { + switch (engineEntry.getValue().getRunningStatus()) { + case Stopped: + Activator.getDefault().gemocRunningEngineRegistry.unregisterEngine(engineEntry.getKey()); + break; + default: + } + } + } + + public void clearCommandStackAndAdapters() { + TransactionUtil.getEditingDomain(executionContext.getResourceModel()).getCommandStack().flush(); + executionContext.getResourceModel().eAdapters().clear(); + executionContext.getResourceModel().unload(); + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/MemoryCSVHelper.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/MemoryCSVHelper.xtend new file mode 100644 index 000000000..d7cebaadf --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/MemoryCSVHelper.xtend @@ -0,0 +1,36 @@ +package fr.inria.diverse.trace.benchmark.utils + +import java.util.HashMap +import java.util.List +import java.util.Map +import java.util.ArrayList + +class MemoryCSVHelper { + + public val Map> memoryFootprints = new HashMap + public val Map> numberOfStates = new HashMap + public val List traceTypes = new ArrayList + + public def exportLines() { + val List> mem = new ArrayList + val List> states = new ArrayList + val lines = new ArrayList + var header = "" + for (String traceType : traceTypes) { + mem.add(memoryFootprints.get(traceType)) + states.add(numberOfStates.get(traceType)) + header += traceType + "Memory," + traceType + "States," + } + header = header.substring(0,header.length-1) + lines.add(header) + for (var i = 0; i < mem.head.size; i++) { + var s = "" + for (var j = 0; j < traceTypes.size; j++) { + s += mem.get(j).get(i) + "," + states.get(j).get(i) + "," + } + s = s.substring(0,s.length-1) + lines.add(s) + } + return lines.join("\n") + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestListener.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestListener.java new file mode 100644 index 000000000..c75826d66 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestListener.java @@ -0,0 +1,137 @@ +package fr.inria.diverse.trace.benchmark.utils; + +import java.io.File; + +import org.eclipse.jdt.internal.junit.model.ITestRunListener2; + +import junit.framework.TestCase; +import junit.framework.TestResult; + +@SuppressWarnings("restriction") +public class PDETestListener implements ITestRunListener2 { + private Object resultsCollector; + private int totalNumberOfTests; + private int testsRunCount; + private int numberOfTestsPassed; + private int numberOfTestsFailed; + private int numberOfTestsWithError; + private boolean testRunEnded = false; + private File outputFile; + private String suiteName; + + public PDETestListener(Object collector, String suite) { + resultsCollector = collector; + suiteName = suite; + } + + public void setOutputFile(String filename) { + outputFile = new File(filename); + } + + public File getOutputFile() { + if (outputFile == null) { + setOutputFile("TEST-" + suiteName + ".xml"); + } + return outputFile; + } + + public boolean failed() { + return ((numberOfTestsFailed + numberOfTestsWithError) > 0) || (testRunEnded && (testsRunCount == 0)); + } + + public int count() { + return testsRunCount; + } + + public synchronized void testRunStarted(int testCount) { + totalNumberOfTests = testCount; + testsRunCount = 0; + numberOfTestsPassed = 0; + numberOfTestsFailed = 0; + numberOfTestsWithError = 0; + testRunEnded = false; + System.out.println("PDE Test Run Started - running " + totalNumberOfTests + " tests ..."); + } + + public synchronized void testRunEnded(long elapsedTime) { + testRunEnded = true; + System.out.println("Test Run Ended - " + (failed() ? "FAILED" : "PASSED") + " - Total: " + totalNumberOfTests + + " (Errors: " + numberOfTestsWithError + ", Failed: " + numberOfTestsFailed + ", Passed: " + + numberOfTestsPassed + "), duration " + elapsedTime + "ms."); + + synchronized (resultsCollector) { + resultsCollector.notifyAll(); + } + } + + public synchronized void testRunStopped(long elapsedTime) { + System.out.println("Test Run Stopped"); + testRunEnded(elapsedTime); + } + + public synchronized void testRunTerminated() { + System.out.println("Test Run Terminated"); + testRunEnded(0); + } + + public synchronized void testStarted(String testId, String testName) { + testsRunCount++; + new WrapperTestCase(testName); + System.out.println(" Test Started - " + count() + " - " + testName); + } + + public synchronized void testEnded(String testId, String testName) { + numberOfTestsPassed = count() - (numberOfTestsFailed + numberOfTestsWithError); + System.out.println(" Test Ended - " + count() + " - " + testName); + } + + public synchronized void testFailed(int status, String testId, String testName, String trace, String expected, + String actual) { + String statusMessage = String.valueOf(status); + if (status == ITestRunListener2.STATUS_OK) { + numberOfTestsPassed++; + statusMessage = "OK"; + } else if (status == ITestRunListener2.STATUS_FAILURE) { + numberOfTestsFailed++; + statusMessage = "FAILED"; + } else if (status == ITestRunListener2.STATUS_ERROR) { + numberOfTestsWithError++; + statusMessage = "ERROR"; + } + System.out.println(" Test Failed - " + count() + " - " + testName + " - status: " + statusMessage + + ", trace: " + trace + ", expected: " + expected + ", actual: " + actual); + } + + public synchronized void testReran(String testId, String testClass, String testName, int status, String trace, + String expected, String actual) { + String statusMessage = String.valueOf(status); + if (status == ITestRunListener2.STATUS_OK) { + statusMessage = "OK"; + } else if (status == ITestRunListener2.STATUS_FAILURE) { + statusMessage = "FAILED"; + } else if (status == ITestRunListener2.STATUS_ERROR) { + statusMessage = "ERROR"; + } + + System.out.println(" Test ReRan - " + testName + " - test class: " + testClass + ", status: " + statusMessage + + ", trace: " + trace + ", expected: " + expected + ", actual: " + actual); + } + + public synchronized void testTreeEntry(String description) { + System.out.println("Test Tree Entry - Description: " + description); + } + + class WrapperTestCase extends TestCase { + + public WrapperTestCase(String name) { + super(name); + } + + public int countTestCases() { + return 1; + } + + public void run(TestResult result) { + } + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestResultsCollector.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestResultsCollector.java new file mode 100644 index 000000000..a5508b9a7 --- /dev/null +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestResultsCollector.java @@ -0,0 +1,41 @@ +package fr.inria.diverse.trace.benchmark.utils; + +import org.eclipse.jdt.internal.junit.model.ITestRunListener2; +import org.eclipse.jdt.internal.junit.model.RemoteTestRunnerClient; + +@SuppressWarnings("restriction") +public final class PDETestResultsCollector { + private static PDETestListener pdeTestListener; + + private String suiteName; + + public PDETestResultsCollector(String suite) { + suiteName = suite; + } + + public void run(int port) throws InterruptedException { + pdeTestListener = new PDETestListener(this, suiteName); + new RemoteTestRunnerClient().startListening(new ITestRunListener2[] { pdeTestListener }, port); + System.out.println("Listening on port " + port + " for test suite " + suiteName + " results ..."); + synchronized (this) { + wait(); + } + } + + public static void main(String[] args) { + if (args.length != 2) { + System.out.println("usage: PDETestResultsCollector "); + System.exit(0); + } + + try { + new PDETestResultsCollector(args[0]).run(Integer.parseInt(args[1])); + } catch (Throwable th) { + th.printStackTrace(); + } + + if (pdeTestListener != null && pdeTestListener.failed()) { + System.exit(1); + } + } +} diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-1.xmi b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-1.xmi index c7aa79970..b22d7d787 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-1.xmi +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-1.xmi @@ -3,175 +3,202 @@ xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:activitydiagram="http://activitydiagram/1.0" - xsi:schemaLocation="http://activitydiagram/1.0 ../activitydiagram.ecore" + xmlns:activitydiagram="http://org.gemoc.activitydiagram.sequential.xactivitydiagram/activitydiagram/" name="IBM2557-1"> - - - + incoming="e0" + outgoing="e1"> + + + + + + + + + + incoming="e1" + outgoing="e2"/> + incoming="e2" + outgoing="e3"/> + incoming="e3" + outgoing="e4"/> + incoming="e5" + outgoing="e6"/> + incoming="e6" + outgoing="e7"/> + incoming="e7" + outgoing="e8"/> + incoming="e10" + outgoing="e11"/> + incoming="e17" + outgoing="e18"/> + incoming="e15" + outgoing="e16"/> + incoming="e12" + outgoing="e13"/> + incoming="e13" + outgoing="e14"/> + name="initial" + outgoing="e0"/> + name="final" + incoming="e9"/> + name="fork" + incoming="e4" + outgoing="e5 e10"/> + name="join" + incoming="e8 e19" + outgoing="e9"/> + name="decision" + incoming="e11" + outgoing="e12 e15 e17"/> + name="merge" + incoming="e14 e16 e18" + outgoing="e19"/> + name="e0" + source="initial" + target="a"/> + name="e1" + source="a" + target="b"/> + name="e2" + source="b" + target="c"/> + name="e3" + source="c" + target="d"/> + name="e4" + source="d" + target="fork"/> + name="e5" + source="fork" + target="e"/> + name="e6" + source="e" + target="f"/> + name="e7" + source="f" + target="g"/> + name="e8" + source="g" + target="join"/> + name="e9" + source="join" + target="final"/> + name="e10" + source="fork" + target="h"/> + name="e11" + source="h" + target="decision"/> + name="e12" + source="decision" + target="k" + guard="//@locals.4"/> + name="e13" + source="k" + target="l"/> + name="e14" + source="l" + target="merge"/> + name="e15" + source="decision" + target="j" + guard="//@locals.3"/> + name="e16" + source="j" + target="merge"/> + name="e17" + source="decision" + target="i" + guard="//@locals.5"/> + name="e18" + source="i" + target="merge"/> + name="e19" + source="merge" + target="join"/> + - - + name="one" + initialValue="1"/> - - + name="two" + initialValue="2"/> + name="eq2"/> + name="eq1"/> - + name="gr2"/> diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-2.xmi b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-2.xmi index c1e6b773a..98b2d8c13 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-2.xmi +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-2.xmi @@ -159,6 +159,6 @@ name="i equals 1"/> - diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV1.xmi b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV1.xmi index 5d0c18809..d2a011b4c 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV1.xmi +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV1.xmi @@ -1,25 +1,23 @@ - + - - - - - - - - - - + + + + + + + + - + @@ -31,6 +29,6 @@ - - + + diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/.classpath b/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/.classpath index 92c61ad42..87e8cd659 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/.classpath +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/.classpath @@ -1,6 +1,6 @@ - + From 8082b6fff600f56228a4c885d5349834f5de8326 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 14 Mar 2017 12:56:33 +0100 Subject: [PATCH 108/267] Change tycho version to 0.26 --- pom.xml | 2 +- simulationmodelanimation/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8b838b4cc..8e6a1b3b9 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ - 0.25.0 + 0.26.0 2.10.0 UTF8 scm:git:https://github.com/gemoc/modelanimation.git diff --git a/simulationmodelanimation/pom.xml b/simulationmodelanimation/pom.xml index 8163616fa..1f7dff7e1 100644 --- a/simulationmodelanimation/pom.xml +++ b/simulationmodelanimation/pom.xml @@ -32,7 +32,7 @@ Contributors: - 0.25.0 + 0.26.0 From 7fa64cd513b26945ce0b0248008f8db08376a8dd Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 14 Mar 2017 12:56:49 +0100 Subject: [PATCH 109/267] Fix findEventManager parameters --- .../engine/core/AbstractSequentialExecutionEngine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index 73a9140de..011c72398 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -88,7 +88,7 @@ private void manageEvents() { if (mse != null) { EObject container = mse.eContainer(); if (container instanceof SequentialStep) { - IEventManager eventManager = EventManagerRegistry.getInstance().findEventManager(null); + IEventManager eventManager = EventManagerRegistry.getInstance().findEventManager(); if (eventManager != null) { eventManager.manageEvents(); } From faefcbdf85e7e011010bf0e14c9e0be64870cad3 Mon Sep 17 00:00:00 2001 From: d-leroy Date: Tue, 14 Mar 2017 13:35:16 +0100 Subject: [PATCH 110/267] Fixed trace metamodel to make parallel steps big steps --- .../model/GenericTrace.ecore | 174 +++++++++--------- .../model/GenericTraceImpl.ecore | 134 ++++++++------ .../model/LaunchConfiguration.ecore | 32 ++-- .../generictrace/GenericParallelStep.java | 4 +- .../generictrace/GenerictracePackage.java | 11 +- .../impl/GenericParallelStepImpl.java | 143 ++++++++++++++ .../impl/GenerictracePackageImpl.java | 9 +- .../generictrace/util/GenerictraceSwitch.java | 1 + 8 files changed, 347 insertions(+), 161 deletions(-) diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index a2c748cfa..9c6c34a16 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -1,153 +1,159 @@ - + - - - + + + + + + + - - - + + + + + + + + - + - - + +
+ - +
+ - - + + + + + + - + - - - + + + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - - + + + - - + + - - + + - - - + + + - + - + - + - - + + + + + - - + + - - + + - - + @@ -155,61 +161,55 @@
- + - +
- + - + - - + + - + - - + + - + - + - - + + - - + + - - + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore index 23713c3c7..16449c8bb 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore @@ -1,93 +1,117 @@ - + - - - - + + + + + - - - + + + + + + + + + + - - - + + + + + + - +
- - - - + + + + + + + - - - + + + + - + - - - - + + + + + - - - + + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + - - + + + - - + + + + - - + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore index 909c76c5c..cfa0528a1 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore @@ -1,23 +1,23 @@ - + - - + + + + - + + + - - - - - - - - + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java index 97845dbaa..7cddf72fe 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java @@ -2,6 +2,8 @@ */ package fr.inria.diverse.trace.commons.model.generictrace; +import fr.inria.diverse.trace.commons.model.trace.BigStep; + /** * @@ -13,5 +15,5 @@ * @model * @generated */ -public interface GenericParallelStep extends GenericStep { +public interface GenericParallelStep extends GenericStep, BigStep { } // GenericParallelStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java index b49ce18fc..bb8d5e0ac 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java @@ -216,6 +216,15 @@ public interface GenerictracePackage extends EPackage { */ int GENERIC_PARALLEL_STEP__ENDING_STATE = GENERIC_STEP__ENDING_STATE; + /** + * The feature id for the 'Sub Steps' containment reference list. + * + * + * @generated + * @ordered + */ + int GENERIC_PARALLEL_STEP__SUB_STEPS = GENERIC_STEP_FEATURE_COUNT + 0; + /** * The number of structural features of the 'Generic Parallel Step' class. * @@ -223,7 +232,7 @@ public interface GenerictracePackage extends EPackage { * @generated * @ordered */ - int GENERIC_PARALLEL_STEP_FEATURE_COUNT = GENERIC_STEP_FEATURE_COUNT + 0; + int GENERIC_PARALLEL_STEP_FEATURE_COUNT = GENERIC_STEP_FEATURE_COUNT + 1; /** * The number of operations of the 'Generic Parallel Step' class. diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java index 2b3c57b04..d7822e282 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java @@ -3,18 +3,43 @@ package fr.inria.diverse.trace.commons.model.generictrace.impl; import fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep; +import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import java.util.Collection; +import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; /** * * An implementation of the model object 'Generic Parallel Step'. * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericParallelStepImpl#getSubSteps Sub Steps}
    • + *
* * @generated */ public class GenericParallelStepImpl extends GenericStepImpl implements GenericParallelStep { + /** + * The cached value of the '{@link #getSubSteps() Sub Steps}' containment reference list. + * + * + * @see #getSubSteps() + * @generated + * @ordered + */ + protected EList subSteps; + /** * * @@ -34,4 +59,122 @@ protected EClass eStaticClass() { return GenerictracePackage.Literals.GENERIC_PARALLEL_STEP; } + /** + * + * + * @generated + */ + public EList getSubSteps() { + if (subSteps == null) { + subSteps = new EObjectContainmentEList(GenericStep.class, this, GenerictracePackage.GENERIC_PARALLEL_STEP__SUB_STEPS); + } + return subSteps; + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case GenerictracePackage.GENERIC_PARALLEL_STEP__SUB_STEPS: + return ((InternalEList)getSubSteps()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.GENERIC_PARALLEL_STEP__SUB_STEPS: + return getSubSteps(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.GENERIC_PARALLEL_STEP__SUB_STEPS: + getSubSteps().clear(); + getSubSteps().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.GENERIC_PARALLEL_STEP__SUB_STEPS: + getSubSteps().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.GENERIC_PARALLEL_STEP__SUB_STEPS: + return subSteps != null && !subSteps.isEmpty(); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { + if (baseClass == BigStep.class) { + switch (derivedFeatureID) { + case GenerictracePackage.GENERIC_PARALLEL_STEP__SUB_STEPS: return TracePackage.BIG_STEP__SUB_STEPS; + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { + if (baseClass == BigStep.class) { + switch (baseFeatureID) { + case TracePackage.BIG_STEP__SUB_STEPS: return GenerictracePackage.GENERIC_PARALLEL_STEP__SUB_STEPS; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + } //GenericParallelStepImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java index 7db60ccfd..a5231b51c 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java @@ -662,7 +662,14 @@ public void initializePackageContents() { g2 = createEGenericType(this.getGenericState()); g1.getETypeArguments().add(g2); genericSequentialStepEClass.getEGenericSuperTypes().add(g1); - genericParallelStepEClass.getESuperTypes().add(this.getGenericStep()); + g1 = createEGenericType(this.getGenericStep()); + genericParallelStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theTracePackage.getBigStep()); + g2 = createEGenericType(this.getGenericStep()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(this.getGenericState()); + g1.getETypeArguments().add(g2); + genericParallelStepEClass.getEGenericSuperTypes().add(g1); genericSmallStepEClass.getESuperTypes().add(this.getGenericStep()); genericReferenceValueEClass.getESuperTypes().add(this.getGenericValue()); g1 = createEGenericType(theTracePackage.getDimension()); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java index d7cf1af04..063884765 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java @@ -89,6 +89,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { GenericParallelStep genericParallelStep = (GenericParallelStep)theEObject; T result = caseGenericParallelStep(genericParallelStep); if (result == null) result = caseGenericStep(genericParallelStep); + if (result == null) result = caseBigStep(genericParallelStep); if (result == null) result = caseStep(genericParallelStep); if (result == null) result = defaultCase(theEObject); return result; From 1c74f11e968ac3bd3ddbc19e1fdfd47d396f654e Mon Sep 17 00:00:00 2001 From: d-leroy Date: Tue, 14 Mar 2017 15:14:19 +0100 Subject: [PATCH 111/267] Fix build properties --- .../build.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/build.properties b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/build.properties index 4465407fc..cce158b0f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/build.properties +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/build.properties @@ -6,5 +6,6 @@ bin.includes = .,\ plugin.xml,\ plugin.properties jars.compile.order = . -source.. = src/ +source.. = src/,\ + xtend-gen/ output.. = bin/ From 6af784377e8f46025d0e22f96634d6d141023dff Mon Sep 17 00:00:00 2001 From: d-leroy Date: Wed, 15 Mar 2017 10:11:58 +0100 Subject: [PATCH 112/267] Added plugin.xml to build.properties and little clean up --- .../plugins/fr.inria.diverse.trace.gemoc/build.properties | 3 ++- .../trace/gemoc/traceaddon/GenericStateManager.java | 4 ---- .../trace/gemoc/traceaddon/GenericTraceEngineAddon.java | 8 -------- .../trace/gemoc/traceaddon/GenericTraceExtractor.java | 2 +- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/build.properties b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/build.properties index 0ca040a19..555b9ec3b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/build.properties +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/build.properties @@ -3,5 +3,6 @@ source.. = src/,\ output.. = bin/ bin.includes = META-INF/,\ .,\ - about.html + about.html,\ + plugin.xml src.includes = about.html diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java index 7de79572a..fc997bd1d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java @@ -1,9 +1,5 @@ package fr.inria.diverse.trace.gemoc.traceaddon; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.PrintWriter; import java.util.List; import java.util.Map; import java.util.function.Consumer; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java index 7a88aebcf..ac161178d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java @@ -10,9 +10,6 @@ *******************************************************************************/ package fr.inria.diverse.trace.gemoc.traceaddon; -import java.io.File; -import java.io.FileOutputStream; -import java.io.PrintWriter; import java.util.Map; import org.eclipse.emf.ecore.EObject; @@ -29,11 +26,6 @@ public class GenericTraceEngineAddon extends AbstractTraceAddon { private GenericTraceStepFactory factory = null; - private final String tmpFilePath = System.getProperty("tmpFileProperty"); - private File outputTmp; - private FileOutputStream outputTmpStream; - private PrintWriter outputTmpWriter; - @Override public IStepFactory getFactory() { if (factory == null) { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index 70fb41012..33357c9ba 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -560,7 +560,7 @@ private void updateEquivalenceClasses(List> states) { @Override public void statesAdded(List> states) { -// updateEquivalenceClasses(states); + updateEquivalenceClasses(states); notifyListeners(); } From ca47d8c5f14327b3e2fb1cf18e919f1d83e86901 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 15 Mar 2017 16:26:56 +0100 Subject: [PATCH 113/267] Fix generative approach that was not working anymore for xmof --- .../clean/StandaloneEMFProjectGenerator.xtend | 54 +++++++++++++++---- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend index 56ed69542..f73af415e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend @@ -97,7 +97,7 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { ecoreModelResource.unload ecoreModelResource.load(null) - + // Check that all required ecore models are available checkReferencedPackages(ecoreModelResource); @@ -190,14 +190,34 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { genModel.initialize(Collections.singleton(rootEPackage)); setMissingParameterTypes(genModel); - val List missingGenPackages = computeMissingGenPackages(genModel); - referencedGenPackages.addAll(missingGenPackages) - referencedGenPackages.addAll(genModel.genPackages) - genModel.getUsedGenPackages().addAll(missingGenPackages); + fixUsedGenPackages(genModel) return genModelResource; } + private Set fixedGenModels = new HashSet + + /** + * Tries to fix the "usedGenPackages" collection of a genmodel (and recursively of all genmodels it references) + * 1) remove all usedGenPackages that have a null genModel (for a mysterious reason...) + * 2) use the magical method 'computeMissingGenPackages' to find missing packages, and add them to usedGenPackages + * 3) as a bonus, store all referenced gen packages in 'referencedGenPackages' for later use + */ + private def void fixUsedGenPackages(GenModel genModel) { + if (!fixedGenModels.contains(genModel)) { + fixedGenModels.add(genModel) + genModel.usedGenPackages.removeAll(genModel.usedGenPackages.immutableCopy.filter[p|p.genModel == null]) + val List missingGenPackages = computeMissingGenPackages(genModel); + for (genPackage : missingGenPackages) { + fixUsedGenPackages(genPackage.genModel) + } + referencedGenPackages.addAll(missingGenPackages) + referencedGenPackages.addAll(genModel.genPackages) + genModel.getUsedGenPackages().addAll(missingGenPackages); + } + + } + protected def String getModelName(URI genModelURI) { val String genModelFileName = genModelURI.trimFileExtension().lastSegment(); val String modelName = genModelFileName.substring(0, 1).toUpperCase() + genModelFileName.substring(1); @@ -323,7 +343,7 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { - «e» «ENDFOR» «FOR e : errors BEFORE "Encountered diagnostic errors:\n" SEPARATOR "\n" AFTER "\n"» - - «e.message» + - «e.message» «««»» (source: «e.source») «ENDFOR» ''' } @@ -335,13 +355,27 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { val boolean canGenerate = generator.canGenerate(genModel, GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE); var String message = '''Cannot generate code of EPackage «this.ecoreModel.name»''' if (canGenerate) { - val Diagnostic diagnostic = generator.generate(genModel, GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE, - BasicMonitor.toMonitor(progressMonitor)); - if (diagnostic.getSeverity() == Diagnostic.OK) { + + var Diagnostic diagnostic = null + var String otherMessage = "" + try { + // Calling the generator + diagnostic = generator.generate(genModel, GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE, + BasicMonitor.toMonitor(progressMonitor)); + } catch (Throwable t) { + otherMessage = exceptionToStackString(t) + } + + if (diagnostic != null && diagnostic.getSeverity() == Diagnostic.OK) { success = true; } else { - message += ''': «diagnosticErrorsToString(diagnostic)».''' + if (diagnostic != null) + message += ''': «diagnosticErrorsToString(diagnostic)».''' + else { + message += otherMessage + } } + } else { message += "generator.canGenerate returns false." } From 03ef4bb7169c14398cd5e0f86cdaf7792955e11c Mon Sep 17 00:00:00 2001 From: d-leroy Date: Thu, 16 Mar 2017 13:34:32 +0100 Subject: [PATCH 114/267] Removed remaining benchmark-specific code --- .../gemoc/traceaddon/AbstractTraceAddon.xtend | 49 +------------------ .../gemoc/traceaddon/GenericStateManager.java | 14 +----- .../traceaddon/GenericTraceEngineAddon.java | 2 +- 3 files changed, 4 insertions(+), 61 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index b82729837..bc1067dbb 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -25,15 +25,11 @@ import fr.inria.diverse.trace.gemoc.api.ITraceExplorer import fr.inria.diverse.trace.gemoc.api.ITraceExtractor import fr.inria.diverse.trace.gemoc.api.ITraceListener import fr.inria.diverse.trace.gemoc.api.ITraceNotifier -import java.io.File -import java.io.FileOutputStream -import java.io.PrintWriter import java.util.ArrayList import java.util.HashSet import java.util.List import java.util.Map import java.util.Set -import java.util.function.Consumer import org.eclipse.emf.common.util.URI import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EPackage @@ -127,26 +123,10 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi manageStep(step, false) } - private var String tmpAddFilePath = System.getProperty("tmpAddFileProperty") - private var File outputAddTmp - private var FileOutputStream outputAddTmpStream - private var PrintWriter outputAddTmpWriter - private var String tmpRestoreFilePath = System.getProperty("tmpRestoreFileProperty") - private var File outputRestoreTmp - private var FileOutputStream outputRestoreTmpStream - private var PrintWriter outputRestoreTmpWriter - protected var Consumer restoreLogger - protected def manageStep(Step step, boolean add) { if (step != null) { modifyTrace([ - if (outputAddTmpWriter != null) { - val t = System.nanoTime - traceConstructor.addState(listenerAddon.getChanges(this)) - outputAddTmpWriter.println((System.nanoTime - t)) - } else { - traceConstructor.addState(listenerAddon.getChanges(this)) - } + traceConstructor.addState(listenerAddon.getChanges(this)) if (add) { traceConstructor.addStep(step) @@ -168,38 +148,11 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi } } } - - override engineAboutToStop(IExecutionEngine engine) { -// val path = System.getProperty("saveTracePath") -// if (path != null && path.length > 0) { -// traceConstructor.save(URI.createFileURI(path)) -// } - for (var i = 0; i < traceExtractor.statesTraceLength; i++) { - traceExplorer.jump(traceExtractor.getState(i)) - } - if (outputAddTmpWriter != null) { - outputAddTmpStream.close - outputAddTmpWriter.close - outputRestoreTmpStream.close - outputRestoreTmpWriter.close - } - } /** * To construct the trace manager */ override engineAboutToStart(IExecutionEngine engine) { - - tmpAddFilePath = System.getProperty("tmpAddFileProperty") - outputAddTmp = if (tmpAddFilePath != null && tmpAddFilePath.length > 0) new File(tmpAddFilePath) else null - outputAddTmpStream = if (outputAddTmp !=null) new FileOutputStream(outputAddTmp) else null - outputAddTmpWriter = if (outputAddTmpStream != null) new PrintWriter(outputAddTmpStream, true) else null - tmpRestoreFilePath = System.getProperty("tmpRestoreFileProperty") - outputRestoreTmp = if (tmpRestoreFilePath != null && tmpRestoreFilePath.length > 0) new File(tmpRestoreFilePath) else null - outputRestoreTmpStream = if (outputRestoreTmp !=null) new FileOutputStream(outputRestoreTmp) else null - outputRestoreTmpWriter = if (outputRestoreTmpStream != null) new PrintWriter(outputRestoreTmpStream, true) else null - restoreLogger = [l|if (outputRestoreTmpWriter != null) outputRestoreTmpWriter.println(l)] - if (_executionContext == null) { _executionContext = engine.executionContext diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java index fc997bd1d..e4c42a2a0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java @@ -2,7 +2,6 @@ import java.util.List; import java.util.Map; -import java.util.function.Consumer; import java.util.stream.Collectors; import org.eclipse.emf.common.util.BasicEList; @@ -32,12 +31,9 @@ public class GenericStateManager implements IStateManager> { private final Map, EObject> tracedToExe; - private final Consumer logger; - - public GenericStateManager(Resource modelResource, Map, EObject> tracedToExe, Consumer logger) { + public GenericStateManager(Resource modelResource, Map, EObject> tracedToExe) { this.modelResource = modelResource; this.tracedToExe = tracedToExe; - this.logger = logger; } @Override @@ -49,13 +45,7 @@ public void restoreState(State state) { if (ed != null) { final RecordingCommand command = new RecordingCommand(ed, "") { protected void doExecute() { - if (logger != null) { - long t = System.nanoTime(); - restoreStateExecute((GenericState) state); - logger.accept((System.nanoTime() - t)); - } else { - restoreStateExecute((GenericState) state); - } + restoreStateExecute((GenericState) state); } }; CommandExecution.execute(ed, command); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java index ac161178d..06428d4f1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java @@ -47,7 +47,7 @@ public boolean isAddonForTrace(EObject traceRoot) { @Override public IStateManager> constructStateManager(Resource modelResource, Map, EObject> tracedToExe) { - return new GenericStateManager(modelResource, tracedToExe, restoreLogger); + return new GenericStateManager(modelResource, tracedToExe); } } From 4bab0c9e796e8f1b4f6f30510524b69898489660 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 28 Mar 2017 15:53:35 +0200 Subject: [PATCH 115/267] DefaultModelLoader: refactoring + cleanups + melange without anim --- .../modelloader/DefaultModelLoader.java | 216 ++++++++++-------- 1 file changed, 120 insertions(+), 96 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index aa35be7ad..87a6a0e88 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -34,7 +34,6 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.xmi.XMLResource; import org.eclipse.emf.transaction.RecordingCommand; @@ -82,52 +81,109 @@ import fr.inria.diverse.melange.resource.MelangeResourceImpl; import fr.obeo.dsl.debug.ide.sirius.ui.services.AbstractDSLDebuggerServices; +/** + * Default and main class to load models for execution. Can load with or without + * Sirius animation (which opens a Sirius session) and with or without a Melange + * query (to upcast or convert to a supermetamodel (ie "downcast")) + * + * @author Didier Vojtisek + * @author Erwan Bousse + * + */ +@SuppressWarnings("restriction") public class DefaultModelLoader implements IModelLoader { + /** + * Load the executed model without Sirius animation. + * + * @param context + * The ExecutionContext of the GEMOC execution, to access the + * model URI, the melange query, etc. + * @return the loaded Resource + * @throws RuntimeException + * if anything goes wrong (eg. the model cannot be found). + */ public Resource loadModel(IExecutionContext context) throws RuntimeException { - Resource resource = null; - ResourceSet resourceSet; - resourceSet = new ResourceSetImpl(); - resource = resourceSet.createResource(context.getRunConfiguration().getExecutedModelURI()); - try { - resource.load(null); - } catch (IOException e) { - new RuntimeException(e); - } - return resource; + return loadModel(context, false); } + /** + * Load the executed model with Sirius animation. + * + * @param context + * The ExecutionContext of the GEMOC execution, to access the + * model URI, the melange query, etc. + * @return the loaded Resource (created by Sirius) + * @throws RuntimeException + * if anything goes wrong (eg. the model cannot be found) + */ public Resource loadModelForAnimation(IExecutionContext context) throws RuntimeException { - Resource resource = null; - ResourceSet resourceSet; - if (context.getRunConfiguration().getAnimatorURI() != null) { - killPreviousSiriusSession(context.getRunConfiguration().getAnimatorURI()); - Session session; + return loadModel(context, true); + } + + /** + * Common private method to load a model with or without animation. + * + * @param context + * The ExecutionContext of the GEMOC execution, to access the + * model URI, the melange query, etc. + * @param withAnimation + * True if the model should be loaded with animation, false + * otherwise. + * @return the loaded Resource + * @throws RuntimeException + * if anything goes wrong (eg. the model cannot be found) + */ + private Resource loadModel(IExecutionContext context, boolean withAnimation) throws RuntimeException { + + // Common part: preparing URI + resource set + SubMonitor subMonitor = SubMonitor.convert(this.progressMonitor, 10); + boolean useMelange = context.getRunConfiguration().getMelangeQuery() != null + && !context.getRunConfiguration().getMelangeQuery().isEmpty(); + URI modelURI = null; + if (useMelange) { + subMonitor.setTaskName("Loading model with melange"); + modelURI = context.getRunConfiguration().getExecutedModelAsMelangeURI(); + } else { + subMonitor.setTaskName("Loading model without melange"); + modelURI = context.getRunConfiguration().getExecutedModelURI(); + } + HashMap nsURIMapping = getnsURIMapping(context); + ResourceSet resourceSet = createAndConfigureResourceSet(modelURI, nsURIMapping, subMonitor); + + // If there is animation, we ask sirius to create the resource + if (withAnimation && context.getRunConfiguration().getAnimatorURI() != null) { + try { - session = openNewSiriusSession(context, context.getRunConfiguration().getAnimatorURI()); - resourceSet = session.getTransactionalEditingDomain().getResourceSet(); - } catch (CoreException e) { - throw new RuntimeException(e); - } - // At this point Sirius has loaded the model, so we just need to - // find it - boolean useMelange = context.getRunConfiguration().getMelangeQuery() != null - && !context.getRunConfiguration().getMelangeQuery().isEmpty(); - // calculating model URI as MelangeURI - URI modelURI = useMelange ? context.getRunConfiguration().getExecutedModelAsMelangeURI() - : context.getRunConfiguration().getExecutedModelURI(); - for (Resource r : resourceSet.getResources()) { - if (r.getURI().equals(modelURI)) { - resource = r; - break; + // Killing + restarting Sirius session for animation + killPreviousSiriusSession(context.getRunConfiguration().getAnimatorURI()); + openNewSiriusSession(context, context.getRunConfiguration().getAnimatorURI(), resourceSet, modelURI, + subMonitor); + + // At this point Sirius has loaded the model, we just need to + // find it + for (Resource r : resourceSet.getResources()) { + if (r.getURI().equals(modelURI)) { + return r; + } } + } catch (CoreException e) { + throw new RuntimeException("The model could not be loaded.", e); } + throw new RuntimeException("The model could not be loaded."); + } + // If there is no animation, we create a resource ourselves + else { + Resource resource = resourceSet.createResource(modelURI); + try { + resource.load(null); + } catch (IOException e) { + new RuntimeException("The model could not be loaded.", e); + } return resource; - } else { - // animator not available; fall back to classic load - return loadModel(context); } + } private void killPreviousSiriusSession(URI sessionResourceURI) { @@ -167,40 +223,20 @@ public void run() { } } - private Session openNewSiriusSession(final IExecutionContext context, URI sessionResourceURI) throws CoreException { - - SubMonitor subMonitor = SubMonitor.convert(this.progressMonitor, 10); - - boolean useMelange = context.getRunConfiguration().getMelangeQuery() != null - && !context.getRunConfiguration().getMelangeQuery().isEmpty(); - if (useMelange) { - subMonitor.setTaskName("Loading model for animation with melange"); - } else { - subMonitor.setTaskName("Loading model for animation"); - } - // calculating model URI as MelangeURI - URI modelURI = useMelange ? context.getRunConfiguration().getExecutedModelAsMelangeURI() - : context.getRunConfiguration().getExecutedModelURI(); - - subMonitor.subTask("Configuring ResourceSet"); - subMonitor.newChild(1); - // create and configure resource set - HashMap nsURIMapping = getnsURIMapping(context); - // final ResourceSet rs = createAndConfigureResourceSet(modelURI, - // nsURIMapping); - final ResourceSet rs = createAndConfigureResourceSet(modelURI, nsURIMapping); + private Session openNewSiriusSession(final IExecutionContext context, URI sessionResourceURI, ResourceSet rs, + URI modelURI, SubMonitor subMonitor) throws CoreException { subMonitor.subTask("Loading model"); subMonitor.newChild(3); + // load model resource and resolve all proxies Resource r = rs.getResource(modelURI, true); EcoreUtil.resolveAll(rs); - // EObject root = r.getContents().get(0); + // force adaptee model resource in the main ResourceSet if (r instanceof MelangeResourceImpl) { MelangeResourceImpl mr = (MelangeResourceImpl) r; rs.getResources().add(mr.getWrappedResource()); - if (!r.getContents().isEmpty() && r.getContents().get(0) instanceof EObjectAdapter) { Resource realResource = ((EObjectAdapter) r.getContents().get(0)).getAdaptee().eResource(); rs.getResources().add(realResource); @@ -208,31 +244,22 @@ private Session openNewSiriusSession(final IExecutionContext context, URI sessio } // calculating aird URI - /* - * URI airdURI = useMelange ? - * URI.createURI(sessionResourceURI.toString() .replace("platform:/", - * "melange:/")) : sessionResourceURI; - */ URI airdURI = sessionResourceURI; - // URI airdURI = sessionResourceURI; subMonitor.subTask("Creating Sirius session"); subMonitor.newChild(1); - // create and load sirius session - final Session session = DebugSessionFactory.INSTANCE.createSession(rs, airdURI); - // final IProgressMonitor monitor = new NullProgressMonitor(); + // create sirius session + final Session session = DebugSessionFactory.INSTANCE.createSession(rs, airdURI); final TransactionalEditingDomain editingDomain = session.getTransactionalEditingDomain(); - // Specific to MelangeResource + if (r.getContents().size() > 0) { - Resource res = r.getContents().get(0).eResource(); // get the used - // resource - res.eAdapters().add(new SessionTransientAttachment(session)); // link - // the - // resource - // with - // Sirius - // session + + // get the used resource + Resource res = r.getContents().get(0).eResource(); + + // link the resource with Sirius session + res.eAdapters().add(new SessionTransientAttachment(session)); RecordingCommand cmd = new RecordingCommand(editingDomain) { @Override protected void doExecute() { @@ -245,14 +272,15 @@ protected void doExecute() { try { CommandExecution.execute(editingDomain, cmd); } catch (Exception e) { - // TODO: error msg + throw new RuntimeException("Could not link the resource to the sirius session", e); } } + // load sirius session subMonitor.subTask("Opening Sirius session"); session.open(subMonitor.newChild(2)); - // EcoreUtil.resolveAll(rs); + // activating layers subMonitor.subTask("Opening Sirius editors"); SubMonitor openEditorSubMonitor = subMonitor.newChild(2); @@ -267,8 +295,8 @@ protected void doExecute() { final List elements = new ArrayList(); elements.add(diagram); - final IEditorPart editorPart = DialectUIManager.INSTANCE.openEditor(session, - representation, openEditorSubMonitor.newChild(1)); + final IEditorPart editorPart = DialectUIManager.INSTANCE.openEditor(session, representation, + openEditorSubMonitor.newChild(1)); if (editorPart instanceof DDiagramEditor) { ((DDiagramEditor) editorPart).getPaletteManager().addToolFilter(new ToolFilter() { @Override @@ -338,25 +366,22 @@ protected void doExecute() { return session; } - private ResourceSet createAndConfigureResourceSet(URI modelURI, HashMap nsURIMapping) { + private ResourceSet createAndConfigureResourceSet(URI modelURI, HashMap nsURIMapping, + SubMonitor subMonitor) { + + subMonitor.subTask("Configuring ResourceSet"); + subMonitor.newChild(1); + final ResourceSet rs = ResourceSetFactory.createFactory().createResourceSet(modelURI); final String fileExtension = modelURI.fileExtension(); // indicates which melange query should be added to the xml uri handler // for a given extension - final XMLURIHandler handler = new XMLURIHandler(modelURI.query(), fileExtension); // use - // to - // resolve - // cross - // ref - // URI during XMI parsing - // final XtextPlatformResourceURIHandler handler = new - // XtextPlatformResourceURIHandler(); + // use to resolve cross ref URI during XMI parsing + final XMLURIHandler handler = new XMLURIHandler(modelURI.query(), fileExtension); handler.setResourceSet(rs); rs.getLoadOptions().put(XMLResource.OPTION_URI_HANDLER, handler); final MelangeURIConverter converter = new MelangeURIConverter(nsURIMapping); - // final ExtensibleURIConverterImpl converter = new - // ExtensibleURIConverterImpl(); rs.setURIConverter(converter); // fix sirius to prevent non intentional model savings converter.getURIHandlers().add(0, new DebugURIHandler(converter.getURIHandlers())); @@ -366,7 +391,7 @@ private ResourceSet createAndConfigureResourceSet(URI modelURI, HashMap getnsURIMapping(IExecutionContext context) { + protected static HashMap getnsURIMapping(IExecutionContext context) { HashMap nsURIMapping = new HashMap(); final String langQuery = "lang="; @@ -398,11 +423,10 @@ class MelangeURIConverter extends ExtensibleURIConverterImpl { private HashMap _nsURIMapping; - public MelangeURIConverter(HashMap nsURIMapping) { + MelangeURIConverter(HashMap nsURIMapping) { _nsURIMapping = nsURIMapping; } - @SuppressWarnings("resource") @Override public InputStream createInputStream(URI uri, Map options) throws IOException { InputStream result = null; @@ -457,7 +481,7 @@ class XMLURIHandler extends XtextPlatformResourceURIHandler { private String _queryParameters; private String _fileExtension; - public XMLURIHandler(String queryParameters, String fileExtension) { + XMLURIHandler(String queryParameters, String fileExtension) { _queryParameters = queryParameters; if (_queryParameters == null) _queryParameters = ""; From 18dccd0b9e7ecfc672397eb890ee72b7712a6371 Mon Sep 17 00:00:00 2001 From: d-leroy Date: Wed, 29 Mar 2017 10:30:30 +0200 Subject: [PATCH 116/267] Fixed breakpoint creation when using melange resource --- .../META-INF/MANIFEST.MF | 3 ++- .../sirius/action/GemocToggleBreakpointAction.java | 12 ++++++++++++ .../ui/commands/GemocToggleBreakpointHandler.java | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF index d48351f07..b3fef9341 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF @@ -21,7 +21,8 @@ Require-Bundle: org.gemoc.xdsmlframework.api, fr.inria.diverse.commons.eclipse.messagingsystem.api, fr.obeo.dsl.debug.ide.ui;bundle-version="1.0.0", fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", - fr.obeo.dsl.debug + fr.obeo.dsl.debug, + fr.inria.diverse.melange Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.gemoc.executionframework.engine.ui; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java index 37c157ad7..e227ecabe 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java @@ -12,9 +12,12 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint; import org.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher; +import fr.inria.diverse.melange.resource.MelangeResource; import fr.obeo.dsl.debug.ide.DSLBreakpoint; import fr.obeo.dsl.debug.ide.sirius.ui.DSLToggleBreakpointsUtils; import fr.obeo.dsl.debug.ide.sirius.ui.action.AbstractToggleBreakpointAction; @@ -38,6 +41,15 @@ protected DSLToggleBreakpointsUtils createToggleBreakpointsUtils() { @Override protected DSLBreakpoint createBreakpoint(Object selected, EObject instruction) throws CoreException { + final Resource res = ((EObject)instruction).eResource(); + final ResourceSet resSet = res.getResourceSet(); + final MelangeResource mr = resSet.getResources().stream().filter(r -> { + return r instanceof MelangeResource; + }).map(r -> (MelangeResource)r).findFirst().orElse(null); + if (mr != null) { + final String fragmentURI = res.getURIFragment(instruction); + instruction = mr.getWrappedResource().getEObject(fragmentURI); + } return new GemocBreakpoint(identifier, instruction, true); } diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java index ab3da326e..8af1bc3e7 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java @@ -17,6 +17,8 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.ISelectionService; @@ -25,6 +27,7 @@ import org.gemoc.execution.sequential.javaengine.ui.launcher.Launcher; import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint; +import fr.inria.diverse.melange.resource.MelangeResource; import fr.inria.diverse.trace.commons.model.trace.MSE; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.obeo.dsl.debug.ide.DSLBreakpoint; @@ -66,6 +69,15 @@ else if (selected instanceof MSEOccurrence) @Override protected DSLBreakpoint createBreakpoint(Object selected, EObject instruction) throws CoreException { + final Resource res = ((EObject)instruction).eResource(); + final ResourceSet resSet = res.getResourceSet(); + final MelangeResource mr = resSet.getResources().stream().filter(r -> { + return r instanceof MelangeResource; + }).map(r -> (MelangeResource)r).findFirst().orElse(null); + if (mr != null) { + final String fragmentURI = res.getURIFragment(instruction); + instruction = mr.getWrappedResource().getEObject(fragmentURI); + } return new GemocBreakpoint(identifier, instruction, true); } From a5f8d37e6141fa0ff5c9b9387fe8c6a88f05dca0 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 30 Mar 2017 11:37:55 +0200 Subject: [PATCH 117/267] Small change engine started message --- .../ui/launcher/AbstractSequentialGemocLauncher.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java index 52076a392..45d4d1cd3 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java @@ -56,6 +56,8 @@ abstract public class AbstractSequentialGemocLauncher extends AbstractGemocLaunc protected IProgressMonitor launchProgressMonitor = null; + protected final static String executionStartedMessage = "Execution started successfully."; + protected abstract IExecutionEngine createExecutionEngine(RunConfiguration runConfiguration, ExecutionMode executionMode) throws CoreException, EngineContextException; @@ -118,7 +120,7 @@ protected IStatus run(IProgressMonitor monitor) { _executionEngine.getExecutionContext().getExecutionPlatform().addEngineAddon(animator); try { AbstractSequentialGemocLauncher.super.launch(configuration, mode, launch, monitor); - return new Status(IStatus.OK, getPluginID(), "Execution was launched successfully."); + return new Status(IStatus.OK, getPluginID(), executionStartedMessage); } catch (CoreException e) { e.printStackTrace(); return new Status(IStatus.ERROR, getPluginID(), "Could not start execution engine."); @@ -129,8 +131,8 @@ protected IStatus run(IProgressMonitor monitor) { // from the current job else { _executionEngine.start(); - debug("Execution finished."); - return new Status(IStatus.OK, getPluginID(), "Execution finished."); + debug(executionStartedMessage); + return new Status(IStatus.OK, getPluginID(), executionStartedMessage); } } }; From b7d1008f9a582188ef5ba9464983f03e7761c685 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 31 Mar 2017 10:43:32 +0200 Subject: [PATCH 118/267] BatchModelChangeListener: fix bug resource notifs duplicates + format --- .../BatchModelChangeListener.xtend | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend index 3f4aee2ae..24657f6ec 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend @@ -57,9 +57,9 @@ public class BatchModelChangeListener { } } }; - + observedResources = resources - + observedResources.forEach [ r | if (r != null) { r.eAdapters().add(adapter); @@ -100,13 +100,13 @@ public class BatchModelChangeListener { objectsNotifications.put(feature, new ArrayList) } val List fieldNotifications = objectsNotifications.get(feature); - fieldNotifications.add(notification); + fieldNotifications.addUnique(notification); } else if (notification.getNotifier() instanceof Resource) { val Resource resource = notification.notifier as Resource if (!resourcesNotifications.containsKey(resource)) resourcesNotifications.put(resource, new ArrayList) val resourceNotifications = resourcesNotifications.get(resource) - resourceNotifications.add(notification) + resourceNotifications.addUnique(notification) } } } @@ -118,8 +118,7 @@ public class BatchModelChangeListener { for (resource : resourcesNotifications.keySet) { val resourceNotifications = resourcesNotifications.get(resource) for (Notification notif : resourceNotifications) { - BatchModelChangeListener. - manageCollectionContainmentNotification(removedObjects, newObjects, notif) + BatchModelChangeListener.manageCollectionContainmentNotification(removedObjects, newObjects, notif) } } @@ -203,7 +202,7 @@ public class BatchModelChangeListener { } return res; } - + def void removeObserver(Object observer) { changes.remove(observer) registeredObservers.remove(observer) @@ -244,10 +243,16 @@ public class BatchModelChangeListener { addToNewObjects(removedObjects, newObjects, remove) } } - + public def void cleanUp() { for (r : observedResources.filter[r|r != null]) { r.eAdapters().remove(adapter); } } + + private static def addUnique(List list, T o) { + if (!list.contains(o)) { + list.add(o); + } + } } From 7d1223a78ebb3b48baacef12d369a2c367e3a9f2 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 31 Mar 2017 10:43:57 +0200 Subject: [PATCH 119/267] Use DynamicAnnotationHelper in GenericTraceConstructor --- .../META-INF/MANIFEST.MF | 3 ++- .../traceaddon/GenericTraceConstructor.java | 26 +++++-------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF index 176b5fcc4..2d07566aa 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF @@ -14,7 +14,8 @@ Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", org.eclipse.xtext, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", org.gemoc.commons.eclipse;bundle-version="0.1.0", - org.eclipse.emf.compare + org.eclipse.emf.compare, + org.gemoc.xdsmlframework.commons Export-Package: fr.inria.diverse.trace.gemoc.traceaddon Bundle-ActivationPolicy: lazy diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index e22256658..f25284b4a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -23,7 +23,6 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; -import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; @@ -34,6 +33,7 @@ import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange; import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.RemovedObjectModelChange; +import org.gemoc.xdsmlframework.commons.DynamicAnnotationHelper; import fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue; import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; @@ -79,27 +79,13 @@ private Set getAllExecutedModelResources() { allResources.removeIf(r -> r == null); return allResources; } - - public static final String DYNAMIC_ANNOTATION_URI = "aspect"; - - private static boolean isDynamic(EModelElement o) { - return o.getEAnnotations().stream().anyMatch(a -> a.getSource().equals(DYNAMIC_ANNOTATION_URI)); - } - public static boolean isDynamic(EClass c) { - return isDynamic((EModelElement)c); - } - - public static boolean isDynamic(EStructuralFeature p) { - return isDynamic((EModelElement) p) || isDynamic(p.getEContainingClass()); - } - private boolean addNewObjectToStateIfDynamic(EObject object, GenericState state) { final EClass c = object.eClass(); final List mutableProperties = c.getEAllStructuralFeatures().stream() - .filter(p -> isDynamic(p)) + .filter(p -> DynamicAnnotationHelper.isDynamic(p)) .collect(Collectors.toList()); - if (isDynamic(object.eClass()) || !mutableProperties.isEmpty()) { + if (DynamicAnnotationHelper.isDynamic(object.eClass()) || !mutableProperties.isEmpty()) { return addNewObjectToState(object, mutableProperties, lastState); } return true; @@ -128,7 +114,7 @@ private GenericValue getGenericValue(EObject object, EStructuralFeature mutableP final List modelElements = (List) object.eGet(mutableProperty); final ManyReferenceValue value = GenerictraceFactory.eINSTANCE.createManyReferenceValue(); for (EObject o : modelElements) { - if (isDynamic(o.eClass())) { + if (DynamicAnnotationHelper.isDynamic(o.eClass())) { value.getReferenceValues().add(exeToTraced.get(o)); } else { value.getReferenceValues().add(o); @@ -138,7 +124,7 @@ private GenericValue getGenericValue(EObject object, EStructuralFeature mutableP } else { final EObject o = (EObject) object.eGet(mutableProperty); final SingleReferenceValue value = GenerictraceFactory.eINSTANCE.createSingleReferenceValue(); - if (isDynamic(o.eClass())) { + if (DynamicAnnotationHelper.isDynamic(o.eClass())) { value.setReferenceValue(exeToTraced.get(o)); } else { value.setReferenceValue(o); @@ -154,7 +140,7 @@ private boolean addNewObjectToState(EObject object, List mut boolean added = false; if (!exeToTraced.containsKey(object)) { final GenericTracedObject tracedObject = GenerictraceFactory.eINSTANCE.createGenericTracedObject(); - if (!isDynamic(object.eClass())) { + if (!DynamicAnnotationHelper.isDynamic(object.eClass())) { tracedObject.setOriginalObject(object); } exeToTraced.put(object, tracedObject); From 2f66b52a26ef7e6673d2631eb250a688748b7a8d Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 31 Mar 2017 10:44:18 +0200 Subject: [PATCH 120/267] DynamicAnnotationHelper: add new method to create a dynamic annotation --- .../commons/DynamicAnnotationHelper.xtend | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/src/org/gemoc/xdsmlframework/commons/DynamicAnnotationHelper.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/src/org/gemoc/xdsmlframework/commons/DynamicAnnotationHelper.xtend index 8b30a10b4..e075117fe 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/src/org/gemoc/xdsmlframework/commons/DynamicAnnotationHelper.xtend +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/src/org/gemoc/xdsmlframework/commons/DynamicAnnotationHelper.xtend @@ -3,6 +3,8 @@ package org.gemoc.xdsmlframework.commons import org.eclipse.emf.ecore.EModelElement import org.eclipse.emf.ecore.EStructuralFeature import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EAnnotation +import org.eclipse.emf.ecore.EcoreFactory class DynamicAnnotationHelper { public static val DYNAMIC_ANNOTATION_URI = "aspect" @@ -18,4 +20,10 @@ class DynamicAnnotationHelper { public static def boolean isDynamic(EStructuralFeature p) { return isDynamic(p as EModelElement) || isDynamic(p.EContainingClass) } -} \ No newline at end of file + + public static def EAnnotation createDynamicAnnotation() { + val EAnnotation dynamicAnnotation = EcoreFactory.eINSTANCE.createEAnnotation(); + dynamicAnnotation.setSource(DYNAMIC_ANNOTATION_URI); + return dynamicAnnotation; + } +} From a796a4af3436e099e9d103ad877d60ee6d4df5ee Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Mon, 3 Apr 2017 10:45:02 +0200 Subject: [PATCH 121/267] Add new projects to generate abstract OS view --- .../.classpath | 8 + .../.project | 34 + .../.settings/org.eclipse.jdt.core.prefs | 7 + .../META-INF/MANIFEST.MF | 19 + .../build.properties | 4 + .../gen/k3/K3DynamicElementsFinder.xtend | 77 +++ .../K3OperationalSemanticsViewGenerator.xtend | 63 ++ .../gen/k3/K3StepExtractor.xtend | 495 ++++++++++++++ .../.classpath | 8 + .../.project | 34 + .../.settings/org.eclipse.jdt.core.prefs | 7 + .../META-INF/MANIFEST.MF | 11 + .../build.properties | 4 + .../.classpath | 8 + .../.project | 34 + .../.settings/org.eclipse.jdt.core.prefs | 7 + .../META-INF/MANIFEST.MF | 15 + .../build.properties | 5 + .../plugin.xml | 6 + .../fr.inria.diverse.opsemanticsview.gen.exsd | 102 +++ .../OperationalSemanticsViewGenerator.xtend | 13 + .../.classpath | 7 + .../.project | 28 + .../META-INF/MANIFEST.MF | 15 + .../build.properties | 10 + .../model/opsemanticsview.ecore | 36 + .../model/opsemanticsview.genmodel | 30 + .../plugin.properties | 4 + .../plugin.xml | 17 + .../opsemanticsview/ExecutionToASEntry.java | 78 +++ .../OperationalSemanticsView.java | 95 +++ .../OpsemanticsviewFactory.java | 60 ++ .../OpsemanticsviewPackage.java | 621 ++++++++++++++++++ .../src/opsemanticsview/Rule.java | 227 +++++++ .../impl/ExecutionToASEntryImpl.java | 216 ++++++ .../impl/OperationalSemanticsViewImpl.java | 259 ++++++++ .../impl/OpsemanticsviewFactoryImpl.java | 117 ++++ .../impl/OpsemanticsviewPackageImpl.java | 363 ++++++++++ .../src/opsemanticsview/impl/RuleImpl.java | 594 +++++++++++++++++ .../util/OpsemanticsviewAdapterFactory.java | 156 +++++ .../util/OpsemanticsviewSwitch.java | 152 +++++ 41 files changed, 4046 insertions(+) create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.classpath create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.project create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.settings/org.eclipse.jdt.core.prefs create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.classpath create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.project create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.settings/org.eclipse.jdt.core.prefs create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.classpath create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.project create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.settings/org.eclipse.jdt.core.prefs create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/build.properties create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/plugin.xml create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/schema/fr.inria.diverse.opsemanticsview.gen.exsd create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.classpath create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.project create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/build.properties create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.ecore create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.genmodel create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.properties create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.xml create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/ExecutionToASEntry.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewFactory.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/Rule.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/ExecutionToASEntryImpl.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewFactoryImpl.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/RuleImpl.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewAdapterFactory.java create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewSwitch.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.classpath b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.classpath new file mode 100644 index 000000000..428337e56 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.project b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.project new file mode 100644 index 000000000..e4f0b0cdf --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.project @@ -0,0 +1,34 @@ + + + fr.inria.diverse.opsemanticsview.gen.k3 + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.settings/org.eclipse.jdt.core.prefs b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF new file mode 100644 index 000000000..5dc428763 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: K3 +Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen.k3 +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: fr.inria.diverse.opsemanticsview.gen;bundle-version="1.0.0", + fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", + fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", + org.eclipse.jdt.core, + org.eclipse.core.runtime, + org.eclipse.jdt.ui, + fr.inria.diverse.commons.eclipse.pde, + com.google.guava, + org.eclipse.xtext.xbase.lib, + org.eclipse.xtend.lib, + org.eclipse.xtend.lib.macro, + org.eclipse.core.resources;bundle-version="3.11.1", + org.gemoc.xdsmlframework.commons;bundle-version="2.3.0" diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend new file mode 100644 index 000000000..eccf509ab --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend @@ -0,0 +1,77 @@ +package fr.inria.diverse.opsemanticsview.gen.k3 + +import opsemanticsview.OperationalSemanticsView +import opsemanticsview.OpsemanticsviewFactory +import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EPackage +import org.eclipse.xtend.lib.annotations.Accessors +import org.gemoc.xdsmlframework.commons.DynamicAnnotationHelper + +class K3DynamicElementsFinder { + + // Input + private val EPackage abstractSyntax + private val EPackage executionMetamodel + + // In-out + @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + private var OperationalSemanticsView view + + new(EPackage abstractSyntax, EPackage executionMetamodel, OperationalSemanticsView view) { + this.abstractSyntax = abstractSyntax + this.executionMetamodel = executionMetamodel + this.view = view + } + + def void find() { + findDynamicParts + if (abstractSyntax != null) + findMappingAsToExe + } + + private def void findDynamicParts() { + + for (c : executionMetamodel.eAllContents.filter(EClass).toSet) { + + // Either partially mutable or not mutable at all + if (!DynamicAnnotationHelper.isDynamic(c)) { + + val mutableProperties = c.EStructuralFeatures.filter[p|DynamicAnnotationHelper.isDynamic(p)] + if (mutableProperties != null && !mutableProperties.empty) { + for (p : mutableProperties) { + view.dynamicProperties.add(p) + } + } + } // Or completely mutable + else { + view.dynamicClasses.add(c) + for (p : c.EStructuralFeatures) { + view.dynamicProperties.add(p) + } + + } + } + + } + + private def void findMappingAsToExe() { + explorePackageRecursively(abstractSyntax, executionMetamodel) + } + + private def void explorePackageRecursively(EPackage asPackage, EPackage exePackage) { + for (asClass : asPackage.EClassifiers.filter(EClass)) { + val exeClass = exePackage.EClassifiers.filter(EClass).findFirst[exeC|asClass.name.equals(exeC.name)] + val mappingEntry = OpsemanticsviewFactory.eINSTANCE.createExecutionToASEntry => [ + ASclass = asClass + executionClass = exeClass + ] + view.executionToASmapping.add(mappingEntry) + } + + for (asSubPackage : asPackage.ESubpackages) { + val exeSubPackage = asPackage.ESubpackages.findFirst[p|p.name.equals(asSubPackage.name)] + explorePackageRecursively(asSubPackage, exeSubPackage) + } + } + +} diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend new file mode 100644 index 000000000..996654727 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend @@ -0,0 +1,63 @@ +package fr.inria.diverse.opsemanticsview.gen.k3 + +import fr.inria.diverse.opsemanticsview.gen.OperationalSemanticsViewGenerator +import fr.inria.diverse.melange.metamodel.melange.Language +import java.util.Set +import org.eclipse.jdt.core.IType +import org.eclipse.jdt.core.IJavaProject +import org.eclipse.jdt.core.JavaCore +import org.eclipse.core.resources.IProject +import opsemanticsview.OpsemanticsviewFactory +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.EPackage +import fr.inria.diverse.melange.metamodel.melange.Inheritance + +/** + * TODO: find which is the extended class! + */ +class K3OperationalSemanticsViewGenerator implements OperationalSemanticsViewGenerator { + + override generate(Language language, IProject melangeProject) { + val aspectClasses = findAspects(language, melangeProject) + + val result = OpsemanticsviewFactory.eINSTANCE.createOperationalSemanticsView + + val selectedLanguage = language.name + val rs = new ResourceSetImpl + val executionMetamodelResource = rs.getResource(URI.createURI(language.syntax.ecoreUri), true) + val executionMetamodel = executionMetamodelResource.contents.filter(EPackage).head + + + val inheritance = language.operators.findFirst[o|o instanceof Inheritance] + val abstractSyntax = if (inheritance != null) { + val asURI = URI.createURI(inheritance.owningLanguage.syntax.ecoreUri) + val asResource = rs.getResource(asURI,true) + asResource.contents.filter(EPackage).head + } else { + null + } + + val K3DynamicElementsFinder dynFinder = new K3DynamicElementsFinder(abstractSyntax, executionMetamodel, result); + dynFinder.find(); + + + val K3StepExtractor eventsgen = new K3StepExtractor(aspectClasses, selectedLanguage, executionMetamodel, result); + eventsgen.generate(); + + return result + } + + private static def Set findAspects(Language language, IProject melangeProject) { + val aspectNames = language.semantics.map[aspectTypeRef.type.qualifiedName].toList + val IJavaProject javaProject = JavaCore.create(melangeProject); + val aspectClasses = aspectNames.map[it|javaProject.findType(it)].toSet + return aspectClasses + + } + + override canHandle(Language language, IProject melangeProject) { + !language.semantics.empty + } + +} diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend new file mode 100644 index 000000000..96fb645d0 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend @@ -0,0 +1,495 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package fr.inria.diverse.opsemanticsview.gen.k3 + +import fr.inria.diverse.commons.eclipse.callgraph.CallHierarchyHelper +import java.util.ArrayList +import java.util.HashMap +import java.util.HashSet +import java.util.List +import java.util.Map +import java.util.Set +import opsemanticsview.OperationalSemanticsView +import opsemanticsview.OpsemanticsviewFactory +import opsemanticsview.Rule +import org.eclipse.core.runtime.NullProgressMonitor +import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EOperation +import org.eclipse.emf.ecore.EPackage +import org.eclipse.emf.ecore.EcoreFactory +import org.eclipse.jdt.core.IAnnotation +import org.eclipse.jdt.core.IMethod +import org.eclipse.jdt.core.IType + +class K3StepExtractor { + + // Input + private val Set allClasses + private val EPackage extendedMetamodel + + // Input / Output + private val OperationalSemanticsView ecoreExtension + + // Transient + private val Map stepAspectsClassToAspectedClasses = new HashMap + private val Set allMethods = new HashSet + private val Set allk3Methods = new HashSet + private val Set allSuperMethods = new HashSet + private val Set stepFunctions = new HashSet + private val Set eventFunctions = new HashSet + private val Map functionToRule = new HashMap + private val Set inspectedClasses = new HashSet + + private val Map methodToK3Method = new HashMap + private val Map k3MethodToMethod = new HashMap + private val Map superMethodTok3Method = new HashMap + private val Map> k3MethodToCalledMethods = new HashMap + private val Map> methodToOverridingMethods = new HashMap + private val Map> callGraph = new HashMap + private val Map> classToSubClasses = new HashMap + private val Map> classToSuperClasses = new HashMap + + new(Set aspects, String languageName, EPackage extendedMetamodel, + OperationalSemanticsView inConstructionOperationalSemanticsView) { + this.allClasses = aspects + this.extendedMetamodel = extendedMetamodel + this.ecoreExtension = inConstructionOperationalSemanticsView + } + + public def void generate() { + generateStepFromXtend(allClasses) + } + + private def Rule getRuleOfFunction(IMethod function) { + if (functionToRule.containsKey(function)) + return functionToRule.get(function) + else { + val Rule rule = OpsemanticsviewFactory.eINSTANCE.createRule; + this.ecoreExtension.rules.add(rule) + + // We find the ecore class matching the aspected java class + val containingClass = function.declaringType + rule.containingClass = stepAspectsClassToAspectedClasses.get(containingClass) + + var EOperation candidate = null + if (rule.containingClass != null) { + candidate = rule.containingClass.EAllOperations.findFirst [ o | + o.name.equals(function.elementName) + ] + + } + if (candidate != null) { + rule.operation = candidate + } else { + rule.operation = xtendFunctionToEOperation(function) + } + + rule.stepRule = stepFunctions.contains(function) + rule.main = isMain(function) + functionToRule.put(function, rule) + return rule + } + } + + private def void inspectForBigStep(IMethod function) { + + // We consider that each Kermeta function is a transformation rule (even through we cannot know if it modifies anything) + val Rule rule = getRuleOfFunction(function) + + // We retrieve which functions are called by the function + val calledFunctions = callGraph.get(function) + if (calledFunctions != null) { + for (calledFunction : calledFunctions) { + if (calledFunction !== null) { + val Rule calledRule = getRuleOfFunction(calledFunction) + rule.calledRules.add(calledRule) + } + } + } + + // Finally we look if this function was overriden/implemented by subtypes + // TODO use annotation? + val subtypes = classToSubClasses.get(function.declaringType) + if (subtypes != null) { + for (t : subtypes) { + for (f : t.methods) { + if (f.elementName.equals(function.elementName)) { + val Rule overridingRule = getRuleOfFunction(f) + rule.overridenBy.add(overridingRule) + } + } + } + } + } + + private def EOperation xtendFunctionToEOperation(IMethod function) { + val result = EcoreFactory.eINSTANCE.createEOperation + result.name = function.elementName + // TODO finish the translation and/or ask Thomas + // TODO or consider it is already in the ecore? + return result + } + + private def void inspectClass(IType type) { + if (!inspectedClasses.contains(type)) { + // Gather all the actual bodies of the methods (_privk3_ methods) + val typeK3Methods = type.methods.filter[elementName.startsWith("_privk3_")] + allk3Methods.addAll(typeK3Methods) + + // Gather the methods calling those k3 methods + val typeMethods = type.methods.filter [m| + typeK3Methods.exists [ c | + c.elementName.substring(8).equals(m.elementName) + ] + ] + allMethods.addAll(typeMethods) + + typeMethods.forEach [ m | + val k3m = typeK3Methods.findFirst[c|c.elementName.substring(8).equals(m.elementName)] + k3MethodToMethod.put(k3m, m) + methodToK3Method.put(m, k3m) + ] + + val Set candidateSupers = new HashSet + candidateSupers.addAll(type.methods.filter[elementName.startsWith("super_")]) + + // Gather all k3 generated super methods + allSuperMethods.addAll(candidateSupers.filter [c| + type.methods.exists [ m | + c.elementName.substring(6).equals(m.elementName) + ] + ]) + + // For each aspect annotation of the class + for (a : getAspectAnnotations(type)) { + + // We find the JVM aspected class + val aspectedEClass = getAspectized(a) + + // We store the aspect class and the aspected class + stepAspectsClassToAspectedClasses.put(type, aspectedEClass) + + // We store all the functions with @Step + stepFunctions.addAll(type.methods.filter[isStep]) + + // And we store all the functions with @EventProcessor + eventFunctions.addAll(type.methods.filter[isEvent]) + } + inspectedClasses.add(type) + } + } + + private def void gatherCallsFromK3(IMethod function) { + val callingSites = CallHierarchyHelper.getCallLocationsOf(function) + callingSites.forEach [ cl | + val f = function + val member = cl.member + val method = getContainingAspectMethod(member as IMethod) + allk3Methods// Filter out non-k3 methods + .filter[m|m == method]// And add 'function' to the called methods of each calling k3 method + .forEach [ m | + var calledMethods = k3MethodToCalledMethods.get(m) + if (calledMethods == null) { + calledMethods = new HashSet + k3MethodToCalledMethods.put(m, calledMethods) + } + calledMethods.add(f) + ] + ] + } + + private def void gatherCallsFromSuper(IMethod function) { + val callingSites = CallHierarchyHelper.getCallLocationsOf(function) + callingSites.forEach [ cl | + allSuperMethods// TODO unfold lambdas + // Filter out non-super methods + .filter[m|m == cl.member]// And set 'function' to be the called method of each calling super method + .forEach[m|superMethodTok3Method.put(m, function)] + ] + } + + private def void gatherOverridenMethods(IMethod method) { + if (method.override) { + val methodName = method.elementName + val declaringType = method.declaringType + val superClasses = classToSuperClasses.get(declaringType) + if (superClasses != null) { + superClasses.forEach [ c | + val overridenMethod = c.methods.findFirst[m|m.elementName.equals(methodName)] + if (overridenMethod != null) { + var overridingMethods = methodToOverridingMethods.get(overridenMethod) + if (overridingMethods == null) { + overridingMethods = new HashSet + methodToOverridingMethods.put(overridenMethod, overridingMethods) + } + overridingMethods.add(method) + } + ] + } + } + } + + private def generateStepFromXtend(Set files) { + // First we store the class hierarchy of each class. + allClasses.forEach [ c | + val allSuperClasses = c.allSuperClasses.filter[t|allClasses.contains(t)].toSet + classToSuperClasses.put(c, allSuperClasses) + val allSubClasses = c.allSubClasses.filter[t|allClasses.contains(t)].toSet + classToSubClasses.put(c, allSubClasses) + ] + + // Then we look for functions, step aspects and step functions + for (c : allClasses) { + inspectClass(c) + } + + allk3Methods.forEach[gatherCallsFromSuper] + allMethods.forEach[gatherOverridenMethods] + allMethods.forEach[gatherCallsFromK3] + allSuperMethods.forEach[gatherCallsFromK3] + + // We establish the base callgraph. + allMethods.forEach [ m | + val k3m = methodToK3Method.get(m) + if (k3m != null) { + val calledMethods = k3MethodToCalledMethods.get(k3m) + if (calledMethods != null) { + calledMethods.forEach [ c | + if (allMethods.contains(c)) { + var tmp = callGraph.get(m) + if (tmp == null) { + tmp = new HashSet + callGraph.put(m, tmp) + } + tmp.add(c) + } + ] + } + } + ] + + val callGraphTotalLengthComputer = [|callGraph.values.map[s|s.size].reduce[i1, i2|i1 + i2]] + + // For each method, we add to its called methods the methods that can be called + // from each of its overriding methods. + var totalLength = callGraphTotalLengthComputer.apply() + var previousTotalLength = -1 + while (totalLength > previousTotalLength) { + allMethods.forEach [ m | + val calledMethods = if (callGraph.get(m) == null) { + val tmp = new HashSet + callGraph.put(m, tmp) + tmp + } else { + callGraph.get(m) + } + val overridingMethods = methodToOverridingMethods.get(m) + if (overridingMethods != null) { + overridingMethods.forEach [ n | + val calledByOverride = callGraph.get(n) + if (calledByOverride != null) { + calledMethods.addAll(calledByOverride) + } + ] + } + ] + previousTotalLength = totalLength + totalLength = callGraphTotalLengthComputer.apply() + } + + // For each method, we add to their called methods the methods overriding + // those called methods. + totalLength = callGraphTotalLengthComputer.apply() + previousTotalLength = -1 + while (totalLength > previousTotalLength) { + allMethods.forEach [ m | + val calledMethods = callGraph.get(m) + if (calledMethods != null) { + val tmp = new HashSet + calledMethods.forEach [ n | + val overridingMethods = methodToOverridingMethods.get(n) + if (overridingMethods != null) { + tmp.addAll(overridingMethods) + } + ] + calledMethods.addAll(tmp) + } + ] + previousTotalLength = totalLength + totalLength = callGraphTotalLengthComputer.apply() + } + + allMethods.forEach [ m | + var calledMethods = callGraph.get(m) + if (calledMethods == null) { + calledMethods = new HashSet + callGraph.put(m, calledMethods) + } + calledMethods.addAll(eventFunctions) + ] + + // We then add in the support for calls to super methods. + allMethods.forEach [ m | + val k3m = methodToK3Method.get(m) + if (k3m != null) { + val calledMethods = k3MethodToCalledMethods.get(k3m) + if (calledMethods != null) { + calledMethods.forEach [ c | + if (allSuperMethods.contains(c)) { + val actualk3Method = superMethodTok3Method.get(c) + if (actualk3Method != null) { + val actualMethod = k3MethodToMethod.get(actualk3Method) + if (actualMethod != null && allMethods.contains(actualMethod)) { + var tmp = callGraph.get(m) + if (tmp == null) { + tmp = new HashSet + callGraph.put(m, tmp) + } + tmp.add(actualMethod) + } + } + } + ] + } + } + ] + + println("Callgraph : \n\n") + callGraph.forEach [ m, s | + println(m.declaringType.elementName + "." + m.elementName + " : \n" + s.map [ n | + n.declaringType.elementName + "." + n.elementName + ].reduce[s1, s2|s1 + ", " + s2] + "\n") + ] + + // Next we create the Rule objects with all that + for (function : allMethods) { + inspectForBigStep(function) + } + } + + /** + * Find annotations "@Aspect" + */ + private def List getAspectAnnotations(IType type) { + // TODO compare with: fr.inria.diverse.k3.al.annotationprocessor.Aspect + if (type.isClass) { + return type.annotations.filter [ annot | + val name = annot.elementName // may be qualified + val lastDotIndex = name.lastIndexOf('.') + var simpleName = name + if (lastDotIndex !== -1) { + simpleName = name.substring(lastDotIndex + 1) + } + simpleName.equals("Aspect") + ].toList + } + return new ArrayList() + } + + private def boolean testAnnotation(IMethod method, String annotationSimpleName) { + // TODO compare with: fr.inria.diverse.k3.al.annotationprocessor.XXX + return method.annotations.exists [ annot | + val name = annot.elementName // may be qualified + val lastDotIndex = name.lastIndexOf('.') + var simpleName = name + if (lastDotIndex !== -1) { + simpleName = name.substring(lastDotIndex + 1) + } + return simpleName.equals(annotationSimpleName) + ] + } + + /** + * Return true if 'method' is tagged with "@Step" + */ + private def boolean isStep(IMethod method) { + testAnnotation(method, "Step") + } + + /** + * Return true if 'method' is tagged with "@EventProcessor" + */ + private def boolean isEvent(IMethod method) { + val annotation = method.annotations.findFirst [ a | + val name = a.elementName + val lastDotIndex = name.lastIndexOf('.') + var simpleName = name + if (lastDotIndex !== -1) { + simpleName = name.substring(lastDotIndex + 1) + } + return simpleName == "Step" + ] + annotation != null && annotation.memberValuePairs.exists [ p | + p.memberName == "eventTriggerable" && p.value instanceof Boolean && p.value as Boolean + ] + } + + /** + * Return true if 'method' is tagged with "@OverrideAspectMethod" + */ + private def boolean isOverride(IMethod method) { + testAnnotation(method, "OverrideAspectMethod") + } + + /** + * Return true if 'method' is tagged with "@Main" + */ + private def boolean isMain(IMethod method) { + testAnnotation(method, "Main") + } + + /** + * Return all sub types + */ + private def Set getAllSubClasses(IType type) { + val hierarchy = type.newTypeHierarchy(new NullProgressMonitor) + return hierarchy.getAllSubtypes(type).toSet + } + + /** + * Return all super types + */ + private def Set getAllSuperClasses(IType type) { + val hierarchy = type.newTypeHierarchy(new NullProgressMonitor) + return hierarchy.getAllSuperclasses(type).toSet + } + + private def EClass getAspectized(IAnnotation annot) { + val aspectedClassName = annot.memberValuePairs.findFirst[p|p.memberName == "className"].value as String + return extendedMetamodel.eAllContents.filter(EClass).findFirst[c1|aspectedClassName.equals(c1.name)] + } + + /** + * Return the top level method in a type tagged @aspect + * that contains 'function'
+ *
+ * Return 'function' if it is already a top level method.
+ *
+ * Return null if not inside a type with @aspect + */ + private def IMethod getContainingAspectMethod(IMethod function) { + val container = function.declaringType + if (allClasses.contains(container)) { + return function + } + + // function can be in annonymous/inner classes (e.g in lamba) + var parent = function.parent + while (parent !== null) { + if (parent instanceof IMethod) { + return getContainingAspectMethod(parent) + } + parent = parent.parent + } + + return null + } +} diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.classpath b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.classpath new file mode 100644 index 000000000..428337e56 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.project b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.project new file mode 100644 index 000000000..e6d5ffcbb --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.project @@ -0,0 +1,34 @@ + + + fr.inria.diverse.opsemanticsview.gen.xmof + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.settings/org.eclipse.jdt.core.prefs b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF new file mode 100644 index 000000000..7025f65b8 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Xmof +Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen.xmof +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: com.google.guava, + org.eclipse.xtext.xbase.lib, + org.eclipse.xtend.lib, + org.eclipse.xtend.lib.macro + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.classpath b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.classpath new file mode 100644 index 000000000..428337e56 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.project b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.project new file mode 100644 index 000000000..da25b1615 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.project @@ -0,0 +1,34 @@ + + + fr.inria.diverse.opsemanticsview.gen + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.settings/org.eclipse.jdt.core.prefs b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF new file mode 100644 index 000000000..9de5e3b41 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF @@ -0,0 +1,15 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Opsemanticsviewgen +Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: com.google.guava, + org.eclipse.xtext.xbase.lib, + org.eclipse.xtend.lib, + org.eclipse.xtend.lib.macro, + fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", + fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", + org.eclipse.core.resources;bundle-version="3.11.1" +Export-Package: fr.inria.diverse.opsemanticsview.gen + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/build.properties b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/build.properties new file mode 100644 index 000000000..e9863e281 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/plugin.xml b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/plugin.xml new file mode 100644 index 000000000..b842e39a4 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/plugin.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/schema/fr.inria.diverse.opsemanticsview.gen.exsd b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/schema/fr.inria.diverse.opsemanticsview.gen.exsd new file mode 100644 index 000000000..b353cf44e --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/schema/fr.inria.diverse.opsemanticsview.gen.exsd @@ -0,0 +1,102 @@ + + + + + + + + + [Enter description of this extension point.] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [Enter the first release in which this extension point appears.] + + + + + + + + + [Enter extension point usage example here.] + + + + + + + + + [Enter API information here.] + + + + + + + + + [Enter information about supplied implementation of this extension point.] + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend new file mode 100644 index 000000000..c84285586 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend @@ -0,0 +1,13 @@ +package fr.inria.diverse.opsemanticsview.gen + +import opsemanticsview.OperationalSemanticsView +import fr.inria.diverse.melange.metamodel.melange.Language +import org.eclipse.core.resources.IProject + +interface OperationalSemanticsViewGenerator { + + public def boolean canHandle(Language language, IProject melangeProject) + + public def OperationalSemanticsView generate(Language language, IProject melangeProject) + +} diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.classpath b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.classpath new file mode 100644 index 000000000..22f30643c --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.project b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.project new file mode 100644 index 000000000..d3e09505e --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.project @@ -0,0 +1,28 @@ + + + fr.inria.diverse.opsemanticsview.model + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF new file mode 100644 index 000000000..53b63d433 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF @@ -0,0 +1,15 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.model;singleton:=true +Bundle-Version: 0.1.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: opsemanticsview, + opsemanticsview.impl, + opsemanticsview.util +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.emf.ecore;visibility:=reexport +Bundle-ActivationPolicy: lazy diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/build.properties b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/build.properties new file mode 100644 index 000000000..4465407fc --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/build.properties @@ -0,0 +1,10 @@ +# + +bin.includes = .,\ + model/,\ + META-INF/,\ + plugin.xml,\ + plugin.properties +jars.compile.order = . +source.. = src/ +output.. = bin/ diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.ecore b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.ecore new file mode 100644 index 000000000..0dd025c63 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.ecore @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.genmodel b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.genmodel new file mode 100644 index 000000000..4860b5b3c --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.genmodel @@ -0,0 +1,30 @@ + + + opsemanticsview.ecore + + + + + + + + + + + + + + + + + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.properties b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.properties new file mode 100644 index 000000000..20802b838 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.properties @@ -0,0 +1,4 @@ +# + +pluginName = Operationalsemanticsview Model +providerName = www.example.org diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.xml b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.xml new file mode 100644 index 000000000..e702205fc --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/ExecutionToASEntry.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/ExecutionToASEntry.java new file mode 100644 index 000000000..e6adf311a --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/ExecutionToASEntry.java @@ -0,0 +1,78 @@ +/** + */ +package opsemanticsview; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Execution To AS Entry'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link opsemanticsview.ExecutionToASEntry#getExecutionClass Execution Class}
    • + *
  • {@link opsemanticsview.ExecutionToASEntry#getASclass ASclass}
    • + *
+ * + * @see opsemanticsview.OpsemanticsviewPackage#getExecutionToASEntry() + * @model + * @generated + */ +public interface ExecutionToASEntry extends EObject { + /** + * Returns the value of the 'Execution Class' reference. + * + *

+ * If the meaning of the 'Execution Class' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Execution Class' reference. + * @see #setExecutionClass(EClass) + * @see opsemanticsview.OpsemanticsviewPackage#getExecutionToASEntry_ExecutionClass() + * @model required="true" + * @generated + */ + EClass getExecutionClass(); + + /** + * Sets the value of the '{@link opsemanticsview.ExecutionToASEntry#getExecutionClass Execution Class}' reference. + * + * + * @param value the new value of the 'Execution Class' reference. + * @see #getExecutionClass() + * @generated + */ + void setExecutionClass(EClass value); + + /** + * Returns the value of the 'ASclass' reference. + * + *

+ * If the meaning of the 'ASclass' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'ASclass' reference. + * @see #setASclass(EClass) + * @see opsemanticsview.OpsemanticsviewPackage#getExecutionToASEntry_ASclass() + * @model required="true" + * @generated + */ + EClass getASclass(); + + /** + * Sets the value of the '{@link opsemanticsview.ExecutionToASEntry#getASclass ASclass}' reference. + * + * + * @param value the new value of the 'ASclass' reference. + * @see #getASclass() + * @generated + */ + void setASclass(EClass value); + +} // ExecutionToASEntry diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java new file mode 100644 index 000000000..73b6d3619 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java @@ -0,0 +1,95 @@ +/** + */ +package opsemanticsview; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; + +/** + * + * A representation of the model object 'Operational Semantics View'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link opsemanticsview.OperationalSemanticsView#getRules Rules}
    • + *
  • {@link opsemanticsview.OperationalSemanticsView#getDynamicProperties Dynamic Properties}
    • + *
  • {@link opsemanticsview.OperationalSemanticsView#getDynamicClasses Dynamic Classes}
    • + *
  • {@link opsemanticsview.OperationalSemanticsView#getExecutionToASmapping Execution To ASmapping}
    • + *
+ * + * @see opsemanticsview.OpsemanticsviewPackage#getOperationalSemanticsView() + * @model + * @generated + */ +public interface OperationalSemanticsView extends EObject { + /** + * Returns the value of the 'Rules' containment reference list. + * The list contents are of type {@link opsemanticsview.Rule}. + * + *

+ * If the meaning of the 'Rules' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Rules' containment reference list. + * @see opsemanticsview.OpsemanticsviewPackage#getOperationalSemanticsView_Rules() + * @model containment="true" + * @generated + */ + EList getRules(); + + /** + * Returns the value of the 'Dynamic Properties' reference list. + * The list contents are of type {@link org.eclipse.emf.ecore.EStructuralFeature}. + * + *

+ * If the meaning of the 'Dynamic Properties' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Dynamic Properties' reference list. + * @see opsemanticsview.OpsemanticsviewPackage#getOperationalSemanticsView_DynamicProperties() + * @model + * @generated + */ + EList getDynamicProperties(); + + /** + * Returns the value of the 'Dynamic Classes' reference list. + * The list contents are of type {@link org.eclipse.emf.ecore.EClass}. + * + *

+ * If the meaning of the 'Dynamic Classes' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Dynamic Classes' reference list. + * @see opsemanticsview.OpsemanticsviewPackage#getOperationalSemanticsView_DynamicClasses() + * @model + * @generated + */ + EList getDynamicClasses(); + + /** + * Returns the value of the 'Execution To ASmapping' containment reference list. + * The list contents are of type {@link opsemanticsview.ExecutionToASEntry}. + * + *

+ * If the meaning of the 'Execution To ASmapping' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Execution To ASmapping' containment reference list. + * @see opsemanticsview.OpsemanticsviewPackage#getOperationalSemanticsView_ExecutionToASmapping() + * @model containment="true" + * @generated + */ + EList getExecutionToASmapping(); + +} // OperationalSemanticsView diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewFactory.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewFactory.java new file mode 100644 index 000000000..b57b530cd --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewFactory.java @@ -0,0 +1,60 @@ +/** + */ +package opsemanticsview; + +import org.eclipse.emf.ecore.EFactory; + +/** + * + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + * + * @see opsemanticsview.OpsemanticsviewPackage + * @generated + */ +public interface OpsemanticsviewFactory extends EFactory { + /** + * The singleton instance of the factory. + * + * + * @generated + */ + OpsemanticsviewFactory eINSTANCE = opsemanticsview.impl.OpsemanticsviewFactoryImpl.init(); + + /** + * Returns a new object of class 'Operational Semantics View'. + * + * + * @return a new object of class 'Operational Semantics View'. + * @generated + */ + OperationalSemanticsView createOperationalSemanticsView(); + + /** + * Returns a new object of class 'Rule'. + * + * + * @return a new object of class 'Rule'. + * @generated + */ + Rule createRule(); + + /** + * Returns a new object of class 'Execution To AS Entry'. + * + * + * @return a new object of class 'Execution To AS Entry'. + * @generated + */ + ExecutionToASEntry createExecutionToASEntry(); + + /** + * Returns the package supported by this factory. + * + * + * @return the package supported by this factory. + * @generated + */ + OpsemanticsviewPackage getOpsemanticsviewPackage(); + +} //OpsemanticsviewFactory diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java new file mode 100644 index 000000000..f8bd7e118 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java @@ -0,0 +1,621 @@ +/** + */ +package opsemanticsview; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +/** + * + * The Package for the model. + * It contains accessors for the meta objects to represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @see opsemanticsview.OpsemanticsviewFactory + * @model kind="package" + * @generated + */ +public interface OpsemanticsviewPackage extends EPackage { + /** + * The package name. + * + * + * @generated + */ + String eNAME = "opsemanticsview"; + + /** + * The package namespace URI. + * + * + * @generated + */ + String eNS_URI = "http://opsemanticsview/1.0"; + + /** + * The package namespace name. + * + * + * @generated + */ + String eNS_PREFIX = "opsemanticsview"; + + /** + * The singleton instance of the package. + * + * + * @generated + */ + OpsemanticsviewPackage eINSTANCE = opsemanticsview.impl.OpsemanticsviewPackageImpl.init(); + + /** + * The meta object id for the '{@link opsemanticsview.impl.OperationalSemanticsViewImpl Operational Semantics View}' class. + * + * + * @see opsemanticsview.impl.OperationalSemanticsViewImpl + * @see opsemanticsview.impl.OpsemanticsviewPackageImpl#getOperationalSemanticsView() + * @generated + */ + int OPERATIONAL_SEMANTICS_VIEW = 0; + + /** + * The feature id for the 'Rules' containment reference list. + * + * + * @generated + * @ordered + */ + int OPERATIONAL_SEMANTICS_VIEW__RULES = 0; + + /** + * The feature id for the 'Dynamic Properties' reference list. + * + * + * @generated + * @ordered + */ + int OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_PROPERTIES = 1; + + /** + * The feature id for the 'Dynamic Classes' reference list. + * + * + * @generated + * @ordered + */ + int OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_CLASSES = 2; + + /** + * The feature id for the 'Execution To ASmapping' containment reference list. + * + * + * @generated + * @ordered + */ + int OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING = 3; + + /** + * The number of structural features of the 'Operational Semantics View' class. + * + * + * @generated + * @ordered + */ + int OPERATIONAL_SEMANTICS_VIEW_FEATURE_COUNT = 4; + + /** + * The number of operations of the 'Operational Semantics View' class. + * + * + * @generated + * @ordered + */ + int OPERATIONAL_SEMANTICS_VIEW_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link opsemanticsview.impl.RuleImpl Rule}' class. + * + * + * @see opsemanticsview.impl.RuleImpl + * @see opsemanticsview.impl.OpsemanticsviewPackageImpl#getRule() + * @generated + */ + int RULE = 1; + + /** + * The feature id for the 'Called Rules' reference list. + * + * + * @generated + * @ordered + */ + int RULE__CALLED_RULES = 0; + + /** + * The feature id for the 'Operation' containment reference. + * + * + * @generated + * @ordered + */ + int RULE__OPERATION = 1; + + /** + * The feature id for the 'Step Rule' attribute. + * + * + * @generated + * @ordered + */ + int RULE__STEP_RULE = 2; + + /** + * The feature id for the 'Overriden By' reference list. + * + * + * @generated + * @ordered + */ + int RULE__OVERRIDEN_BY = 3; + + /** + * The feature id for the 'Overrides' reference. + * + * + * @generated + * @ordered + */ + int RULE__OVERRIDES = 4; + + /** + * The feature id for the 'Containing Class' reference. + * + * + * @generated + * @ordered + */ + int RULE__CONTAINING_CLASS = 5; + + /** + * The feature id for the 'Abstract' attribute. + * + * + * @generated + * @ordered + */ + int RULE__ABSTRACT = 6; + + /** + * The feature id for the 'Main' attribute. + * + * + * @generated + * @ordered + */ + int RULE__MAIN = 7; + + /** + * The number of structural features of the 'Rule' class. + * + * + * @generated + * @ordered + */ + int RULE_FEATURE_COUNT = 8; + + /** + * The number of operations of the 'Rule' class. + * + * + * @generated + * @ordered + */ + int RULE_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link opsemanticsview.impl.ExecutionToASEntryImpl Execution To AS Entry}' class. + * + * + * @see opsemanticsview.impl.ExecutionToASEntryImpl + * @see opsemanticsview.impl.OpsemanticsviewPackageImpl#getExecutionToASEntry() + * @generated + */ + int EXECUTION_TO_AS_ENTRY = 2; + + /** + * The feature id for the 'Execution Class' reference. + * + * + * @generated + * @ordered + */ + int EXECUTION_TO_AS_ENTRY__EXECUTION_CLASS = 0; + + /** + * The feature id for the 'ASclass' reference. + * + * + * @generated + * @ordered + */ + int EXECUTION_TO_AS_ENTRY__ASCLASS = 1; + + /** + * The number of structural features of the 'Execution To AS Entry' class. + * + * + * @generated + * @ordered + */ + int EXECUTION_TO_AS_ENTRY_FEATURE_COUNT = 2; + + /** + * The number of operations of the 'Execution To AS Entry' class. + * + * + * @generated + * @ordered + */ + int EXECUTION_TO_AS_ENTRY_OPERATION_COUNT = 0; + + + /** + * Returns the meta object for class '{@link opsemanticsview.OperationalSemanticsView Operational Semantics View}'. + * + * + * @return the meta object for class 'Operational Semantics View'. + * @see opsemanticsview.OperationalSemanticsView + * @generated + */ + EClass getOperationalSemanticsView(); + + /** + * Returns the meta object for the containment reference list '{@link opsemanticsview.OperationalSemanticsView#getRules Rules}'. + * + * + * @return the meta object for the containment reference list 'Rules'. + * @see opsemanticsview.OperationalSemanticsView#getRules() + * @see #getOperationalSemanticsView() + * @generated + */ + EReference getOperationalSemanticsView_Rules(); + + /** + * Returns the meta object for the reference list '{@link opsemanticsview.OperationalSemanticsView#getDynamicProperties Dynamic Properties}'. + * + * + * @return the meta object for the reference list 'Dynamic Properties'. + * @see opsemanticsview.OperationalSemanticsView#getDynamicProperties() + * @see #getOperationalSemanticsView() + * @generated + */ + EReference getOperationalSemanticsView_DynamicProperties(); + + /** + * Returns the meta object for the reference list '{@link opsemanticsview.OperationalSemanticsView#getDynamicClasses Dynamic Classes}'. + * + * + * @return the meta object for the reference list 'Dynamic Classes'. + * @see opsemanticsview.OperationalSemanticsView#getDynamicClasses() + * @see #getOperationalSemanticsView() + * @generated + */ + EReference getOperationalSemanticsView_DynamicClasses(); + + /** + * Returns the meta object for the containment reference list '{@link opsemanticsview.OperationalSemanticsView#getExecutionToASmapping Execution To ASmapping}'. + * + * + * @return the meta object for the containment reference list 'Execution To ASmapping'. + * @see opsemanticsview.OperationalSemanticsView#getExecutionToASmapping() + * @see #getOperationalSemanticsView() + * @generated + */ + EReference getOperationalSemanticsView_ExecutionToASmapping(); + + /** + * Returns the meta object for class '{@link opsemanticsview.Rule Rule}'. + * + * + * @return the meta object for class 'Rule'. + * @see opsemanticsview.Rule + * @generated + */ + EClass getRule(); + + /** + * Returns the meta object for the reference list '{@link opsemanticsview.Rule#getCalledRules Called Rules}'. + * + * + * @return the meta object for the reference list 'Called Rules'. + * @see opsemanticsview.Rule#getCalledRules() + * @see #getRule() + * @generated + */ + EReference getRule_CalledRules(); + + /** + * Returns the meta object for the containment reference '{@link opsemanticsview.Rule#getOperation Operation}'. + * + * + * @return the meta object for the containment reference 'Operation'. + * @see opsemanticsview.Rule#getOperation() + * @see #getRule() + * @generated + */ + EReference getRule_Operation(); + + /** + * Returns the meta object for the attribute '{@link opsemanticsview.Rule#isStepRule Step Rule}'. + * + * + * @return the meta object for the attribute 'Step Rule'. + * @see opsemanticsview.Rule#isStepRule() + * @see #getRule() + * @generated + */ + EAttribute getRule_StepRule(); + + /** + * Returns the meta object for the reference list '{@link opsemanticsview.Rule#getOverridenBy Overriden By}'. + * + * + * @return the meta object for the reference list 'Overriden By'. + * @see opsemanticsview.Rule#getOverridenBy() + * @see #getRule() + * @generated + */ + EReference getRule_OverridenBy(); + + /** + * Returns the meta object for the reference '{@link opsemanticsview.Rule#getOverrides Overrides}'. + * + * + * @return the meta object for the reference 'Overrides'. + * @see opsemanticsview.Rule#getOverrides() + * @see #getRule() + * @generated + */ + EReference getRule_Overrides(); + + /** + * Returns the meta object for the reference '{@link opsemanticsview.Rule#getContainingClass Containing Class}'. + * + * + * @return the meta object for the reference 'Containing Class'. + * @see opsemanticsview.Rule#getContainingClass() + * @see #getRule() + * @generated + */ + EReference getRule_ContainingClass(); + + /** + * Returns the meta object for the attribute '{@link opsemanticsview.Rule#isAbstract Abstract}'. + * + * + * @return the meta object for the attribute 'Abstract'. + * @see opsemanticsview.Rule#isAbstract() + * @see #getRule() + * @generated + */ + EAttribute getRule_Abstract(); + + /** + * Returns the meta object for the attribute '{@link opsemanticsview.Rule#isMain Main}'. + * + * + * @return the meta object for the attribute 'Main'. + * @see opsemanticsview.Rule#isMain() + * @see #getRule() + * @generated + */ + EAttribute getRule_Main(); + + /** + * Returns the meta object for class '{@link opsemanticsview.ExecutionToASEntry Execution To AS Entry}'. + * + * + * @return the meta object for class 'Execution To AS Entry'. + * @see opsemanticsview.ExecutionToASEntry + * @generated + */ + EClass getExecutionToASEntry(); + + /** + * Returns the meta object for the reference '{@link opsemanticsview.ExecutionToASEntry#getExecutionClass Execution Class}'. + * + * + * @return the meta object for the reference 'Execution Class'. + * @see opsemanticsview.ExecutionToASEntry#getExecutionClass() + * @see #getExecutionToASEntry() + * @generated + */ + EReference getExecutionToASEntry_ExecutionClass(); + + /** + * Returns the meta object for the reference '{@link opsemanticsview.ExecutionToASEntry#getASclass ASclass}'. + * + * + * @return the meta object for the reference 'ASclass'. + * @see opsemanticsview.ExecutionToASEntry#getASclass() + * @see #getExecutionToASEntry() + * @generated + */ + EReference getExecutionToASEntry_ASclass(); + + /** + * Returns the factory that creates the instances of the model. + * + * + * @return the factory that creates the instances of the model. + * @generated + */ + OpsemanticsviewFactory getOpsemanticsviewFactory(); + + /** + * + * Defines literals for the meta objects that represent + *
    + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each operation of each class,
    • + *
  • each enum,
    • + *
  • and each data type
    • + *
+ * + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link opsemanticsview.impl.OperationalSemanticsViewImpl Operational Semantics View}' class. + * + * + * @see opsemanticsview.impl.OperationalSemanticsViewImpl + * @see opsemanticsview.impl.OpsemanticsviewPackageImpl#getOperationalSemanticsView() + * @generated + */ + EClass OPERATIONAL_SEMANTICS_VIEW = eINSTANCE.getOperationalSemanticsView(); + + /** + * The meta object literal for the 'Rules' containment reference list feature. + * + * + * @generated + */ + EReference OPERATIONAL_SEMANTICS_VIEW__RULES = eINSTANCE.getOperationalSemanticsView_Rules(); + + /** + * The meta object literal for the 'Dynamic Properties' reference list feature. + * + * + * @generated + */ + EReference OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_PROPERTIES = eINSTANCE.getOperationalSemanticsView_DynamicProperties(); + + /** + * The meta object literal for the 'Dynamic Classes' reference list feature. + * + * + * @generated + */ + EReference OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_CLASSES = eINSTANCE.getOperationalSemanticsView_DynamicClasses(); + + /** + * The meta object literal for the 'Execution To ASmapping' containment reference list feature. + * + * + * @generated + */ + EReference OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING = eINSTANCE.getOperationalSemanticsView_ExecutionToASmapping(); + + /** + * The meta object literal for the '{@link opsemanticsview.impl.RuleImpl Rule}' class. + * + * + * @see opsemanticsview.impl.RuleImpl + * @see opsemanticsview.impl.OpsemanticsviewPackageImpl#getRule() + * @generated + */ + EClass RULE = eINSTANCE.getRule(); + + /** + * The meta object literal for the 'Called Rules' reference list feature. + * + * + * @generated + */ + EReference RULE__CALLED_RULES = eINSTANCE.getRule_CalledRules(); + + /** + * The meta object literal for the 'Operation' containment reference feature. + * + * + * @generated + */ + EReference RULE__OPERATION = eINSTANCE.getRule_Operation(); + + /** + * The meta object literal for the 'Step Rule' attribute feature. + * + * + * @generated + */ + EAttribute RULE__STEP_RULE = eINSTANCE.getRule_StepRule(); + + /** + * The meta object literal for the 'Overriden By' reference list feature. + * + * + * @generated + */ + EReference RULE__OVERRIDEN_BY = eINSTANCE.getRule_OverridenBy(); + + /** + * The meta object literal for the 'Overrides' reference feature. + * + * + * @generated + */ + EReference RULE__OVERRIDES = eINSTANCE.getRule_Overrides(); + + /** + * The meta object literal for the 'Containing Class' reference feature. + * + * + * @generated + */ + EReference RULE__CONTAINING_CLASS = eINSTANCE.getRule_ContainingClass(); + + /** + * The meta object literal for the 'Abstract' attribute feature. + * + * + * @generated + */ + EAttribute RULE__ABSTRACT = eINSTANCE.getRule_Abstract(); + + /** + * The meta object literal for the 'Main' attribute feature. + * + * + * @generated + */ + EAttribute RULE__MAIN = eINSTANCE.getRule_Main(); + + /** + * The meta object literal for the '{@link opsemanticsview.impl.ExecutionToASEntryImpl Execution To AS Entry}' class. + * + * + * @see opsemanticsview.impl.ExecutionToASEntryImpl + * @see opsemanticsview.impl.OpsemanticsviewPackageImpl#getExecutionToASEntry() + * @generated + */ + EClass EXECUTION_TO_AS_ENTRY = eINSTANCE.getExecutionToASEntry(); + + /** + * The meta object literal for the 'Execution Class' reference feature. + * + * + * @generated + */ + EReference EXECUTION_TO_AS_ENTRY__EXECUTION_CLASS = eINSTANCE.getExecutionToASEntry_ExecutionClass(); + + /** + * The meta object literal for the 'ASclass' reference feature. + * + * + * @generated + */ + EReference EXECUTION_TO_AS_ENTRY__ASCLASS = eINSTANCE.getExecutionToASEntry_ASclass(); + + } + +} //OpsemanticsviewPackage diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/Rule.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/Rule.java new file mode 100644 index 000000000..cf9514e0e --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/Rule.java @@ -0,0 +1,227 @@ +/** + */ +package opsemanticsview; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EOperation; + +/** + * + * A representation of the model object 'Rule'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link opsemanticsview.Rule#getCalledRules Called Rules}
    • + *
  • {@link opsemanticsview.Rule#getOperation Operation}
    • + *
  • {@link opsemanticsview.Rule#isStepRule Step Rule}
    • + *
  • {@link opsemanticsview.Rule#getOverridenBy Overriden By}
    • + *
  • {@link opsemanticsview.Rule#getOverrides Overrides}
    • + *
  • {@link opsemanticsview.Rule#getContainingClass Containing Class}
    • + *
  • {@link opsemanticsview.Rule#isAbstract Abstract}
    • + *
  • {@link opsemanticsview.Rule#isMain Main}
    • + *
+ * + * @see opsemanticsview.OpsemanticsviewPackage#getRule() + * @model + * @generated + */ +public interface Rule extends EObject { + /** + * Returns the value of the 'Called Rules' reference list. + * The list contents are of type {@link opsemanticsview.Rule}. + * + *

+ * If the meaning of the 'Called Rules' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Called Rules' reference list. + * @see opsemanticsview.OpsemanticsviewPackage#getRule_CalledRules() + * @model ordered="false" + * @generated + */ + EList getCalledRules(); + + /** + * Returns the value of the 'Operation' containment reference. + * + *

+ * If the meaning of the 'Operation' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Operation' containment reference. + * @see #setOperation(EOperation) + * @see opsemanticsview.OpsemanticsviewPackage#getRule_Operation() + * @model containment="true" required="true" + * @generated + */ + EOperation getOperation(); + + /** + * Sets the value of the '{@link opsemanticsview.Rule#getOperation Operation}' containment reference. + * + * + * @param value the new value of the 'Operation' containment reference. + * @see #getOperation() + * @generated + */ + void setOperation(EOperation value); + + /** + * Returns the value of the 'Step Rule' attribute. + * + *

+ * If the meaning of the 'Step Rule' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Step Rule' attribute. + * @see #setStepRule(boolean) + * @see opsemanticsview.OpsemanticsviewPackage#getRule_StepRule() + * @model required="true" + * @generated + */ + boolean isStepRule(); + + /** + * Sets the value of the '{@link opsemanticsview.Rule#isStepRule Step Rule}' attribute. + * + * + * @param value the new value of the 'Step Rule' attribute. + * @see #isStepRule() + * @generated + */ + void setStepRule(boolean value); + + /** + * Returns the value of the 'Overriden By' reference list. + * The list contents are of type {@link opsemanticsview.Rule}. + * It is bidirectional and its opposite is '{@link opsemanticsview.Rule#getOverrides Overrides}'. + * + *

+ * If the meaning of the 'Overriden By' reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Overriden By' reference list. + * @see opsemanticsview.OpsemanticsviewPackage#getRule_OverridenBy() + * @see opsemanticsview.Rule#getOverrides + * @model opposite="overrides" ordered="false" + * @generated + */ + EList getOverridenBy(); + + /** + * Returns the value of the 'Overrides' reference. + * It is bidirectional and its opposite is '{@link opsemanticsview.Rule#getOverridenBy Overriden By}'. + * + *

+ * If the meaning of the 'Overrides' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Overrides' reference. + * @see #setOverrides(Rule) + * @see opsemanticsview.OpsemanticsviewPackage#getRule_Overrides() + * @see opsemanticsview.Rule#getOverridenBy + * @model opposite="overridenBy" + * @generated + */ + Rule getOverrides(); + + /** + * Sets the value of the '{@link opsemanticsview.Rule#getOverrides Overrides}' reference. + * + * + * @param value the new value of the 'Overrides' reference. + * @see #getOverrides() + * @generated + */ + void setOverrides(Rule value); + + /** + * Returns the value of the 'Containing Class' reference. + * + *

+ * If the meaning of the 'Containing Class' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Containing Class' reference. + * @see #setContainingClass(EClass) + * @see opsemanticsview.OpsemanticsviewPackage#getRule_ContainingClass() + * @model + * @generated + */ + EClass getContainingClass(); + + /** + * Sets the value of the '{@link opsemanticsview.Rule#getContainingClass Containing Class}' reference. + * + * + * @param value the new value of the 'Containing Class' reference. + * @see #getContainingClass() + * @generated + */ + void setContainingClass(EClass value); + + /** + * Returns the value of the 'Abstract' attribute. + * + *

+ * If the meaning of the 'Abstract' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Abstract' attribute. + * @see #setAbstract(boolean) + * @see opsemanticsview.OpsemanticsviewPackage#getRule_Abstract() + * @model required="true" + * @generated + */ + boolean isAbstract(); + + /** + * Sets the value of the '{@link opsemanticsview.Rule#isAbstract Abstract}' attribute. + * + * + * @param value the new value of the 'Abstract' attribute. + * @see #isAbstract() + * @generated + */ + void setAbstract(boolean value); + + /** + * Returns the value of the 'Main' attribute. + * + *

+ * If the meaning of the 'Main' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Main' attribute. + * @see #setMain(boolean) + * @see opsemanticsview.OpsemanticsviewPackage#getRule_Main() + * @model + * @generated + */ + boolean isMain(); + + /** + * Sets the value of the '{@link opsemanticsview.Rule#isMain Main}' attribute. + * + * + * @param value the new value of the 'Main' attribute. + * @see #isMain() + * @generated + */ + void setMain(boolean value); + +} // Rule diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/ExecutionToASEntryImpl.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/ExecutionToASEntryImpl.java new file mode 100644 index 000000000..8b9e549be --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/ExecutionToASEntryImpl.java @@ -0,0 +1,216 @@ +/** + */ +package opsemanticsview.impl; + +import opsemanticsview.ExecutionToASEntry; +import opsemanticsview.OpsemanticsviewPackage; + +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.ecore.impl.MinimalEObjectImpl; + +/** + * + * An implementation of the model object 'Execution To AS Entry'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link opsemanticsview.impl.ExecutionToASEntryImpl#getExecutionClass Execution Class}
    • + *
  • {@link opsemanticsview.impl.ExecutionToASEntryImpl#getASclass ASclass}
    • + *
+ * + * @generated + */ +public class ExecutionToASEntryImpl extends MinimalEObjectImpl.Container implements ExecutionToASEntry { + /** + * The cached value of the '{@link #getExecutionClass() Execution Class}' reference. + * + * + * @see #getExecutionClass() + * @generated + * @ordered + */ + protected EClass executionClass; + + /** + * The cached value of the '{@link #getASclass() ASclass}' reference. + * + * + * @see #getASclass() + * @generated + * @ordered + */ + protected EClass aSclass; + + /** + * + * + * @generated + */ + protected ExecutionToASEntryImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return OpsemanticsviewPackage.Literals.EXECUTION_TO_AS_ENTRY; + } + + /** + * + * + * @generated + */ + public EClass getExecutionClass() { + if (executionClass != null && executionClass.eIsProxy()) { + InternalEObject oldExecutionClass = (InternalEObject)executionClass; + executionClass = (EClass)eResolveProxy(oldExecutionClass); + if (executionClass != oldExecutionClass) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__EXECUTION_CLASS, oldExecutionClass, executionClass)); + } + } + return executionClass; + } + + /** + * + * + * @generated + */ + public EClass basicGetExecutionClass() { + return executionClass; + } + + /** + * + * + * @generated + */ + public void setExecutionClass(EClass newExecutionClass) { + EClass oldExecutionClass = executionClass; + executionClass = newExecutionClass; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__EXECUTION_CLASS, oldExecutionClass, executionClass)); + } + + /** + * + * + * @generated + */ + public EClass getASclass() { + if (aSclass != null && aSclass.eIsProxy()) { + InternalEObject oldASclass = (InternalEObject)aSclass; + aSclass = (EClass)eResolveProxy(oldASclass); + if (aSclass != oldASclass) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__ASCLASS, oldASclass, aSclass)); + } + } + return aSclass; + } + + /** + * + * + * @generated + */ + public EClass basicGetASclass() { + return aSclass; + } + + /** + * + * + * @generated + */ + public void setASclass(EClass newASclass) { + EClass oldASclass = aSclass; + aSclass = newASclass; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__ASCLASS, oldASclass, aSclass)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__EXECUTION_CLASS: + if (resolve) return getExecutionClass(); + return basicGetExecutionClass(); + case OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__ASCLASS: + if (resolve) return getASclass(); + return basicGetASclass(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__EXECUTION_CLASS: + setExecutionClass((EClass)newValue); + return; + case OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__ASCLASS: + setASclass((EClass)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__EXECUTION_CLASS: + setExecutionClass((EClass)null); + return; + case OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__ASCLASS: + setASclass((EClass)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__EXECUTION_CLASS: + return executionClass != null; + case OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY__ASCLASS: + return aSclass != null; + } + return super.eIsSet(featureID); + } + +} //ExecutionToASEntryImpl diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java new file mode 100644 index 000000000..789515157 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java @@ -0,0 +1,259 @@ +/** + */ +package opsemanticsview.impl; + +import java.util.Collection; + +import opsemanticsview.ExecutionToASEntry; +import opsemanticsview.OperationalSemanticsView; +import opsemanticsview.OpsemanticsviewPackage; +import opsemanticsview.Rule; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.EObjectResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Operational Semantics View'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link opsemanticsview.impl.OperationalSemanticsViewImpl#getRules Rules}
    • + *
  • {@link opsemanticsview.impl.OperationalSemanticsViewImpl#getDynamicProperties Dynamic Properties}
    • + *
  • {@link opsemanticsview.impl.OperationalSemanticsViewImpl#getDynamicClasses Dynamic Classes}
    • + *
  • {@link opsemanticsview.impl.OperationalSemanticsViewImpl#getExecutionToASmapping Execution To ASmapping}
    • + *
+ * + * @generated + */ +public class OperationalSemanticsViewImpl extends MinimalEObjectImpl.Container implements OperationalSemanticsView { + /** + * The cached value of the '{@link #getRules() Rules}' containment reference list. + * + * + * @see #getRules() + * @generated + * @ordered + */ + protected EList rules; + + /** + * The cached value of the '{@link #getDynamicProperties() Dynamic Properties}' reference list. + * + * + * @see #getDynamicProperties() + * @generated + * @ordered + */ + protected EList dynamicProperties; + + /** + * The cached value of the '{@link #getDynamicClasses() Dynamic Classes}' reference list. + * + * + * @see #getDynamicClasses() + * @generated + * @ordered + */ + protected EList dynamicClasses; + + /** + * The cached value of the '{@link #getExecutionToASmapping() Execution To ASmapping}' containment reference list. + * + * + * @see #getExecutionToASmapping() + * @generated + * @ordered + */ + protected EList executionToASmapping; + + /** + * + * + * @generated + */ + protected OperationalSemanticsViewImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return OpsemanticsviewPackage.Literals.OPERATIONAL_SEMANTICS_VIEW; + } + + /** + * + * + * @generated + */ + public EList getRules() { + if (rules == null) { + rules = new EObjectContainmentEList(Rule.class, this, OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__RULES); + } + return rules; + } + + /** + * + * + * @generated + */ + public EList getDynamicProperties() { + if (dynamicProperties == null) { + dynamicProperties = new EObjectResolvingEList(EStructuralFeature.class, this, OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_PROPERTIES); + } + return dynamicProperties; + } + + /** + * + * + * @generated + */ + public EList getDynamicClasses() { + if (dynamicClasses == null) { + dynamicClasses = new EObjectResolvingEList(EClass.class, this, OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_CLASSES); + } + return dynamicClasses; + } + + /** + * + * + * @generated + */ + public EList getExecutionToASmapping() { + if (executionToASmapping == null) { + executionToASmapping = new EObjectContainmentEList(ExecutionToASEntry.class, this, OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING); + } + return executionToASmapping; + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__RULES: + return ((InternalEList)getRules()).basicRemove(otherEnd, msgs); + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING: + return ((InternalEList)getExecutionToASmapping()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__RULES: + return getRules(); + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_PROPERTIES: + return getDynamicProperties(); + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_CLASSES: + return getDynamicClasses(); + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING: + return getExecutionToASmapping(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__RULES: + getRules().clear(); + getRules().addAll((Collection)newValue); + return; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_PROPERTIES: + getDynamicProperties().clear(); + getDynamicProperties().addAll((Collection)newValue); + return; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_CLASSES: + getDynamicClasses().clear(); + getDynamicClasses().addAll((Collection)newValue); + return; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING: + getExecutionToASmapping().clear(); + getExecutionToASmapping().addAll((Collection)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__RULES: + getRules().clear(); + return; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_PROPERTIES: + getDynamicProperties().clear(); + return; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_CLASSES: + getDynamicClasses().clear(); + return; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING: + getExecutionToASmapping().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__RULES: + return rules != null && !rules.isEmpty(); + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_PROPERTIES: + return dynamicProperties != null && !dynamicProperties.isEmpty(); + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_CLASSES: + return dynamicClasses != null && !dynamicClasses.isEmpty(); + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING: + return executionToASmapping != null && !executionToASmapping.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //OperationalSemanticsViewImpl diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewFactoryImpl.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewFactoryImpl.java new file mode 100644 index 000000000..da7af74e2 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewFactoryImpl.java @@ -0,0 +1,117 @@ +/** + */ +package opsemanticsview.impl; + +import opsemanticsview.*; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; + +/** + * + * An implementation of the model Factory. + * + * @generated + */ +public class OpsemanticsviewFactoryImpl extends EFactoryImpl implements OpsemanticsviewFactory { + /** + * Creates the default factory implementation. + * + * + * @generated + */ + public static OpsemanticsviewFactory init() { + try { + OpsemanticsviewFactory theOpsemanticsviewFactory = (OpsemanticsviewFactory)EPackage.Registry.INSTANCE.getEFactory(OpsemanticsviewPackage.eNS_URI); + if (theOpsemanticsviewFactory != null) { + return theOpsemanticsviewFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new OpsemanticsviewFactoryImpl(); + } + + /** + * Creates an instance of the factory. + * + * + * @generated + */ + public OpsemanticsviewFactoryImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW: return createOperationalSemanticsView(); + case OpsemanticsviewPackage.RULE: return createRule(); + case OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY: return createExecutionToASEntry(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + * + * + * @generated + */ + public OperationalSemanticsView createOperationalSemanticsView() { + OperationalSemanticsViewImpl operationalSemanticsView = new OperationalSemanticsViewImpl(); + return operationalSemanticsView; + } + + /** + * + * + * @generated + */ + public Rule createRule() { + RuleImpl rule = new RuleImpl(); + return rule; + } + + /** + * + * + * @generated + */ + public ExecutionToASEntry createExecutionToASEntry() { + ExecutionToASEntryImpl executionToASEntry = new ExecutionToASEntryImpl(); + return executionToASEntry; + } + + /** + * + * + * @generated + */ + public OpsemanticsviewPackage getOpsemanticsviewPackage() { + return (OpsemanticsviewPackage)getEPackage(); + } + + /** + * + * + * @deprecated + * @generated + */ + @Deprecated + public static OpsemanticsviewPackage getPackage() { + return OpsemanticsviewPackage.eINSTANCE; + } + +} //OpsemanticsviewFactoryImpl diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java new file mode 100644 index 000000000..0b0644b50 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java @@ -0,0 +1,363 @@ +/** + */ +package opsemanticsview.impl; + +import opsemanticsview.ExecutionToASEntry; +import opsemanticsview.OperationalSemanticsView; +import opsemanticsview.OpsemanticsviewFactory; +import opsemanticsview.OpsemanticsviewPackage; +import opsemanticsview.Rule; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +import org.eclipse.emf.ecore.impl.EPackageImpl; + +/** + * + * An implementation of the model Package. + * + * @generated + */ +public class OpsemanticsviewPackageImpl extends EPackageImpl implements OpsemanticsviewPackage { + /** + * + * + * @generated + */ + private EClass operationalSemanticsViewEClass = null; + + /** + * + * + * @generated + */ + private EClass ruleEClass = null; + + /** + * + * + * @generated + */ + private EClass executionToASEntryEClass = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + *

Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * + * + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see opsemanticsview.OpsemanticsviewPackage#eNS_URI + * @see #init() + * @generated + */ + private OpsemanticsviewPackageImpl() { + super(eNS_URI, OpsemanticsviewFactory.eINSTANCE); + } + + /** + * + * + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * + *

This method is used to initialize {@link OpsemanticsviewPackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * + * + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static OpsemanticsviewPackage init() { + if (isInited) return (OpsemanticsviewPackage)EPackage.Registry.INSTANCE.getEPackage(OpsemanticsviewPackage.eNS_URI); + + // Obtain or create and register package + OpsemanticsviewPackageImpl theOpsemanticsviewPackage = (OpsemanticsviewPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof OpsemanticsviewPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new OpsemanticsviewPackageImpl()); + + isInited = true; + + // Create package meta-data objects + theOpsemanticsviewPackage.createPackageContents(); + + // Initialize created meta-data + theOpsemanticsviewPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theOpsemanticsviewPackage.freeze(); + + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(OpsemanticsviewPackage.eNS_URI, theOpsemanticsviewPackage); + return theOpsemanticsviewPackage; + } + + /** + * + * + * @generated + */ + public EClass getOperationalSemanticsView() { + return operationalSemanticsViewEClass; + } + + /** + * + * + * @generated + */ + public EReference getOperationalSemanticsView_Rules() { + return (EReference)operationalSemanticsViewEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getOperationalSemanticsView_DynamicProperties() { + return (EReference)operationalSemanticsViewEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EReference getOperationalSemanticsView_DynamicClasses() { + return (EReference)operationalSemanticsViewEClass.getEStructuralFeatures().get(2); + } + + /** + * + * + * @generated + */ + public EReference getOperationalSemanticsView_ExecutionToASmapping() { + return (EReference)operationalSemanticsViewEClass.getEStructuralFeatures().get(3); + } + + /** + * + * + * @generated + */ + public EClass getRule() { + return ruleEClass; + } + + /** + * + * + * @generated + */ + public EReference getRule_CalledRules() { + return (EReference)ruleEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getRule_Operation() { + return (EReference)ruleEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EAttribute getRule_StepRule() { + return (EAttribute)ruleEClass.getEStructuralFeatures().get(2); + } + + /** + * + * + * @generated + */ + public EReference getRule_OverridenBy() { + return (EReference)ruleEClass.getEStructuralFeatures().get(3); + } + + /** + * + * + * @generated + */ + public EReference getRule_Overrides() { + return (EReference)ruleEClass.getEStructuralFeatures().get(4); + } + + /** + * + * + * @generated + */ + public EReference getRule_ContainingClass() { + return (EReference)ruleEClass.getEStructuralFeatures().get(5); + } + + /** + * + * + * @generated + */ + public EAttribute getRule_Abstract() { + return (EAttribute)ruleEClass.getEStructuralFeatures().get(6); + } + + /** + * + * + * @generated + */ + public EAttribute getRule_Main() { + return (EAttribute)ruleEClass.getEStructuralFeatures().get(7); + } + + /** + * + * + * @generated + */ + public EClass getExecutionToASEntry() { + return executionToASEntryEClass; + } + + /** + * + * + * @generated + */ + public EReference getExecutionToASEntry_ExecutionClass() { + return (EReference)executionToASEntryEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getExecutionToASEntry_ASclass() { + return (EReference)executionToASEntryEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public OpsemanticsviewFactory getOpsemanticsviewFactory() { + return (OpsemanticsviewFactory)getEFactoryInstance(); + } + + /** + * + * + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + operationalSemanticsViewEClass = createEClass(OPERATIONAL_SEMANTICS_VIEW); + createEReference(operationalSemanticsViewEClass, OPERATIONAL_SEMANTICS_VIEW__RULES); + createEReference(operationalSemanticsViewEClass, OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_PROPERTIES); + createEReference(operationalSemanticsViewEClass, OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_CLASSES); + createEReference(operationalSemanticsViewEClass, OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING); + + ruleEClass = createEClass(RULE); + createEReference(ruleEClass, RULE__CALLED_RULES); + createEReference(ruleEClass, RULE__OPERATION); + createEAttribute(ruleEClass, RULE__STEP_RULE); + createEReference(ruleEClass, RULE__OVERRIDEN_BY); + createEReference(ruleEClass, RULE__OVERRIDES); + createEReference(ruleEClass, RULE__CONTAINING_CLASS); + createEAttribute(ruleEClass, RULE__ABSTRACT); + createEAttribute(ruleEClass, RULE__MAIN); + + executionToASEntryEClass = createEClass(EXECUTION_TO_AS_ENTRY); + createEReference(executionToASEntryEClass, EXECUTION_TO_AS_ENTRY__EXECUTION_CLASS); + createEReference(executionToASEntryEClass, EXECUTION_TO_AS_ENTRY__ASCLASS); + } + + /** + * + * + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * + * + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Create type parameters + + // Set bounds for type parameters + + // Add supertypes to classes + + // Initialize classes, features, and operations; add parameters + initEClass(operationalSemanticsViewEClass, OperationalSemanticsView.class, "OperationalSemanticsView", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getOperationalSemanticsView_Rules(), this.getRule(), null, "rules", null, 0, -1, OperationalSemanticsView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOperationalSemanticsView_DynamicProperties(), ecorePackage.getEStructuralFeature(), null, "dynamicProperties", null, 0, -1, OperationalSemanticsView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOperationalSemanticsView_DynamicClasses(), ecorePackage.getEClass(), null, "dynamicClasses", null, 0, -1, OperationalSemanticsView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOperationalSemanticsView_ExecutionToASmapping(), this.getExecutionToASEntry(), null, "executionToASmapping", null, 0, -1, OperationalSemanticsView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(ruleEClass, Rule.class, "Rule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getRule_CalledRules(), this.getRule(), null, "calledRules", null, 0, -1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEReference(getRule_Operation(), ecorePackage.getEOperation(), null, "operation", null, 1, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRule_StepRule(), ecorePackage.getEBoolean(), "stepRule", null, 1, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRule_OverridenBy(), this.getRule(), this.getRule_Overrides(), "overridenBy", null, 0, -1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEReference(getRule_Overrides(), this.getRule(), this.getRule_OverridenBy(), "overrides", null, 0, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRule_ContainingClass(), ecorePackage.getEClass(), null, "containingClass", null, 0, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRule_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 1, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRule_Main(), ecorePackage.getEBoolean(), "main", null, 0, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(executionToASEntryEClass, ExecutionToASEntry.class, "ExecutionToASEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getExecutionToASEntry_ExecutionClass(), ecorePackage.getEClass(), null, "executionClass", null, 1, 1, ExecutionToASEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getExecutionToASEntry_ASclass(), ecorePackage.getEClass(), null, "ASclass", null, 1, 1, ExecutionToASEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Create resource + createResource(eNS_URI); + } + +} //OpsemanticsviewPackageImpl diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/RuleImpl.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/RuleImpl.java new file mode 100644 index 000000000..0e62e470a --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/RuleImpl.java @@ -0,0 +1,594 @@ +/** + */ +package opsemanticsview.impl; + +import java.util.Collection; + +import opsemanticsview.OpsemanticsviewPackage; +import opsemanticsview.Rule; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EOperation; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectResolvingEList; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * + * An implementation of the model object 'Rule'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link opsemanticsview.impl.RuleImpl#getCalledRules Called Rules}
    • + *
  • {@link opsemanticsview.impl.RuleImpl#getOperation Operation}
    • + *
  • {@link opsemanticsview.impl.RuleImpl#isStepRule Step Rule}
    • + *
  • {@link opsemanticsview.impl.RuleImpl#getOverridenBy Overriden By}
    • + *
  • {@link opsemanticsview.impl.RuleImpl#getOverrides Overrides}
    • + *
  • {@link opsemanticsview.impl.RuleImpl#getContainingClass Containing Class}
    • + *
  • {@link opsemanticsview.impl.RuleImpl#isAbstract Abstract}
    • + *
  • {@link opsemanticsview.impl.RuleImpl#isMain Main}
    • + *
+ * + * @generated + */ +public class RuleImpl extends MinimalEObjectImpl.Container implements Rule { + /** + * The cached value of the '{@link #getCalledRules() Called Rules}' reference list. + * + * + * @see #getCalledRules() + * @generated + * @ordered + */ + protected EList calledRules; + + /** + * The cached value of the '{@link #getOperation() Operation}' containment reference. + * + * + * @see #getOperation() + * @generated + * @ordered + */ + protected EOperation operation; + + /** + * The default value of the '{@link #isStepRule() Step Rule}' attribute. + * + * + * @see #isStepRule() + * @generated + * @ordered + */ + protected static final boolean STEP_RULE_EDEFAULT = false; + + /** + * The cached value of the '{@link #isStepRule() Step Rule}' attribute. + * + * + * @see #isStepRule() + * @generated + * @ordered + */ + protected boolean stepRule = STEP_RULE_EDEFAULT; + + /** + * The cached value of the '{@link #getOverridenBy() Overriden By}' reference list. + * + * + * @see #getOverridenBy() + * @generated + * @ordered + */ + protected EList overridenBy; + + /** + * The cached value of the '{@link #getOverrides() Overrides}' reference. + * + * + * @see #getOverrides() + * @generated + * @ordered + */ + protected Rule overrides; + + /** + * The cached value of the '{@link #getContainingClass() Containing Class}' reference. + * + * + * @see #getContainingClass() + * @generated + * @ordered + */ + protected EClass containingClass; + + /** + * The default value of the '{@link #isAbstract() Abstract}' attribute. + * + * + * @see #isAbstract() + * @generated + * @ordered + */ + protected static final boolean ABSTRACT_EDEFAULT = false; + + /** + * The cached value of the '{@link #isAbstract() Abstract}' attribute. + * + * + * @see #isAbstract() + * @generated + * @ordered + */ + protected boolean abstract_ = ABSTRACT_EDEFAULT; + + /** + * The default value of the '{@link #isMain() Main}' attribute. + * + * + * @see #isMain() + * @generated + * @ordered + */ + protected static final boolean MAIN_EDEFAULT = false; + + /** + * The cached value of the '{@link #isMain() Main}' attribute. + * + * + * @see #isMain() + * @generated + * @ordered + */ + protected boolean main = MAIN_EDEFAULT; + + /** + * + * + * @generated + */ + protected RuleImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return OpsemanticsviewPackage.Literals.RULE; + } + + /** + * + * + * @generated + */ + public EList getCalledRules() { + if (calledRules == null) { + calledRules = new EObjectResolvingEList(Rule.class, this, OpsemanticsviewPackage.RULE__CALLED_RULES); + } + return calledRules; + } + + /** + * + * + * @generated + */ + public EOperation getOperation() { + return operation; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetOperation(EOperation newOperation, NotificationChain msgs) { + EOperation oldOperation = operation; + operation = newOperation; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.RULE__OPERATION, oldOperation, newOperation); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setOperation(EOperation newOperation) { + if (newOperation != operation) { + NotificationChain msgs = null; + if (operation != null) + msgs = ((InternalEObject)operation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OpsemanticsviewPackage.RULE__OPERATION, null, msgs); + if (newOperation != null) + msgs = ((InternalEObject)newOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OpsemanticsviewPackage.RULE__OPERATION, null, msgs); + msgs = basicSetOperation(newOperation, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.RULE__OPERATION, newOperation, newOperation)); + } + + /** + * + * + * @generated + */ + public boolean isStepRule() { + return stepRule; + } + + /** + * + * + * @generated + */ + public void setStepRule(boolean newStepRule) { + boolean oldStepRule = stepRule; + stepRule = newStepRule; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.RULE__STEP_RULE, oldStepRule, stepRule)); + } + + /** + * + * + * @generated + */ + public EList getOverridenBy() { + if (overridenBy == null) { + overridenBy = new EObjectWithInverseResolvingEList(Rule.class, this, OpsemanticsviewPackage.RULE__OVERRIDEN_BY, OpsemanticsviewPackage.RULE__OVERRIDES); + } + return overridenBy; + } + + /** + * + * + * @generated + */ + public Rule getOverrides() { + if (overrides != null && overrides.eIsProxy()) { + InternalEObject oldOverrides = (InternalEObject)overrides; + overrides = (Rule)eResolveProxy(oldOverrides); + if (overrides != oldOverrides) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, OpsemanticsviewPackage.RULE__OVERRIDES, oldOverrides, overrides)); + } + } + return overrides; + } + + /** + * + * + * @generated + */ + public Rule basicGetOverrides() { + return overrides; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetOverrides(Rule newOverrides, NotificationChain msgs) { + Rule oldOverrides = overrides; + overrides = newOverrides; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.RULE__OVERRIDES, oldOverrides, newOverrides); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setOverrides(Rule newOverrides) { + if (newOverrides != overrides) { + NotificationChain msgs = null; + if (overrides != null) + msgs = ((InternalEObject)overrides).eInverseRemove(this, OpsemanticsviewPackage.RULE__OVERRIDEN_BY, Rule.class, msgs); + if (newOverrides != null) + msgs = ((InternalEObject)newOverrides).eInverseAdd(this, OpsemanticsviewPackage.RULE__OVERRIDEN_BY, Rule.class, msgs); + msgs = basicSetOverrides(newOverrides, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.RULE__OVERRIDES, newOverrides, newOverrides)); + } + + /** + * + * + * @generated + */ + public EClass getContainingClass() { + if (containingClass != null && containingClass.eIsProxy()) { + InternalEObject oldContainingClass = (InternalEObject)containingClass; + containingClass = (EClass)eResolveProxy(oldContainingClass); + if (containingClass != oldContainingClass) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, OpsemanticsviewPackage.RULE__CONTAINING_CLASS, oldContainingClass, containingClass)); + } + } + return containingClass; + } + + /** + * + * + * @generated + */ + public EClass basicGetContainingClass() { + return containingClass; + } + + /** + * + * + * @generated + */ + public void setContainingClass(EClass newContainingClass) { + EClass oldContainingClass = containingClass; + containingClass = newContainingClass; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.RULE__CONTAINING_CLASS, oldContainingClass, containingClass)); + } + + /** + * + * + * @generated + */ + public boolean isAbstract() { + return abstract_; + } + + /** + * + * + * @generated + */ + public void setAbstract(boolean newAbstract) { + boolean oldAbstract = abstract_; + abstract_ = newAbstract; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.RULE__ABSTRACT, oldAbstract, abstract_)); + } + + /** + * + * + * @generated + */ + public boolean isMain() { + return main; + } + + /** + * + * + * @generated + */ + public void setMain(boolean newMain) { + boolean oldMain = main; + main = newMain; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.RULE__MAIN, oldMain, main)); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case OpsemanticsviewPackage.RULE__OVERRIDEN_BY: + return ((InternalEList)(InternalEList)getOverridenBy()).basicAdd(otherEnd, msgs); + case OpsemanticsviewPackage.RULE__OVERRIDES: + if (overrides != null) + msgs = ((InternalEObject)overrides).eInverseRemove(this, OpsemanticsviewPackage.RULE__OVERRIDEN_BY, Rule.class, msgs); + return basicSetOverrides((Rule)otherEnd, msgs); + } + return super.eInverseAdd(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case OpsemanticsviewPackage.RULE__OPERATION: + return basicSetOperation(null, msgs); + case OpsemanticsviewPackage.RULE__OVERRIDEN_BY: + return ((InternalEList)getOverridenBy()).basicRemove(otherEnd, msgs); + case OpsemanticsviewPackage.RULE__OVERRIDES: + return basicSetOverrides(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case OpsemanticsviewPackage.RULE__CALLED_RULES: + return getCalledRules(); + case OpsemanticsviewPackage.RULE__OPERATION: + return getOperation(); + case OpsemanticsviewPackage.RULE__STEP_RULE: + return isStepRule(); + case OpsemanticsviewPackage.RULE__OVERRIDEN_BY: + return getOverridenBy(); + case OpsemanticsviewPackage.RULE__OVERRIDES: + if (resolve) return getOverrides(); + return basicGetOverrides(); + case OpsemanticsviewPackage.RULE__CONTAINING_CLASS: + if (resolve) return getContainingClass(); + return basicGetContainingClass(); + case OpsemanticsviewPackage.RULE__ABSTRACT: + return isAbstract(); + case OpsemanticsviewPackage.RULE__MAIN: + return isMain(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case OpsemanticsviewPackage.RULE__CALLED_RULES: + getCalledRules().clear(); + getCalledRules().addAll((Collection)newValue); + return; + case OpsemanticsviewPackage.RULE__OPERATION: + setOperation((EOperation)newValue); + return; + case OpsemanticsviewPackage.RULE__STEP_RULE: + setStepRule((Boolean)newValue); + return; + case OpsemanticsviewPackage.RULE__OVERRIDEN_BY: + getOverridenBy().clear(); + getOverridenBy().addAll((Collection)newValue); + return; + case OpsemanticsviewPackage.RULE__OVERRIDES: + setOverrides((Rule)newValue); + return; + case OpsemanticsviewPackage.RULE__CONTAINING_CLASS: + setContainingClass((EClass)newValue); + return; + case OpsemanticsviewPackage.RULE__ABSTRACT: + setAbstract((Boolean)newValue); + return; + case OpsemanticsviewPackage.RULE__MAIN: + setMain((Boolean)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case OpsemanticsviewPackage.RULE__CALLED_RULES: + getCalledRules().clear(); + return; + case OpsemanticsviewPackage.RULE__OPERATION: + setOperation((EOperation)null); + return; + case OpsemanticsviewPackage.RULE__STEP_RULE: + setStepRule(STEP_RULE_EDEFAULT); + return; + case OpsemanticsviewPackage.RULE__OVERRIDEN_BY: + getOverridenBy().clear(); + return; + case OpsemanticsviewPackage.RULE__OVERRIDES: + setOverrides((Rule)null); + return; + case OpsemanticsviewPackage.RULE__CONTAINING_CLASS: + setContainingClass((EClass)null); + return; + case OpsemanticsviewPackage.RULE__ABSTRACT: + setAbstract(ABSTRACT_EDEFAULT); + return; + case OpsemanticsviewPackage.RULE__MAIN: + setMain(MAIN_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case OpsemanticsviewPackage.RULE__CALLED_RULES: + return calledRules != null && !calledRules.isEmpty(); + case OpsemanticsviewPackage.RULE__OPERATION: + return operation != null; + case OpsemanticsviewPackage.RULE__STEP_RULE: + return stepRule != STEP_RULE_EDEFAULT; + case OpsemanticsviewPackage.RULE__OVERRIDEN_BY: + return overridenBy != null && !overridenBy.isEmpty(); + case OpsemanticsviewPackage.RULE__OVERRIDES: + return overrides != null; + case OpsemanticsviewPackage.RULE__CONTAINING_CLASS: + return containingClass != null; + case OpsemanticsviewPackage.RULE__ABSTRACT: + return abstract_ != ABSTRACT_EDEFAULT; + case OpsemanticsviewPackage.RULE__MAIN: + return main != MAIN_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (stepRule: "); + result.append(stepRule); + result.append(", abstract: "); + result.append(abstract_); + result.append(", main: "); + result.append(main); + result.append(')'); + return result.toString(); + } + +} //RuleImpl diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewAdapterFactory.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewAdapterFactory.java new file mode 100644 index 000000000..0a0886097 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewAdapterFactory.java @@ -0,0 +1,156 @@ +/** + */ +package opsemanticsview.util; + +import opsemanticsview.*; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * The Adapter Factory for the model. + * It provides an adapter createXXX method for each class of the model. + * + * @see opsemanticsview.OpsemanticsviewPackage + * @generated + */ +public class OpsemanticsviewAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + * + * + * @generated + */ + protected static OpsemanticsviewPackage modelPackage; + + /** + * Creates an instance of the adapter factory. + * + * + * @generated + */ + public OpsemanticsviewAdapterFactory() { + if (modelPackage == null) { + modelPackage = OpsemanticsviewPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + * + * This implementation returns true if the object is either the model's package or is an instance object of the model. + * + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the createXXX methods. + * + * + * @generated + */ + protected OpsemanticsviewSwitch modelSwitch = + new OpsemanticsviewSwitch() { + @Override + public Adapter caseOperationalSemanticsView(OperationalSemanticsView object) { + return createOperationalSemanticsViewAdapter(); + } + @Override + public Adapter caseRule(Rule object) { + return createRuleAdapter(); + } + @Override + public Adapter caseExecutionToASEntry(ExecutionToASEntry object) { + return createExecutionToASEntryAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the target. + * + * + * @param target the object to adapt. + * @return the adapter for the target. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link opsemanticsview.OperationalSemanticsView Operational Semantics View}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see opsemanticsview.OperationalSemanticsView + * @generated + */ + public Adapter createOperationalSemanticsViewAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link opsemanticsview.Rule Rule}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see opsemanticsview.Rule + * @generated + */ + public Adapter createRuleAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link opsemanticsview.ExecutionToASEntry Execution To AS Entry}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see opsemanticsview.ExecutionToASEntry + * @generated + */ + public Adapter createExecutionToASEntryAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + * + * This default implementation returns null. + * + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //OpsemanticsviewAdapterFactory diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewSwitch.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewSwitch.java new file mode 100644 index 000000000..2eebcc92f --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewSwitch.java @@ -0,0 +1,152 @@ +/** + */ +package opsemanticsview.util; + +import opsemanticsview.*; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; + +/** + * + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the caseXXX method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * + * @see opsemanticsview.OpsemanticsviewPackage + * @generated + */ +public class OpsemanticsviewSwitch extends Switch { + /** + * The cached model package + * + * + * @generated + */ + protected static OpsemanticsviewPackage modelPackage; + + /** + * Creates an instance of the switch. + * + * + * @generated + */ + public OpsemanticsviewSwitch() { + if (modelPackage == null) { + modelPackage = OpsemanticsviewPackage.eINSTANCE; + } + } + + /** + * Checks whether this is a switch for the given package. + * + * + * @param ePackage the package in question. + * @return whether this is a switch for the given package. + * @generated + */ + @Override + protected boolean isSwitchFor(EPackage ePackage) { + return ePackage == modelPackage; + } + + /** + * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * + * + * @return the first non-null result returned by a caseXXX call. + * @generated + */ + @Override + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW: { + OperationalSemanticsView operationalSemanticsView = (OperationalSemanticsView)theEObject; + T result = caseOperationalSemanticsView(operationalSemanticsView); + if (result == null) result = defaultCase(theEObject); + return result; + } + case OpsemanticsviewPackage.RULE: { + Rule rule = (Rule)theEObject; + T result = caseRule(rule); + if (result == null) result = defaultCase(theEObject); + return result; + } + case OpsemanticsviewPackage.EXECUTION_TO_AS_ENTRY: { + ExecutionToASEntry executionToASEntry = (ExecutionToASEntry)theEObject; + T result = caseExecutionToASEntry(executionToASEntry); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'Operational Semantics View'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Operational Semantics View'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseOperationalSemanticsView(OperationalSemanticsView object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Rule'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Rule'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseRule(Rule object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Execution To AS Entry'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Execution To AS Entry'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseExecutionToASEntry(ExecutionToASEntry object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + @Override + public T defaultCase(EObject object) { + return null; + } + +} //OpsemanticsviewSwitch From b6c6b53b2c1f1c3e4389e8a36a79f0437367b89b Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Mon, 3 Apr 2017 17:51:21 +0200 Subject: [PATCH 122/267] Add references to AS and exemetamodel in opsemanticsview MM --- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 3 +- .../K3OperationalSemanticsViewGenerator.xtend | 12 +- .../META-INF/MANIFEST.MF | 10 +- .../build.properties | 3 +- .../OperationalSemanticsViewGenerator.xtend | 1 + .../model/opsemanticsview.ecore | 3 + .../model/opsemanticsview.genmodel | 6 +- .../OperationalSemanticsView.java | 55 ++++++++ .../OpsemanticsviewPackage.java | 58 ++++++++- .../impl/OperationalSemanticsViewImpl.java | 123 ++++++++++++++++++ .../impl/OpsemanticsviewPackageImpl.java | 22 ++++ 12 files changed, 285 insertions(+), 13 deletions(-) diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF index 5dc428763..a9ec1d00e 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: K3 -Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen.k3 +Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen.k3;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: fr.inria.diverse.opsemanticsview.gen;bundle-version="1.0.0", diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties index 34d2e4d2d..e9863e281 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties @@ -1,4 +1,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + plugin.xml diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend index 996654727..4db56fd17 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend @@ -12,10 +12,9 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.emf.common.util.URI import org.eclipse.emf.ecore.EPackage import fr.inria.diverse.melange.metamodel.melange.Inheritance +import fr.inria.diverse.melange.metamodel.melange.LanguageOperator + -/** - * TODO: find which is the extended class! - */ class K3OperationalSemanticsViewGenerator implements OperationalSemanticsViewGenerator { override generate(Language language, IProject melangeProject) { @@ -29,9 +28,9 @@ class K3OperationalSemanticsViewGenerator implements OperationalSemanticsViewGen val executionMetamodel = executionMetamodelResource.contents.filter(EPackage).head - val inheritance = language.operators.findFirst[o|o instanceof Inheritance] + val LanguageOperator inheritance = language.operators.filter(Inheritance).head val abstractSyntax = if (inheritance != null) { - val asURI = URI.createURI(inheritance.owningLanguage.syntax.ecoreUri) + val asURI = URI.createURI(inheritance.getTargetLanguage().syntax.ecoreUri) val asResource = rs.getResource(asURI,true) asResource.contents.filter(EPackage).head } else { @@ -45,6 +44,9 @@ class K3OperationalSemanticsViewGenerator implements OperationalSemanticsViewGen val K3StepExtractor eventsgen = new K3StepExtractor(aspectClasses, selectedLanguage, executionMetamodel, result); eventsgen.generate(); + result.abstractSyntax = abstractSyntax + result.executionMetamodel = executionMetamodel + return result } diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF index 7025f65b8..5547fcb33 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF @@ -1,11 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Xmof -Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen.xmof +Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen.xmof;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, - org.eclipse.xtend.lib.macro + org.eclipse.xtend.lib.macro, + fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", + fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", + fr.inria.diverse.opsemanticsview.gen;bundle-version="1.0.0", + org.eclipse.core.resources;bundle-version="3.11.1", + org.modelexecution.xmof;bundle-version="1.0.0", + fr.inria.diverse.trace.commons;bundle-version="2.3.0" diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties index 34d2e4d2d..e9863e281 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties @@ -1,4 +1,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + plugin.xml diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend index c84285586..ced57f115 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend @@ -9,5 +9,6 @@ interface OperationalSemanticsViewGenerator { public def boolean canHandle(Language language, IProject melangeProject) public def OperationalSemanticsView generate(Language language, IProject melangeProject) + } diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.ecore b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.ecore index 0dd025c63..b6e4568a3 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.ecore +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.ecore @@ -10,6 +10,9 @@ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/> + + opsemanticsview.ecore @@ -11,6 +11,8 @@ + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java index 73b6d3619..64ecd7344 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java @@ -6,6 +6,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; /** @@ -21,6 +22,8 @@ *
  • {@link opsemanticsview.OperationalSemanticsView#getDynamicProperties Dynamic Properties}
    • *
  • {@link opsemanticsview.OperationalSemanticsView#getDynamicClasses Dynamic Classes}
    • *
  • {@link opsemanticsview.OperationalSemanticsView#getExecutionToASmapping Execution To ASmapping}
    • + *
  • {@link opsemanticsview.OperationalSemanticsView#getExecutionMetamodel Execution Metamodel}
    • + *
  • {@link opsemanticsview.OperationalSemanticsView#getAbstractSyntax Abstract Syntax}
    • * * * @see opsemanticsview.OpsemanticsviewPackage#getOperationalSemanticsView() @@ -92,4 +95,56 @@ public interface OperationalSemanticsView extends EObject { */ EList getExecutionToASmapping(); + /** + * Returns the value of the 'Execution Metamodel' reference. + * + *

    + * If the meaning of the 'Execution Metamodel' reference isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Execution Metamodel' reference. + * @see #setExecutionMetamodel(EPackage) + * @see opsemanticsview.OpsemanticsviewPackage#getOperationalSemanticsView_ExecutionMetamodel() + * @model required="true" + * @generated + */ + EPackage getExecutionMetamodel(); + + /** + * Sets the value of the '{@link opsemanticsview.OperationalSemanticsView#getExecutionMetamodel Execution Metamodel}' reference. + * + * + * @param value the new value of the 'Execution Metamodel' reference. + * @see #getExecutionMetamodel() + * @generated + */ + void setExecutionMetamodel(EPackage value); + + /** + * Returns the value of the 'Abstract Syntax' reference. + * + *

    + * If the meaning of the 'Abstract Syntax' reference isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Abstract Syntax' reference. + * @see #setAbstractSyntax(EPackage) + * @see opsemanticsview.OpsemanticsviewPackage#getOperationalSemanticsView_AbstractSyntax() + * @model + * @generated + */ + EPackage getAbstractSyntax(); + + /** + * Sets the value of the '{@link opsemanticsview.OperationalSemanticsView#getAbstractSyntax Abstract Syntax}' reference. + * + * + * @param value the new value of the 'Abstract Syntax' reference. + * @see #getAbstractSyntax() + * @generated + */ + void setAbstractSyntax(EPackage value); + } // OperationalSemanticsView diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java index f8bd7e118..6dc993962 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java @@ -102,6 +102,24 @@ public interface OpsemanticsviewPackage extends EPackage { */ int OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING = 3; + /** + * The feature id for the 'Execution Metamodel' reference. + * + * + * @generated + * @ordered + */ + int OPERATIONAL_SEMANTICS_VIEW__EXECUTION_METAMODEL = 4; + + /** + * The feature id for the 'Abstract Syntax' reference. + * + * + * @generated + * @ordered + */ + int OPERATIONAL_SEMANTICS_VIEW__ABSTRACT_SYNTAX = 5; + /** * The number of structural features of the 'Operational Semantics View' class. * @@ -109,7 +127,7 @@ public interface OpsemanticsviewPackage extends EPackage { * @generated * @ordered */ - int OPERATIONAL_SEMANTICS_VIEW_FEATURE_COUNT = 4; + int OPERATIONAL_SEMANTICS_VIEW_FEATURE_COUNT = 6; /** * The number of operations of the 'Operational Semantics View' class. @@ -321,6 +339,28 @@ public interface OpsemanticsviewPackage extends EPackage { */ EReference getOperationalSemanticsView_ExecutionToASmapping(); + /** + * Returns the meta object for the reference '{@link opsemanticsview.OperationalSemanticsView#getExecutionMetamodel Execution Metamodel}'. + * + * + * @return the meta object for the reference 'Execution Metamodel'. + * @see opsemanticsview.OperationalSemanticsView#getExecutionMetamodel() + * @see #getOperationalSemanticsView() + * @generated + */ + EReference getOperationalSemanticsView_ExecutionMetamodel(); + + /** + * Returns the meta object for the reference '{@link opsemanticsview.OperationalSemanticsView#getAbstractSyntax Abstract Syntax}'. + * + * + * @return the meta object for the reference 'Abstract Syntax'. + * @see opsemanticsview.OperationalSemanticsView#getAbstractSyntax() + * @see #getOperationalSemanticsView() + * @generated + */ + EReference getOperationalSemanticsView_AbstractSyntax(); + /** * Returns the meta object for class '{@link opsemanticsview.Rule Rule}'. * @@ -516,6 +556,22 @@ interface Literals { */ EReference OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING = eINSTANCE.getOperationalSemanticsView_ExecutionToASmapping(); + /** + * The meta object literal for the 'Execution Metamodel' reference feature. + * + * + * @generated + */ + EReference OPERATIONAL_SEMANTICS_VIEW__EXECUTION_METAMODEL = eINSTANCE.getOperationalSemanticsView_ExecutionMetamodel(); + + /** + * The meta object literal for the 'Abstract Syntax' reference feature. + * + * + * @generated + */ + EReference OPERATIONAL_SEMANTICS_VIEW__ABSTRACT_SYNTAX = eINSTANCE.getOperationalSemanticsView_AbstractSyntax(); + /** * The meta object literal for the '{@link opsemanticsview.impl.RuleImpl Rule}' class. * diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java index 789515157..3a81fd871 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java @@ -9,14 +9,17 @@ import opsemanticsview.OpsemanticsviewPackage; import opsemanticsview.Rule; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; @@ -35,6 +38,8 @@ *
  • {@link opsemanticsview.impl.OperationalSemanticsViewImpl#getDynamicProperties Dynamic Properties}
    • *
  • {@link opsemanticsview.impl.OperationalSemanticsViewImpl#getDynamicClasses Dynamic Classes}
    • *
  • {@link opsemanticsview.impl.OperationalSemanticsViewImpl#getExecutionToASmapping Execution To ASmapping}
    • + *
  • {@link opsemanticsview.impl.OperationalSemanticsViewImpl#getExecutionMetamodel Execution Metamodel}
    • + *
  • {@link opsemanticsview.impl.OperationalSemanticsViewImpl#getAbstractSyntax Abstract Syntax}
    • * * * @generated @@ -80,6 +85,26 @@ public class OperationalSemanticsViewImpl extends MinimalEObjectImpl.Container i */ protected EList executionToASmapping; + /** + * The cached value of the '{@link #getExecutionMetamodel() Execution Metamodel}' reference. + * + * + * @see #getExecutionMetamodel() + * @generated + * @ordered + */ + protected EPackage executionMetamodel; + + /** + * The cached value of the '{@link #getAbstractSyntax() Abstract Syntax}' reference. + * + * + * @see #getAbstractSyntax() + * @generated + * @ordered + */ + protected EPackage abstractSyntax; + /** * * @@ -147,6 +172,82 @@ public EList getExecutionToASmapping() { return executionToASmapping; } + /** + * + * + * @generated + */ + public EPackage getExecutionMetamodel() { + if (executionMetamodel != null && executionMetamodel.eIsProxy()) { + InternalEObject oldExecutionMetamodel = (InternalEObject)executionMetamodel; + executionMetamodel = (EPackage)eResolveProxy(oldExecutionMetamodel); + if (executionMetamodel != oldExecutionMetamodel) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_METAMODEL, oldExecutionMetamodel, executionMetamodel)); + } + } + return executionMetamodel; + } + + /** + * + * + * @generated + */ + public EPackage basicGetExecutionMetamodel() { + return executionMetamodel; + } + + /** + * + * + * @generated + */ + public void setExecutionMetamodel(EPackage newExecutionMetamodel) { + EPackage oldExecutionMetamodel = executionMetamodel; + executionMetamodel = newExecutionMetamodel; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_METAMODEL, oldExecutionMetamodel, executionMetamodel)); + } + + /** + * + * + * @generated + */ + public EPackage getAbstractSyntax() { + if (abstractSyntax != null && abstractSyntax.eIsProxy()) { + InternalEObject oldAbstractSyntax = (InternalEObject)abstractSyntax; + abstractSyntax = (EPackage)eResolveProxy(oldAbstractSyntax); + if (abstractSyntax != oldAbstractSyntax) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__ABSTRACT_SYNTAX, oldAbstractSyntax, abstractSyntax)); + } + } + return abstractSyntax; + } + + /** + * + * + * @generated + */ + public EPackage basicGetAbstractSyntax() { + return abstractSyntax; + } + + /** + * + * + * @generated + */ + public void setAbstractSyntax(EPackage newAbstractSyntax) { + EPackage oldAbstractSyntax = abstractSyntax; + abstractSyntax = newAbstractSyntax; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__ABSTRACT_SYNTAX, oldAbstractSyntax, abstractSyntax)); + } + /** * * @@ -179,6 +280,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { return getDynamicClasses(); case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING: return getExecutionToASmapping(); + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_METAMODEL: + if (resolve) return getExecutionMetamodel(); + return basicGetExecutionMetamodel(); + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__ABSTRACT_SYNTAX: + if (resolve) return getAbstractSyntax(); + return basicGetAbstractSyntax(); } return super.eGet(featureID, resolve, coreType); } @@ -208,6 +315,12 @@ public void eSet(int featureID, Object newValue) { getExecutionToASmapping().clear(); getExecutionToASmapping().addAll((Collection)newValue); return; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_METAMODEL: + setExecutionMetamodel((EPackage)newValue); + return; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__ABSTRACT_SYNTAX: + setAbstractSyntax((EPackage)newValue); + return; } super.eSet(featureID, newValue); } @@ -232,6 +345,12 @@ public void eUnset(int featureID) { case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING: getExecutionToASmapping().clear(); return; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_METAMODEL: + setExecutionMetamodel((EPackage)null); + return; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__ABSTRACT_SYNTAX: + setAbstractSyntax((EPackage)null); + return; } super.eUnset(featureID); } @@ -252,6 +371,10 @@ public boolean eIsSet(int featureID) { return dynamicClasses != null && !dynamicClasses.isEmpty(); case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING: return executionToASmapping != null && !executionToASmapping.isEmpty(); + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__EXECUTION_METAMODEL: + return executionMetamodel != null; + case OpsemanticsviewPackage.OPERATIONAL_SEMANTICS_VIEW__ABSTRACT_SYNTAX: + return abstractSyntax != null; } return super.eIsSet(featureID); } diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java index 0b0644b50..1a6c537ec 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java @@ -149,6 +149,24 @@ public EReference getOperationalSemanticsView_ExecutionToASmapping() { return (EReference)operationalSemanticsViewEClass.getEStructuralFeatures().get(3); } + /** + * + * + * @generated + */ + public EReference getOperationalSemanticsView_ExecutionMetamodel() { + return (EReference)operationalSemanticsViewEClass.getEStructuralFeatures().get(4); + } + + /** + * + * + * @generated + */ + public EReference getOperationalSemanticsView_AbstractSyntax() { + return (EReference)operationalSemanticsViewEClass.getEStructuralFeatures().get(5); + } + /** * * @@ -290,6 +308,8 @@ public void createPackageContents() { createEReference(operationalSemanticsViewEClass, OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_PROPERTIES); createEReference(operationalSemanticsViewEClass, OPERATIONAL_SEMANTICS_VIEW__DYNAMIC_CLASSES); createEReference(operationalSemanticsViewEClass, OPERATIONAL_SEMANTICS_VIEW__EXECUTION_TO_ASMAPPING); + createEReference(operationalSemanticsViewEClass, OPERATIONAL_SEMANTICS_VIEW__EXECUTION_METAMODEL); + createEReference(operationalSemanticsViewEClass, OPERATIONAL_SEMANTICS_VIEW__ABSTRACT_SYNTAX); ruleEClass = createEClass(RULE); createEReference(ruleEClass, RULE__CALLED_RULES); @@ -341,6 +361,8 @@ public void initializePackageContents() { initEReference(getOperationalSemanticsView_DynamicProperties(), ecorePackage.getEStructuralFeature(), null, "dynamicProperties", null, 0, -1, OperationalSemanticsView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getOperationalSemanticsView_DynamicClasses(), ecorePackage.getEClass(), null, "dynamicClasses", null, 0, -1, OperationalSemanticsView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getOperationalSemanticsView_ExecutionToASmapping(), this.getExecutionToASEntry(), null, "executionToASmapping", null, 0, -1, OperationalSemanticsView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOperationalSemanticsView_ExecutionMetamodel(), ecorePackage.getEPackage(), null, "executionMetamodel", null, 1, 1, OperationalSemanticsView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOperationalSemanticsView_AbstractSyntax(), ecorePackage.getEPackage(), null, "abstractSyntax", null, 0, 1, OperationalSemanticsView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(ruleEClass, Rule.class, "Rule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getRule_CalledRules(), this.getRule(), null, "calledRules", null, 0, -1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); From 82f3b01bc791ce0b973feafdf35775aeded64ac6 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Mon, 3 Apr 2017 17:52:45 +0200 Subject: [PATCH 123/267] Adapt code to switch to the new opsemantics metamodel --- .../META-INF/MANIFEST.MF | 4 +- .../plugin.xml | 1 - ...rse.trace.gemoc.generator.integration.exsd | 107 --------- .../GenericEngineTraceAddonGenerator.xtend | 17 +- .../TraceAddonGeneratorIntegration.xtend | 97 ++++---- ...donGeneratorIntegrationConfiguration.xtend | 31 --- .../META-INF/MANIFEST.MF | 4 +- .../TraceMMGenerationTraceability.xtend | 15 +- .../generator/TraceMMGenerator.xtend | 12 +- .../generator/TraceMMGeneratorStates.xtend | 97 ++++---- .../generator/TraceMMGeneratorSteps.xtend | 8 +- .../META-INF/MANIFEST.MF | 4 +- .../plugin/generator/ExtensionFilter.xtend | 221 +++++++++--------- .../GenericTracePluginGenerator.xtend | 52 ++--- ...GenericTraceConstructorGeneratorJava.xtend | 7 +- .../codegen/StateManagerGeneratorJava.xtend | 6 +- .../TraceConstructorGeneratorJava.xtend | 5 +- .../codegen/TraceExplorerGeneratorJava.xtend | 9 +- .../codegen/TraceExtractorGeneratorJava.xtend | 2 +- 19 files changed, 274 insertions(+), 425 deletions(-) delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/schema/fr.inria.diverse.trace.gemoc.generator.integration.exsd delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegrationConfiguration.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF index 11283d532..b9e25dd2a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF @@ -22,7 +22,9 @@ Require-Bundle: com.google.guava, fr.inria.diverse.melange.metamodel, org.eclipse.xtext.ui, org.eclipse.jdt.ui, - org.gemoc.xdsmlframework.api + org.gemoc.xdsmlframework.api, + fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", + fr.inria.diverse.opsemanticsview.gen;bundle-version="1.0.0" Export-Package: fr.inria.diverse.trace.gemoc.generator Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/plugin.xml b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/plugin.xml index 22bb577aa..5535690d3 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/plugin.xml +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/schema/fr.inria.diverse.trace.gemoc.generator.integration.exsd b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/schema/fr.inria.diverse.trace.gemoc.generator.integration.exsd deleted file mode 100644 index 2ff34d275..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/schema/fr.inria.diverse.trace.gemoc.generator.integration.exsd +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - [Enter description of this extension point.] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Allows meta languages to provide integration with the trace addon generation through an extraction of an execution extension. - - - - - - - - - - - - - - - - - - - - - - [Enter the first release in which this extension point appears.] - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index 5ef25474c..e971fb4db 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -10,16 +10,17 @@ *******************************************************************************/ package fr.inria.diverse.trace.gemoc.generator -import ecorext.Ecorext -import ecorext.Rule import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.commons.ManifestUtil import fr.inria.diverse.trace.commons.PluginXMLHelper import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability import fr.inria.diverse.trace.plugin.generator.GenericTracePluginGenerator +import java.util.HashSet import java.util.List import java.util.Set +import opsemanticsview.OperationalSemanticsView +import opsemanticsview.Rule import org.eclipse.core.resources.IFile import org.eclipse.core.resources.IProject import org.eclipse.core.runtime.IProgressMonitor @@ -27,20 +28,17 @@ import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EClassifier import org.eclipse.emf.ecore.EOperation -import org.eclipse.emf.ecore.EPackage import org.eclipse.jdt.core.IPackageFragment import org.eclipse.ui.PlatformUI import org.eclipse.xtend.lib.annotations.Accessors import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint import org.jdom2.Element import org.jdom2.filter.ElementFilter -import java.util.HashSet class GenericEngineTraceAddonGenerator { // Inputs - private val EPackage abstractSyntax // URI - private val Ecorext executionEcorExt // URI + private val OperationalSemanticsView executionEcorExt // URI private val String pluginName // Transient @@ -56,8 +54,7 @@ class GenericEngineTraceAddonGenerator { @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) IProject project - new(EPackage abstractSyntax, Ecorext executionEcorExt, String pluginName) { - this.abstractSyntax = abstractSyntax + new(OperationalSemanticsView executionEcorExt, String pluginName) { this.executionEcorExt = executionEcorExt this.pluginName = pluginName } @@ -85,7 +82,7 @@ class GenericEngineTraceAddonGenerator { public def void generateCompleteAddon(IProgressMonitor m) { // Generate trace plugin - val GenericTracePluginGenerator GenericTracePluginGenerator = new GenericTracePluginGenerator(abstractSyntax, executionEcorExt, + val GenericTracePluginGenerator GenericTracePluginGenerator = new GenericTracePluginGenerator(executionEcorExt, pluginName, true) GenericTracePluginGenerator.generate(m) @@ -222,7 +219,7 @@ public class «className» extends AbstractTraceAddon { private def Set potentialCallerClasses(EClass stepCallerClass) { val possibleCallerClasses = new HashSet - possibleCallerClasses.addAll(abstractSyntax.EClassifiers.filter(EClass)) + possibleCallerClasses.addAll(executionEcorExt.executionMetamodel.EClassifiers.filter(EClass)) possibleCallerClasses.addAll(traceability.allMutableClasses) val filtered = possibleCallerClasses.filter(EClass) .filter[c|c.equals(stepCallerClass)||c.EAllSuperTypes.contains(stepCallerClass)] diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend index f02cc59ec..ffb5e8ee5 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend @@ -10,30 +10,27 @@ *******************************************************************************/ package fr.inria.diverse.trace.gemoc.generator -import ecorext.Ecorext import fr.inria.diverse.melange.metamodel.melange.Language import fr.inria.diverse.melange.metamodel.melange.ModelTypingSpace import fr.inria.diverse.melange.ui.internal.MelangeActivator -import fr.inria.diverse.trace.commons.EMFUtil -import java.util.Set +import fr.inria.diverse.opsemanticsview.gen.OperationalSemanticsViewGenerator +import java.io.IOException +import opsemanticsview.OperationalSemanticsView import org.eclipse.core.resources.IFile +import org.eclipse.core.resources.IProject +import org.eclipse.core.resources.IResource +import org.eclipse.core.resources.ResourcesPlugin +import org.eclipse.core.resources.WorkspaceJob +import org.eclipse.core.runtime.CoreException import org.eclipse.core.runtime.IProgressMonitor +import org.eclipse.core.runtime.IStatus +import org.eclipse.core.runtime.Platform +import org.eclipse.core.runtime.Status import org.eclipse.emf.common.util.URI -import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.xtext.ui.resource.IResourceSetProvider import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper -import org.eclipse.core.runtime.Platform -import org.eclipse.core.resources.IProject -import org.eclipse.core.resources.ResourcesPlugin -import org.eclipse.core.resources.WorkspaceJob -import org.eclipse.core.runtime.IStatus -import org.eclipse.core.resources.IResource -import org.eclipse.core.runtime.Status -import org.eclipse.core.runtime.CoreException -import java.io.IOException /** * Plenty of ways to call the generator in an eclipse context. @@ -61,37 +58,58 @@ class TraceAddonGeneratorIntegration { val ModelTypingSpace root = resource.getContents().get(0) as ModelTypingSpace val Language selection = root.elements.filter(Language).findFirst[name == selectedLanguage] - // Get syntax - val ResourceSet rs = new ResourceSetImpl - val URI mmUri = URI.createURI(selection.syntax.ecoreUri) - //val URI mmUri = URI.createURI("platform:/resource/"+ root.name + "." + selection.name.toLowerCase + "/model/" + selection.name + ".ecore") - val Resource syntaxResource = EMFUtil.loadModelURI(mmUri, rs); - val Set syntax = syntaxResource.getContents().filter(EPackage).toSet +// // Get syntax +// val ResourceSet rs = new ResourceSetImpl +// val URI mmUri = URI.createURI(selection.syntax.ecoreUri) +// //val URI mmUri = URI.createURI("platform:/resource/"+ root.name + "." + selection.name.toLowerCase + "/model/" + selection.name + ".ecore") +// val Resource syntaxResource = EMFUtil.loadModelURI(mmUri, rs); +// val Set syntax = syntaxResource.getContents().filter(EPackage).toSet // Register all packages in registry // TODO remove them afterwards? - for (EPackage p : syntaxResource.allContents.filter(EPackage).toSet) - EPackage.Registry.INSTANCE.put(p.getNsURI(), p); +// for (EPackage p : syntaxResource.allContents.filter(EPackage).toSet) +// EPackage.Registry.INSTANCE.put(p.getNsURI(), p); + - // We find all extension points providing fr.inria.diverse.trace.gemoc.generator.integration - val config = Platform.getExtensionRegistry().getConfigurationElementsFor( - "fr.inria.diverse.trace.gemoc.generator.integration"); + // We find all extension points providing fr.inria.diverse.trace.gemoc.generator.integration + val configNew = Platform.getExtensionRegistry().getConfigurationElementsFor( + "fr.inria.diverse.opsemanticsview.gen"); // Using them, we instantiate TraceAddonGeneratorIntegrationConfiguration objects and look for one that can work with the current selected language - val TraceAddonGeneratorIntegrationConfiguration validIntegration = config.map [ e | + val OperationalSemanticsViewGenerator validViewGenerator = configNew.map [ e | e.createExecutableExtension("class") - ].filter(TraceAddonGeneratorIntegrationConfiguration).findFirst [ conf | - conf.canWorkWith(selection, melangeFile.project) + ].filter(OperationalSemanticsViewGenerator).findFirst [ conf | + conf.canHandle(selection, melangeFile.project) ] - - // If we find one, we generate - if (validIntegration != null) { - validIntegration.compute(selection, selectedLanguage, melangeFile.project, syntax, rs); - val Set executionMetamodel = validIntegration.executionMetamodel - val Ecorext mmextension = validIntegration.getExecutionExtension(); - generateAddon(selectedLanguage, pluginName, executionMetamodel, replace, monitor, mmextension) + + // If we find one, we generate + if (validViewGenerator != null) { + val OperationalSemanticsView mmextension = validViewGenerator.generate(selection, melangeFile.project); + generateAddon(selectedLanguage, pluginName, replace, monitor, mmextension) } // Otherwise, we error + + // TODO remove what is after +// +// // We find all extension points providing fr.inria.diverse.trace.gemoc.generator.integration +// val config = Platform.getExtensionRegistry().getConfigurationElementsFor( +// "fr.inria.diverse.trace.gemoc.generator.integration"); +// +// // Using them, we instantiate TraceAddonGeneratorIntegrationConfiguration objects and look for one that can work with the current selected language +// val TraceAddonGeneratorIntegrationConfiguration validIntegration = config.map [ e | +// e.createExecutableExtension("class") +// ].filter(TraceAddonGeneratorIntegrationConfiguration).findFirst [ conf | +// conf.canWorkWith(selection, melangeFile.project) +// ] +// +// // If we find one, we generate +// if (validIntegration != null) { +// validIntegration.compute(selection, selectedLanguage, melangeFile.project, syntax, rs); +// val Set executionMetamodel = validIntegration.executionMetamodel +// val OperationalSemanticsView mmextension = validIntegration.getExecutionExtension(); +// generateAddon(selectedLanguage, pluginName, executionMetamodel, replace, monitor, mmextension) +// +// } // Otherwise, we error else { throw new CoreException( new Status( @@ -107,8 +125,8 @@ class TraceAddonGeneratorIntegration { /** * Central operation of the class, that calls business operations */ - public static def void generateAddon(String mmName, String pluginName, Set inputMetamodel, - boolean replace, IProgressMonitor monitor, Ecorext executionExtension) throws CoreException { + public static def void generateAddon(String mmName, String pluginName, + boolean replace, IProgressMonitor monitor, OperationalSemanticsView executionExtension) throws CoreException { // We look for an existing project with this name val IProject existingProject = ResourcesPlugin.getWorkspace().getRoot().getProject(pluginName); @@ -142,10 +160,7 @@ class TraceAddonGeneratorIntegration { // Then we call all our business operations // TODO handle languages defined with multiple ecores - val EPackage extendedMetamodel = inputMetamodel.iterator().next(); - - val GenericEngineTraceAddonGenerator traceaddgen = new GenericEngineTraceAddonGenerator(extendedMetamodel, - executionExtension, pluginName); + val GenericEngineTraceAddonGenerator traceaddgen = new GenericEngineTraceAddonGenerator(executionExtension, pluginName); traceaddgen.generateCompleteAddon(monitor); } catch (IOException e) { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegrationConfiguration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegrationConfiguration.xtend deleted file mode 100644 index 0af15cbd9..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegrationConfiguration.xtend +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator - -import ecorext.Ecorext -import org.eclipse.core.resources.IProject -import java.util.Set -import org.eclipse.emf.ecore.EPackage -import fr.inria.diverse.melange.metamodel.melange.Language -import org.eclipse.emf.ecore.resource.ResourceSet - -interface TraceAddonGeneratorIntegrationConfiguration { - - def void compute(Language melangeLanguage, String languageName, IProject melangeProject, - Set abstractSyntax, ResourceSet rs) - - def Ecorext getExecutionExtension(); - - def boolean canWorkWith(Language melangeLanguage, IProject melangeProject) - - def Set getExecutionMetamodel() - -} \ No newline at end of file diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF index 3f2a8cd9c..427e6b587 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF @@ -7,13 +7,13 @@ Require-Bundle: org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, com.google.guava, org.eclipse.xtext.xbase.lib, - fr.inria.diverse.ecorext;bundle-version="0.1.0", org.eclipse.emf.ecore.xmi;bundle-version="2.10.1", fr.inria.diverse.trace.commons;bundle-version="1.0.0", org.eclipse.emf.codegen.ecore;bundle-version="2.10.2", org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0";visibility:=reexport + fr.inria.diverse.trace.commons.model;bundle-version="0.1.0";visibility:=reexport, + fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy Export-Package: fr.inria.diverse.trace.metamodel.generator, base, diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend index d6db8bb87..98e42c66c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend @@ -18,9 +18,9 @@ import java.util.HashSet import java.util.Map import java.util.HashMap import org.eclipse.emf.ecore.EStructuralFeature -import ecorext.Ecorext -import ecorext.Rule import org.eclipse.emf.ecore.EClassifier +import opsemanticsview.OperationalSemanticsView +import opsemanticsview.Rule /** * Second output of the transformation: a class both to access to parts @@ -29,15 +29,16 @@ import org.eclipse.emf.ecore.EClassifier */ class TraceMMGenerationTraceability { - new(TraceMMExplorer traceMMExplorer, Ecorext mmext) { + new(TraceMMExplorer traceMMExplorer, OperationalSemanticsView mmext) { this.traceMMExplorer = traceMMExplorer this.mmext = mmext } @Accessors(PUBLIC_GETTER, PACKAGE_SETTER) private val TraceMMExplorer traceMMExplorer + @Accessors(PUBLIC_GETTER, PACKAGE_SETTER) - private val Ecorext mmext + private val OperationalSemanticsView mmext private Set runtimeClasses = new HashSet @@ -106,11 +107,7 @@ class TraceMMGenerationTraceability { } public def Set getNewClasses() { - val Set newClasses = new HashSet - for (p : mmext.newPackages) { - newClasses.addAll(p.eAllContents.filter(EClass).toSet) - } - return newClasses + return mmext.dynamicClasses.toSet } public def boolean hasTracedClass(EClass mutableClass) { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend index 8f4b63165..8d5d6fccd 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend @@ -19,19 +19,18 @@ import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl import org.eclipse.xtend.lib.annotations.Accessors -import ecorext.Ecorext import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.util.Diagnostician import org.eclipse.emf.common.util.Diagnostic import java.util.Set import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import fr.inria.diverse.trace.commons.EcoreCraftingUtil +import opsemanticsview.OperationalSemanticsView class TraceMMGenerator { // Inputs - private val Ecorext mmext - private val EPackage mm + private val OperationalSemanticsView mmext private val ResourceSet rs private val String languageName private val boolean gemoc @@ -45,15 +44,14 @@ class TraceMMGenerator { private var boolean done = false - new(Ecorext mmext, EPackage mm, boolean gemoc) { + new(OperationalSemanticsView mmext, boolean gemoc) { // Storing inputs this.mmext = mmext - this.mm = mm this.gemoc = gemoc // Create name of the trace metamodel - languageName = mm.name.replaceAll(" ", "") + "Trace" + languageName = mmext.executionMetamodel.name.replaceAll(" ", "") + "Trace" // Creating resource set to work with this.rs = new ResourceSetImpl() @@ -87,7 +85,7 @@ class TraceMMGenerator { public def void computeAllMaterial() throws IOException { if (!done) { - val statesGen = new TraceMMGeneratorStates(mmext, mm, traceability, traceMMExplorer, languageName, + val statesGen = new TraceMMGeneratorStates(mmext, traceability, traceMMExplorer, languageName, tracemmresult, gemoc) statesGen.process diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index f978c82bb..a3c540284 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -4,14 +4,12 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Inria - initial API and implementation *******************************************************************************/ package fr.inria.diverse.trace.metamodel.generator -import ecorext.ClassExtension -import ecorext.Ecorext import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.commons.ExecutionMetamodelTraceability import java.util.ArrayList @@ -28,12 +26,12 @@ import org.eclipse.emf.ecore.EcoreFactory import org.eclipse.emf.ecore.util.EcoreUtil import static fr.inria.diverse.trace.commons.EcoreCraftingUtil.* +import opsemanticsview.OperationalSemanticsView class TraceMMGeneratorStates { // Inputs - private val Ecorext mmext - private val EPackage mm + private val OperationalSemanticsView mmext private val TraceMMExplorer traceMMExplorer private val String languageName private val boolean gemoc @@ -47,12 +45,10 @@ class TraceMMGeneratorStates { private val Set allRuntimeClasses = new HashSet private val Set allStaticClasses = new HashSet private val Set allNewEClasses - private val Map runtimeClass2ClassExtension = new HashMap private val Set multipleOrig = new HashSet - new(Ecorext mmext, EPackage mm, TraceMMGenerationTraceability traceability, TraceMMExplorer traceMMExplorer, - String languageName, EPackage tracemmresult, boolean gemoc) { - this.mm = mm + new(OperationalSemanticsView mmext,TraceMMGenerationTraceability traceability, + TraceMMExplorer traceMMExplorer, String languageName, EPackage tracemmresult, boolean gemoc) { this.mmext = mmext this.allNewEClasses = mmext.eAllContents.toSet.filter(EClass).toSet this.traceability = traceability @@ -106,10 +102,11 @@ class TraceMMGeneratorStates { return result } - private def String computeTraceabilityAnnotationValue(ClassExtension classExtension) { + private def String computeTraceabilityAnnotationValue(EClass extendedClass) { var String traceabilityAnnotationValue = null; - if (!classExtension.newProperties.empty) { - val mutableProperty = classExtension.newProperties.get(0); + val dynamicProperties = extendedClass.EStructuralFeatures.filter[f|mmext.dynamicProperties.contains(f)].toSet + if (!dynamicProperties.empty) { + val mutableProperty = dynamicProperties.get(0); val String mutablePropertyTraceabilityValue = ExecutionMetamodelTraceability. getTraceabilityAnnotationValue(mutableProperty) if (mutablePropertyTraceabilityValue != null) { @@ -132,17 +129,17 @@ class TraceMMGeneratorStates { private def Set getSubTypesOf(EClass c) { val result = new HashSet - for (someEClass : mm.eAllContents.toSet.filter(EClass)) { + for (someEClass : mmext.executionMetamodel.eAllContents.toSet.filter(EClass)) { if (someEClass.ESuperTypes.contains(c)) { result.add(someEClass) } } return result } - + private def boolean isXmofConfClassOf(EClass c, EClass s) { if (c.name.endsWith("Configuration") && c.name.startsWith(s.name)) { - traceability.addXmofExeToConf(s,c) + traceability.addXmofExeToConf(s, c) return true } return false @@ -152,7 +149,7 @@ class TraceMMGeneratorStates { if (!result.contains(c)) { result.add(c) for (sup : c.ESuperTypes // TODO ugly fix to not include AS classes in the XMOF case, to remove at some point - .filter[s|! isXmofConfClassOf(c,s)]) { + .filter[s|! isXmofConfClassOf(c, s)]) { getAllInheritance(result, sup) } for (sub : getSubTypesOf(c)) { @@ -170,31 +167,31 @@ class TraceMMGeneratorStates { private def void handleTraceClasses() { // First we find ALL classes linked to runtime properties - for (c : mmext.classesExtensions) { - val extendedExistingClass = c.extendedExistingClass + for (dp : mmext.dynamicProperties) { + val extendedExistingClass = dp.EContainingClass allRuntimeClasses.add(extendedExistingClass) - runtimeClass2ClassExtension.put(extendedExistingClass, c) val allInheritance = getAllInheritance(extendedExistingClass) allRuntimeClasses.addAll(allInheritance) } - + val baseClassToNewEClass = new HashMap - + for (c : allNewEClasses) { - baseClassToNewEClass.put(mm.eAllContents.toSet.filter(EClass).findFirst[cls|cls.name == c.name], c) + baseClassToNewEClass.put(mmext.executionMetamodel.eAllContents.toSet.filter(EClass).findFirst[cls|cls.name == c.name], c) } - + for (c : allNewEClasses) { - val allInheritance = getAllInheritance(mm.eAllContents.toSet.filter(EClass).findFirst[cls|cls.name == c.name]) - allRuntimeClasses.addAll(allInheritance.map[cls| - val newEClass = baseClassToNewEClass.get(cls) - if (newEClass == null) cls - else newEClass + val allInheritance = getAllInheritance(mmext.executionMetamodel.eAllContents.toSet.filter(EClass).findFirst [cls| + cls.name == c.name + ]) + allRuntimeClasses.addAll(allInheritance.map [ cls | + val newEClass = baseClassToNewEClass.get(cls) + if(newEClass == null) cls else newEClass ]) } // We also store the dual set of classes not linked to anything dynamic - allStaticClasses.addAll(mm.eAllContents.toSet.filter(EClass).filter[c|!allRuntimeClasses.contains(c)]) + allStaticClasses.addAll(mmext.executionMetamodel.eAllContents.toSet.filter(EClass).filter[c|!allRuntimeClasses.contains(c)]) // Here we find classes that inherit from multiple concrete classes // This allows later to handle multiple non-conflicting "originalObject" references in such cases @@ -219,7 +216,7 @@ class TraceMMGeneratorStates { // If the xmof conf metamodel still has references to the AS, we replace by refs to the conf metamodel if (traceability.xmofExeToConf.containsKey(runtimeClass)) return handleTraceClass(traceability.xmofExeToConf.get(runtimeClass)) - + if (!allRuntimeClasses.contains(runtimeClass)) return runtimeClass @@ -239,10 +236,10 @@ class TraceMMGeneratorStates { val tracedSuperType = handleTraceClass(superType) tracedClass.ESuperTypes.add(tracedSuperType) } - + val boolean notNewClass = !allNewEClasses.contains(runtimeClass) val boolean notAbstract = !tracedClass.abstract - + // Adding the SpecificTracedObject super type if (tracedClass.ESuperTypes.empty) { val tracedObjectGenericSuperType = EcoreFactory.eINSTANCE.createEGenericType @@ -254,15 +251,15 @@ class TraceMMGeneratorStates { dimensionClassTracedObjectTypeBinding.ETypeArguments.add(EcoreFactory.eINSTANCE.createEGenericType) tracedClass.EGenericSuperTypes.add(tracedObjectGenericSuperType) } - + // We recreate the same package organization val tracedPackage = obtainTracedPackage(runtimeClass.EPackage) tracedPackage.EClassifiers.add(tracedClass) // If this is a class extension, then we add a reference, to be able to refer to the element of the original model (if originally static element of the model) - if (notNewClass && runtimeClass2ClassExtension.containsKey(runtimeClass)) { - val traceabilityAnnotationValue = computeTraceabilityAnnotationValue( - runtimeClass2ClassExtension.get(runtimeClass)); + val dynamicProperties = runtimeClass.EStructuralFeatures.filter[f|mmext.dynamicProperties.contains(f)] + if (notNewClass && !dynamicProperties.empty) { + val traceabilityAnnotationValue = computeTraceabilityAnnotationValue(runtimeClass); if (traceabilityAnnotationValue != null) ExecutionMetamodelTraceability.createTraceabilityAnnotation(tracedClass, traceabilityAnnotationValue); @@ -293,15 +290,13 @@ class TraceMMGeneratorStates { // refTraceClassToTracedClass.upperBound = -1 // refTraceClassToTracedClass.lowerBound = 0 // } - // Then going through all properties for the remaining generation var Set runtimeProperties = new HashSet if (allNewEClasses.contains(runtimeClass)) runtimeProperties.addAll(runtimeClass.EStructuralFeatures) else { - val classExtension = runtimeClass2ClassExtension.get(runtimeClass) - if (classExtension != null) { - runtimeProperties.addAll(classExtension.newProperties); + if (!dynamicProperties.empty) { + runtimeProperties.addAll(dynamicProperties); } // for (c2 : mmext.classesExtensions) { // if(c2.extendedExistingClass == runtimeClass) { @@ -322,7 +317,7 @@ class TraceMMGeneratorStates { // Storing traceability stuff traceability.addMutableProperty(runtimeClass, runtimeProperty) - //------------ Value class + // ------------ Value class val valueClass = EcoreFactory.eINSTANCE.createEClass valueClass.name = TraceMMStrings.class_createStateClassName(runtimeClass, runtimeProperty) @@ -335,7 +330,7 @@ class TraceMMGeneratorStates { copiedProperty.derived = false copiedProperty.changeable = true copiedProperty.volatile = false - + // The value class inherits the SpecificReferenceValue abstract class val valueGenericSuperType = EcoreFactory.eINSTANCE.createEGenericType valueGenericSuperType.EClassifier = traceMMExplorer.specificReferenceValueClass @@ -350,13 +345,13 @@ class TraceMMGeneratorStates { } valueClass.EStructuralFeatures.add(copiedProperty) traceMMExplorer.statesPackage.EClassifiers.add(valueClass) - - traceability.putMutablePropertyToValueProperty(runtimeProperty,copiedProperty) + + traceability.putMutablePropertyToValueProperty(runtimeProperty, copiedProperty) ExecutionMetamodelTraceability.createTraceabilityAnnotation(valueClass, ExecutionMetamodelTraceability.getTraceabilityAnnotationValue(runtimeProperty)) - //------------ Dimension class + // ------------ Dimension class val dimensionClass = EcoreFactory.eINSTANCE.createEClass dimensionClass.name = TraceMMStrings.class_createDimensionClassName(runtimeClass, runtimeProperty) // The dimension class inherits the SpecificDimension abstract class @@ -368,17 +363,16 @@ class TraceMMGeneratorStates { dimensionTypeBinding.EClassifier = valueClass dimensionClass.EGenericSuperTypes.add(dimensionGenericSuperType) traceMMExplorer.statesPackage.EClassifiers.add(dimensionClass) - - val dimensionRef = addReferenceToClass(tracedClass, - dimensionClass.name.toFirstLower, dimensionClass) + + val dimensionRef = addReferenceToClass(tracedClass, dimensionClass.name.toFirstLower, dimensionClass) dimensionRef.containment = true dimensionRef.lowerBound = 0 dimensionRef.upperBound = 1 dimensionsGetters.add(EcoreCraftingUtil.stringGetter(dimensionRef)) - + traceability.putDimensionClass(runtimeProperty, dimensionClass) traceability.putDimensionRef(runtimeProperty, dimensionRef) - + traceability.putValueClass(runtimeProperty, valueClass) } val getDimensionsInternal = EcoreFactory.eINSTANCE.createEOperation @@ -397,12 +391,11 @@ class TraceMMGeneratorStates { final EList> result = new org.eclipse.emf.ecore.util.BasicInternalEList>(Object.class); result.addAll(super.getDimensionsInternal()); «FOR getter : dimensionsGetters» - result.add(«getter»); + result.add(«getter»); «ENDFOR» return result; ''') tracedClass.EOperations.add(getDimensionsInternal) - return tracedClass } else { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend index ce579e867..947fc87ad 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend @@ -10,8 +10,6 @@ *******************************************************************************/ package fr.inria.diverse.trace.metamodel.generator -import ecorext.Ecorext -import ecorext.Rule import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.commons.tracemetamodel.StepStrings import java.util.HashMap @@ -27,11 +25,13 @@ import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EcoreFactory import static fr.inria.diverse.trace.commons.EcoreCraftingUtil.* +import opsemanticsview.OperationalSemanticsView +import opsemanticsview.Rule class TraceMMGeneratorSteps { // Inputs - private val Ecorext mmext + private val OperationalSemanticsView mmext private val TraceMMExplorer traceMMExplorer private val boolean gemoc @@ -46,7 +46,7 @@ class TraceMMGeneratorSteps { // Constant private static val String GET_CALLER_OPERATION_NAME = "getCaller"; - new(Ecorext mmext, EPackage tracemmresult, TraceMMGenerationTraceability traceability, + new(OperationalSemanticsView mmext, EPackage tracemmresult, TraceMMGenerationTraceability traceability, TraceMMExplorer traceMMExplorer, boolean gemoc) { this.traceability = traceability this.tracemmresult = tracemmresult diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF index 3b044e37d..9c4e8ba37 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF @@ -19,11 +19,11 @@ Require-Bundle: com.google.guava, org.eclipse.emf.converter;bundle-version="2.7.0", org.eclipse.emf.importer, fr.inria.diverse.trace.commons;bundle-version="1.0.0", - fr.inria.diverse.ecorext;bundle-version="0.1.0", org.eclipse.jdt.core;bundle-version="3.10.0", fr.inria.diverse.trace.annotations;bundle-version="0.1.0", org.eclipse.emf.codegen.ecore.ui, - org.eclipse.core.expressions;bundle-version="3.4.600" + org.eclipse.core.expressions;bundle-version="3.4.600", + fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0" Export-Package: fr.inria.diverse.trace.plugin.generator, fr.inria.diverse.trace.plugin.generator.clean Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend index 37a99170c..60b12e7c8 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend @@ -4,21 +4,19 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Inria - initial API and implementation *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator -import ecorext.ClassExtension -import ecorext.Ecorext -import ecorext.Rule import fr.inria.diverse.trace.commons.EcoreCraftingUtil import java.util.HashSet import java.util.Set +import opsemanticsview.OperationalSemanticsView +import opsemanticsview.Rule import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EObject -import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature import org.eclipse.xtend.lib.annotations.Accessors @@ -36,7 +34,7 @@ class ExtensionFilter { val Set chosenProperties // Input / Output - val Ecorext executionExtension + val OperationalSemanticsView executionExtension // Output @Accessors(PUBLIC_GETTER,PRIVATE_SETTER) @@ -47,7 +45,8 @@ class ExtensionFilter { val Set retainedProperties = new HashSet val Set retainedRules = new HashSet - new(Ecorext executionExtension, Set chosenClasses, Set chosenProperties) { + new(OperationalSemanticsView executionExtension, Set chosenClasses, + Set chosenProperties) { if (chosenClasses != null) this.chosenClasses = chosenClasses else @@ -68,45 +67,38 @@ class ExtensionFilter { EcoreCraftingUtil.getFQN(p.EContainingClass, ".") + "." + p.name ].toSet - // First pass, we find everything to retain - for (element : executionExtension.eAllContents.toSet) { - if (element instanceof EClass) { - val fqn = EcoreCraftingUtil.getFQN(element, ".") - if (chosenClassesFQNs.contains(fqn)) { - retainedClasses.add(element) - retainedClasses.addAll((element)) - retainedProperties.addAll(element.EStructuralFeatures) + for (element : executionExtension.dynamicClasses) { + val fqn = EcoreCraftingUtil.getFQN(element, ".") + if (chosenClassesFQNs.contains(fqn)) { + retainedClasses.add(element) + retainedClasses.addAll((element)) + retainedProperties.addAll(element.EStructuralFeatures) + } + } + + for (element : executionExtension.dynamicProperties) { + val fqn = EcoreCraftingUtil.getFQN(element.EContainingClass, ".") + "." + element.name + if (chosenPropertiesFQNs.contains(fqn)) { + retainedProperties.add(element) + retainedClasses.add(element.EContainingClass) + retainedClasses.addAll((element.EContainingClass)) + if (element instanceof EReference) { + retainedClasses.add(element.EReferenceType) + retainedClasses.addAll((element.EReferenceType)) } + } + } - } else if (element instanceof EStructuralFeature) { - val container = element.eContainer - val EClass class = if (container instanceof ClassExtension) { - container.extendedExistingClass - } else if (container instanceof EClass) { - container - } - val fqn = EcoreCraftingUtil.getFQN(class, ".") + "." + element.name - if (chosenPropertiesFQNs.contains(fqn)) { - retainedProperties.add(element) - retainedClasses.add(class) - retainedClasses.addAll((class)) - if (element instanceof EReference) { - retainedClasses.add(element.EReferenceType) - retainedClasses.addAll((element.EReferenceType)) - } + for (element : executionExtension.rules) { + if (element.stepRule) { + retainedRules.add(element) + for (paramClass : element.operation.EParameters.map[p|p.EType].filter(EClass)) { + retainedClasses.add(paramClass) } - } else if (element instanceof Rule) { - if (element.stepRule) { - retainedRules.add(element) - for (paramClass : element.operation.EParameters.map[p|p.EType].filter(EClass)) { - retainedClasses.add(paramClass) - } - if (element.operation.EType instanceof EClass) { - retainedClasses.add(element.operation.EType as EClass) - } - retainedClasses.add(element.containingClass) + if (element.operation.EType instanceof EClass) { + retainedClasses.add(element.operation.EType as EClass) } - + retainedClasses.add(element.containingClass) } } @@ -130,17 +122,17 @@ class ExtensionFilter { } } - // Second hack: if some leaf class is abstract, we make it concrete - for (c : retainedClasses.filter[abstract]) { - val subClasses = retainedClasses.filter[c2|c2.ESuperTypes.contains(c)] - if (subClasses.empty) - c.abstract = false - } - - // Remove super types that are not retained - for (c : retainedClasses) { - c.ESuperTypes.removeIf([c2|!retainedClasses.contains(c2)]) - } +// // Second hack: if some leaf class is abstract, we make it concrete +// for (c : retainedClasses.filter[abstract]) { +// val subClasses = retainedClasses.filter[c2|c2.ESuperTypes.contains(c)] +// if (subClasses.empty) +// c.abstract = false +// } +// +// // Remove super types that are not retained +// for (c : retainedClasses) { +// c.ESuperTypes.removeIf([c2|!retainedClasses.contains(c2)]) +// } // Remove refs to other rules that are not retained for (r : retainedRules) { @@ -191,7 +183,7 @@ class ExtensionFilter { for (s : origin.calledRules) { val containedSoFarNext = containedSoFar && mustBeContainedIn.contains(s) - val interResult = fr.inria.diverse.trace.plugin.generator.ExtensionFilter.findCallPaths(s, destination, + val interResult = ExtensionFilter.findCallPaths(s, destination, mustBeContainedIn, visited, containedSoFarNext) result.addAll(interResult) } @@ -214,69 +206,66 @@ class ExtensionFilter { } private def Set tryRemove(EObject element) { - val removedElements = new HashSet - if (element instanceof EClass) { - if (!retainedClasses.contains(element)) { - didFilterSomething = true - val package = element.EPackage - package.EClassifiers.remove(element) - removedElements.add(element) - val removedAgain = cleanEPackage(package) - removedElements.addAll(removedAgain) - } - } else if (element instanceof EStructuralFeature) { - if (!retainedProperties.contains(element)) { - didFilterSomething = true - val container = element.eContainer - if (container instanceof ClassExtension) { - container.newProperties.remove(element) - removedElements.add(element) - if (container.newProperties.empty) { - executionExtension.classesExtensions.remove(container) - removedElements.add(container) - } - } else if (container instanceof EClass) { - container.EStructuralFeatures.remove(element) - removedElements.add(element) - } - } - } else if (element instanceof Rule) { - if (!retainedRules.contains(element)) { - executionExtension.rules.remove(element) - removedElements.add(element) - for (r : executionExtension.rules) { - r.calledRules.remove(element) - if (r.overrides == element) - r.overrides = null - r.overridenBy.remove(element) - } - } - } - return removedElements +// val removedElements = new HashSet +// if (element instanceof EClass) { +// if (!retainedClasses.contains(element)) { +// didFilterSomething = true +// val package = element.EPackage +// package.EClassifiers.remove(element) +// removedElements.add(element) +// val removedAgain = cleanEPackage(package) +// removedElements.addAll(removedAgain) +// } +// } else if (element instanceof EStructuralFeature) { +// if (!retainedProperties.contains(element)) { +// didFilterSomething = true +// val container = element.eContainer +// if (container instanceof ClassExtension) { +// container.newProperties.remove(element) +// removedElements.add(element) +// if (container.newProperties.empty) { +// executionExtension.classesExtensions.remove(container) +// removedElements.add(container) +// } +// } else if (container instanceof EClass) { +// container.EStructuralFeatures.remove(element) +// removedElements.add(element) +// } +// } +// } else if (element instanceof Rule) { +// if (!retainedRules.contains(element)) { +// executionExtension.rules.remove(element) +// removedElements.add(element) +// for (r : executionExtension.rules) { +// r.calledRules.remove(element) +// if (r.overrides == element) +// r.overrides = null +// r.overridenBy.remove(element) +// } +// } +// } +// return removedElements } - private def Set cleanEPackage(EPackage p) { - val removedElements = new HashSet - if (p != null) { - if (p.EClassifiers.empty && p.ESubpackages.empty) { - val container = p.eContainer - if (container != null) { - if (container instanceof EPackage) { - container.ESubpackages.remove(p) - removedElements.add(p) - val removedAgain = cleanEPackage(container) - removedElements.addAll(removedAgain) - } else if (container instanceof Ecorext) { - container.newPackages.remove(p) - removedElements.add(p) - } - } - } - } - return removedElements - } - -// private def Set getAllSubtypesOf(EClass cl) { -// return executionExtension.eAllContents.toSet.filter(EClass).filter[c|c.EAllSuperTypes.contains(cl)].toSet +// private def Set cleanEPackage(EPackage p) { +// val removedElements = new HashSet +// if (p != null) { +// if (p.EClassifiers.empty && p.ESubpackages.empty) { +// val container = p.eContainer +// if (container != null) { +// if (container instanceof EPackage) { +// container.ESubpackages.remove(p) +// removedElements.add(p) +// val removedAgain = cleanEPackage(container) +// removedElements.addAll(removedAgain) +// } else if (container instanceof Ecorext) { +// container.newPackages.remove(p) +// removedElements.add(p) +// } +// } +// } +// } +// return removedElements // } + } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend index ba36949eb..ebb6cfeb6 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend @@ -10,7 +10,7 @@ *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator -import ecorext.Ecorext +import opsemanticsview.OperationalSemanticsView import fr.inria.diverse.trace.commons.EclipseUtil import fr.inria.diverse.trace.commons.ManifestUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability @@ -41,8 +41,7 @@ import tracingannotations.TracingAnnotations class GenericTracePluginGenerator { // Inputs - private val EPackage abstractSyntax // EcoreURI - private val Ecorext executionEcorExt // URI + private val OperationalSemanticsView executionEcorExt // URI private val String pluginName private val boolean gemoc @@ -77,23 +76,22 @@ class GenericTracePluginGenerator { @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) var Set referencedGenPackages - new(EPackage abstractSyntax, Ecorext executionEcorExt, String pluginName, boolean gemoc) { + new(OperationalSemanticsView executionEcorExt, String pluginName, boolean gemoc) { - this.abstractSyntax = abstractSyntax this.executionEcorExt = executionEcorExt this.pluginName = pluginName this.packageQN = pluginName + ".tracemanager" this.gemoc = gemoc // Given a file XXX.ecore, we try to find a model containing tracing annotations in XXX.tracingannotations - try { - val rs = new ResourceSetImpl - val uri = abstractSyntax.eResource.URI.trimFileExtension.appendFileExtension("tracingannotations") - val resource = rs.createResource(uri) - resource.load(null) - this.tracingAnnotations = resource.contents.head as TracingAnnotations - } catch (Throwable e) { - } +// try { +// val rs = new ResourceSetImpl +// val uri = abstractSyntax.eResource.URI.trimFileExtension.appendFileExtension("tracingannotations") +// val resource = rs.createResource(uri) +// resource.load(null) +// this.tracingAnnotations = resource.contents.head as TracingAnnotations +// } catch (Throwable e) { +// } } def void generate() { @@ -112,23 +110,23 @@ class GenericTracePluginGenerator { } def void generate(IProgressMonitor m) { - tracedLanguageName = abstractSyntax.name - languageName = abstractSyntax.name.replaceAll(" ", "") + "Trace" + tracedLanguageName = executionEcorExt.executionMetamodel.name + languageName = tracedLanguageName.replaceAll(" ", "") + "Trace" var partialTraceManagement = false - - if (tracingAnnotations != null) { - var Set classesToTrace = new HashSet - var Set propertiesToTrace = new HashSet - classesToTrace.addAll(tracingAnnotations.classestoTrace) - propertiesToTrace.addAll(tracingAnnotations.propertiesToTrace) - val filter = new ExtensionFilter(executionEcorExt, classesToTrace, propertiesToTrace) - filter.execute() - partialTraceManagement = filter.didFilterSomething - } +//TODO disabled for now, the whole approach must be adapted since Ecorext is not used anymore +// if (tracingAnnotations != null) { +// var Set classesToTrace = new HashSet +// var Set propertiesToTrace = new HashSet +// classesToTrace.addAll(tracingAnnotations.classestoTrace) +// propertiesToTrace.addAll(tracingAnnotations.propertiesToTrace) +// val filter = new ExtensionFilter(executionEcorExt, classesToTrace, propertiesToTrace) +// filter.execute() +// partialTraceManagement = filter.didFilterSomething +// } // Generate trace metamodel - val TraceMMGenerator tmmgenerator = new TraceMMGenerator(executionEcorExt, abstractSyntax, gemoc) + val TraceMMGenerator tmmgenerator = new TraceMMGenerator(executionEcorExt, gemoc) tmmgenerator.computeAllMaterial tmmgenerator.sortResult val EPackage tracemm = tmmgenerator.tracemmresult @@ -176,7 +174,7 @@ class GenericTracePluginGenerator { // Generate trace constructor val TraceConstructorGeneratorJava tconstructorgen = new TraceConstructorGeneratorJava(languageName, pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, - abstractSyntax, partialTraceManagement) + executionEcorExt.executionMetamodel, partialTraceManagement) traceConstructorClassName = tconstructorgen.className packageFragment.createCompilationUnit(traceConstructorClassName + ".java", tconstructorgen.generateCode, true, m) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend index d949faa6e..35ea65f9b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend @@ -10,8 +10,6 @@ *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.codegen -import ecorext.ClassExtension -import ecorext.Rule import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage @@ -35,6 +33,7 @@ import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature import org.eclipse.emf.ecore.EcorePackage +import opsemanticsview.Rule class GenericTraceConstructorGeneratorJava { @@ -361,7 +360,9 @@ class GenericTraceConstructorGeneratorJava { } private def String stringFeatureID(EStructuralFeature p) { - val containingClass = if (p.eContainer instanceof EClass) p.eContainer as EClassifier else (p.eContainer as ClassExtension).extendedExistingClass + val containingClass = + if (p.eContainer instanceof EClass) + p.eContainer as EClassifier return EcoreCraftingUtil.stringFeatureID(p,containingClass,refGenPackages) } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend index 88221872e..03dcc914a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend @@ -10,7 +10,6 @@ *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.codegen -import ecorext.ClassExtension import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability @@ -22,6 +21,7 @@ import org.eclipse.emf.ecore.EClassifier import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature +import opsemanticsview.OperationalSemanticsView class StateManagerGeneratorJava { @@ -187,8 +187,8 @@ class StateManagerGeneratorJava { «val EClass valueClass = traceability.getValueClass(p)» if (value instanceof «getJavaFQN(valueClass)») { final «getJavaFQN(tracedObjectClass)» tracedObject = («getJavaFQN(tracedObjectClass)») value.eContainer().eContainer(); - «IF p.eContainer instanceof ClassExtension» - «val extendedClass = (p.eContainer as ClassExtension).extendedExistingClass» + «IF traceability.newClasses.contains(p.eContainer as EClass)» + «val extendedClass = p.eContainer as EClass » final «getJavaFQN(extendedClass)» originalObject = («getJavaFQN(extendedClass)») tracedToExe.get(tracedObject); «IF p.many» originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 696b5f13f..80643cb31 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -11,8 +11,6 @@ package fr.inria.diverse.trace.plugin.generator.codegen -import ecorext.ClassExtension -import ecorext.Rule import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.commons.tracemetamodel.StepStrings @@ -34,6 +32,7 @@ import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature import fr.inria.diverse.trace.commons.model.trace.TracePackage +import opsemanticsview.Rule class TraceConstructorGeneratorJava { @@ -359,7 +358,7 @@ class TraceConstructorGeneratorJava { private def String stringFeatureID(EStructuralFeature p) { - val containingClass = if (p.eContainer instanceof EClass) p.eContainer as EClassifier else (p.eContainer as ClassExtension).extendedExistingClass + val containingClass = if (p.eContainer instanceof EClass) p.eContainer as EClassifier return EcoreCraftingUtil.stringFeatureID(p,containingClass,refGenPackages) } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend index 945f121ca..2fada61a3 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend @@ -10,8 +10,6 @@ *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.codegen -import ecorext.ClassExtension -import ecorext.Rule import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability @@ -26,6 +24,7 @@ import org.eclipse.emf.ecore.EOperation import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature +import opsemanticsview.Rule class TraceExplorerGeneratorJava { @@ -485,7 +484,7 @@ class TraceExplorerGeneratorJava { for («getJavaFQN(stateClass)» value : stateToGo.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createGlobalToState(stateClass))») { final EObject parent = value.eContainer().eContainer(); ««« Case in which we can use the "originalObject" reference and simply set its values - «IF p.eContainer instanceof ClassExtension» + «IF ! traceability.newClasses.contains(p.eContainer)» ««« We have to test at runtime be can't know at design time the type of the object containing the property ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. «FOR concreteSubType : getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» @@ -500,9 +499,9 @@ class TraceExplorerGeneratorJava { originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value",p)»); «ELSE» «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p)»; - «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; + «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as EClass))»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; if (current != toset) { - ((«getJavaFQN((p.eContainer as ClassExtension).extendedExistingClass)»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; + ((«getJavaFQN((p.eContainer as EClass))»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; } «ENDIF» «ENDIF» diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend index ae0d3d6ef..e55f2b920 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend @@ -11,7 +11,6 @@ package fr.inria.diverse.trace.plugin.generator.codegen -import ecorext.Rule import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability @@ -25,6 +24,7 @@ import org.eclipse.emf.ecore.EOperation import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature +import opsemanticsview.Rule class TraceExtractorGeneratorJava { From 3570423cf940acd8e365c04053a6d3a04a236e67 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Mon, 3 Apr 2017 17:53:19 +0200 Subject: [PATCH 124/267] Add xmof code to generate opsemantics view --- .../plugin.xml | 11 + .../plugin.xml | 11 + .../gen/xmof/XMOFAnalyzer.xtend | 397 ++++++++++++++++++ ...MOFOperationalSemanticsViewGenerator.xtend | 56 +++ 4 files changed, 475 insertions(+) create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/plugin.xml create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/plugin.xml create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFAnalyzer.xtend create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFOperationalSemanticsViewGenerator.xtend diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/plugin.xml b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/plugin.xml new file mode 100644 index 000000000..e0b3b1fdf --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/plugin.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/plugin.xml b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/plugin.xml new file mode 100644 index 000000000..f5a4b0deb --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/plugin.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFAnalyzer.xtend b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFAnalyzer.xtend new file mode 100644 index 000000000..884465caa --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFAnalyzer.xtend @@ -0,0 +1,397 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package fr.inria.diverse.opsemanticsview.gen.xmof + +import java.util.ArrayList +import java.util.Collection +import java.util.HashMap +import java.util.HashSet +import java.util.List +import java.util.Map +import java.util.Set +import opsemanticsview.OperationalSemanticsView +import opsemanticsview.OpsemanticsviewFactory +import opsemanticsview.Rule +import org.eclipse.emf.common.util.Diagnostic +import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EModelElement +import org.eclipse.emf.ecore.EObject +import org.eclipse.emf.ecore.EOperation +import org.eclipse.emf.ecore.EPackage +import org.eclipse.emf.ecore.EParameter +import org.eclipse.emf.ecore.EStructuralFeature +import org.eclipse.emf.ecore.EcoreFactory +import org.eclipse.emf.ecore.EcorePackage +import org.eclipse.emf.ecore.util.Diagnostician +import org.eclipse.xtend.lib.annotations.Accessors +import org.modelexecution.xmof.Syntax.Actions.BasicActions.CallAction +import org.modelexecution.xmof.Syntax.Actions.BasicActions.CallBehaviorAction +import org.modelexecution.xmof.Syntax.Actions.BasicActions.CallOperationAction +import org.modelexecution.xmof.Syntax.Activities.IntermediateActivities.Activity +import org.modelexecution.xmof.Syntax.Classes.Kernel.BehavioredEClass +import org.modelexecution.xmof.Syntax.Classes.Kernel.BehavioredEOperation +import org.modelexecution.xmof.Syntax.Classes.Kernel.DirectedParameter +import org.modelexecution.xmof.Syntax.Classes.Kernel.ParameterDirectionKind + +class XMOFAnalyzer { + + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) OperationalSemanticsView mmextensionResult + + // Input + protected val EPackage xmofModel + protected val EPackage abstractSyntaxModel + + // Transient + protected boolean done = false + protected val Map activityToRule = new HashMap + protected val Map operationToRule = new HashMap + val Set abstractSyntaxClasses = new HashSet + + private static def void debug(Object toPrint) { + // println(toPrint) + } + + new(EPackage abstractSyntax, EPackage xmofModel, OperationalSemanticsView view) { + this.xmofModel = xmofModel + this.abstractSyntaxModel = abstractSyntax + this.mmextensionResult = view + } + + public def void generate() { + + abstractSyntaxClasses.addAll(abstractSyntaxModel.eAllContents.filter(EClass).toSet) + + // We process each class of the model + xmofModel.eAllContents.filter(EClass).filter[c|!(c instanceof Activity)].toSet.forEach[inspectClass] + + // Validation + val results = Diagnostician.INSTANCE.validate(this.getMmextensionResult); + val error = results.children.findFirst[r|r.severity == Diagnostic.ERROR] + if (error != null) + throw new IllegalStateException( + "The extracted execution extension from the xmof model is invalid for at least one reason: " + error) + } + + /* + * Called exactly once per class. + */ + private def void inspectClass(EClass xmofClass) { + + // We create the basic class or extension + findDynamicProperties(xmofClass) + + // Then we look at the activities of the class to transform them into rules + if (xmofClass instanceof BehavioredEClass) { + for (activity : xmofClass.ownedBehavior.filter(Activity)) + inspectActivity(xmofClass, activity) + for (operation : xmofClass.getEOperations.filter(BehavioredEOperation)) + inspectBehavioredEOperation(xmofClass, operation) + } + +// addTraceabilityAnnotations(xmofClass); + } + + /* + * Called exactly once per Activity. + */ + private def void inspectActivity(BehavioredEClass xmofClass, Activity activity) { + + // We create the corresponding rule object + val inspectedActivityRule = getRuleOf(activity) + + // And we find relationships between rules + for (callAction : activity.eAllContents.filter(CallAction).toSet) { + + var Rule calledRule = null + + if (callAction instanceof CallOperationAction) { + calledRule = getRuleOf(callAction.operation) + } else if (callAction instanceof CallBehaviorAction) { + if (callAction.behavior instanceof Activity) + calledRule = getRuleOf(callAction.behavior as Activity) + } + + if (calledRule != null) + inspectedActivityRule.calledRules.add(calledRule) + + } + + } + + /* + * Called exactly once per BehavioredEOperation. + */ + private def void inspectBehavioredEOperation(BehavioredEClass xmofClass, BehavioredEOperation operation) { + + // We create the corresponding rule object + val inspectedOperationRule = getRuleOf(operation) + inspectedOperationRule.containingClass = xmofClass + } + + private def void findDynamicProperties(EClass xmofClass) { + + // We find the extended class of the abstract syntax + val extendedClass = findExtendedClass(xmofClass) + + // Either we found extended classes, in which case this is a class extension + if (xmofClass instanceof BehavioredEClass && extendedClass != null) { + debug("Found a class inheriting a class of the ecore model! " + xmofClass) + mmextensionResult.dynamicProperties.addAll(xmofClass.EStructuralFeatures) + val entry = OpsemanticsviewFactory.eINSTANCE.createExecutionToASEntry => [ + ASclass = extendedClass + executionClass = xmofClass + ] + mmextensionResult.executionToASmapping.add(entry) + + } // Or not, in which case this is a new class, if it does comes from the xmof model + else { + + debug("Found new class! " + xmofClass) + mmextensionResult.dynamicClasses.add(xmofClass) + mmextensionResult.dynamicProperties.addAll(xmofClass.EStructuralFeatures) + } + + } + + protected def EClass findExtendedClass(EClass confClass) { + + var EClass res = null + val otherResultsFar = new HashSet + for (superType : confClass.getESuperTypes.filter[c|c != confClass]) { + + if (abstractSyntaxClasses.contains(superType)) + res = superType + else { + var indirectSuperType = findExtendedClass(superType) + if (indirectSuperType != null) + otherResultsFar.add(indirectSuperType) + } + } + if (res != null) { + return res + } else if (otherResultsFar.size > 0) { + return otherResultsFar.get(0) + } else { + return null + } + + } + +// protected def EPackage obtainExtensionPackage(EPackage runtimePackage) { +// +// // Null means that the root is the Ecorext object +// var EPackage result = null +// +// if (runtimePackage != null) { +// +// val tracedSuperPackage = obtainExtensionPackage(runtimePackage.getESuperPackage) +// +// if (tracedSuperPackage == null) +// result = mmextensionResult.newPackages.findFirst[p|p.name.equals(runtimePackage.name)] +// else +// result = tracedSuperPackage.getESubpackages.findFirst[p|p.name.equals(runtimePackage.name)] +// +// if (result == null) { +// result = EcoreFactory.eINSTANCE.createEPackage +// result.name = runtimePackage.name +// result.nsURI = result.name + "_trace" +// result.nsPrefix = runtimePackage.nsPrefix + "_trace" +// if (tracedSuperPackage == null) { +// mmextensionResult.newPackages.add(result) +// } else +// tracedSuperPackage.getESubpackages.add(result) +// } +// +// } +// return result +// } + private static def Rule createRule(boolean isAbstract, boolean isStep) { + val rule = OpsemanticsviewFactory.eINSTANCE.createRule + rule.stepRule = isStep + rule.abstract = isAbstract + return rule + } + + private def hasOperationInClass(Activity activity) { + activity.specification != null && activity.eContainer == activity.specification.EContainingClass + } + + private def findMethodInClass(BehavioredEOperation xmofOperation) { + return xmofOperation.method.filter(Activity).findFirst [ activity | + activity.eContainer == xmofOperation.EContainingClass + ] + + } + + def List createInputParameters(List directedParameters) { + val List result = new ArrayList + + val List inputParams = directedParameters.filter [ p | + (p instanceof DirectedParameter && (p as DirectedParameter).direction == ParameterDirectionKind.IN || + (p as DirectedParameter).direction == ParameterDirectionKind.INOUT + ) || (! (p instanceof DirectedParameter)) + ].toList + + for (xmofParam : inputParams) { + val newParameter = EcoreFactory.eINSTANCE.createEParameter + copyAttributes(xmofParam, newParameter) + if (xmofParam.getEType != null) + newParameter.EType = xmofParam.getEType + else + newParameter.EType = EcorePackage.eINSTANCE.getEObject + result.add(newParameter) + } + + if (result.filter[p|p.name.equals("tokens")].size > 1) + debug(result) + + return result + } + + def void findAndUseOutputParameter(EOperation operation, List directedParameters) { + var returnParam = directedParameters.filter(DirectedParameter).findFirst [ p | + p.direction == ParameterDirectionKind.RETURN + ] + if (returnParam == null) + returnParam = directedParameters.filter(DirectedParameter).findFirst [ p | + p.direction == ParameterDirectionKind.OUT + ] + if (returnParam != null) { + operation.ordered = returnParam.ordered + operation.unique = returnParam.unique + operation.lowerBound = returnParam.lowerBound + operation.upperBound = returnParam.upperBound + if (returnParam.getEType != null) + operation.EType = returnParam.getEType + else + operation.EType = EcorePackage.eINSTANCE.getEObject + + } + } + + private def Rule getRuleOf(Activity activity) { + if (activityToRule.containsKey(activity)) { + return activityToRule.get(activity) + } else { + val isStep = hasStepAnnotation(activity) || + (activity.specification != null && hasStepAnnotation(activity.specification)) + var Rule rule = createRule(false, isStep) + mmextensionResult.rules.add(rule) + activityToRule.put(activity, rule) + + rule.containingClass = activity.eContainer as EClass + + val EOperation operation = EcoreFactory.eINSTANCE.createEOperation + operation.name = activity.name + + // If our specification is in the same class of the activity, we use its list of methods to discover overriding activities + if (hasOperationInClass(activity)) { + for (activityMethod : activity.specification.method.filter(Activity).filter[a|a != activity]) { + val Rule overrideRule = getRuleOf(activityMethod) + rule.overridenBy.add(overrideRule) + } + } + + // First inputs + operation.getEParameters.addAll(createInputParameters(activity.ownedParameter.filter(EParameter).toList)) + + // Then output param. There can be only one, so we look for the first RETURN, or the first OUT + findAndUseOutputParameter(operation, activity.ownedParameter.filter(EParameter).toList) + + // An EOperation with void return type *must* have an upper bound of 1 + if (operation.getEType == null && operation.upperBound != 1) + operation.upperBound = 1 + + rule.operation = operation + return rule + } + + } + + private def Rule getRuleOf(BehavioredEOperation xmofOperation) { + val method = findMethodInClass(xmofOperation) + if (operationToRule.containsKey(xmofOperation)) { + return operationToRule.get(xmofOperation) + } else // If the operation has one method in the same class with the same name, we ignore the operation + if (method != null) { + return getRuleOf(method) + } else { + val isStep = hasStepAnnotation(xmofOperation) + val Rule rule = createRule(true, isStep) + mmextensionResult.rules.add(rule) + operationToRule.put(xmofOperation, rule) + rule.containingClass = xmofOperation.EContainingClass + + val EOperation newEOperation = EcoreFactory.eINSTANCE.createEOperation + copyAttributes(xmofOperation, newEOperation) + rule.operation = newEOperation + + if (xmofOperation.EType != null) + newEOperation.EType = xmofOperation.EType + else + findAndUseOutputParameter(newEOperation, xmofOperation.EParameters) + + // Input parameters + newEOperation.getEParameters.addAll(createInputParameters(xmofOperation.EParameters)) + + // An EOperation with void return type *must* have an upper bound of 1, while a param + if (newEOperation.getEType == null && newEOperation.upperBound != 1) + newEOperation.upperBound = 1 + + for (activityMethod : xmofOperation.method.filter(Activity)) { + val Rule overrideRule = getRuleOf(activityMethod) + rule.overridenBy.add(overrideRule) + } + + return rule + } + + } + +// private def void addTraceabilityAnnotations(EClass executionClass) { +// addTraceabilityAnnotations(executionClass, executionClass as EClass); +// addTraceabilityAnnotations(executionClass.getEAttributes); +// addTraceabilityAnnotations(executionClass.getEReferences); +// } +// private def void addTraceabilityAnnotations(Collection executionClassProperties) { +// executionClassProperties.forEach [ property | +// addTraceabilityAnnotations(property, xmofPropertyToNewProperty.get(property)) +// ]; +// } +// private def void addTraceabilityAnnotations(EModelElement originalExecutionMetamodelElement, +// EModelElement extensionModelElement) { +// val executionMetamodelElementURI = originalExecutionMetamodelElement.eResource.getURIFragment( +// originalExecutionMetamodelElement); +// ExecutionMetamodelTraceability.createTraceabilityAnnotation(extensionModelElement, +// executionMetamodelElementURI); +// } + private static def copyAttributes(EObject from, EObject to) { + for (prop : to.eClass.getEAllAttributes) { + val value = from.eGet(prop) + + // We try to set everything, but there are many derived properties etc. thus many errors + // (but not a problem) + try { + if (prop.many) + (to.eGet(prop) as Collection).addAll(value as Collection) + else + to.eSet(prop, value) + } catch (Exception e) { + } + } + } + + private static def hasStepAnnotation(EModelElement element) { + val annotation = element.getEAnnotation("http://www.modelexecution.org/xmof") + return annotation != null && annotation.details.containsKey("Step") + } + +} diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFOperationalSemanticsViewGenerator.xtend b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFOperationalSemanticsViewGenerator.xtend new file mode 100644 index 000000000..d4e04096a --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFOperationalSemanticsViewGenerator.xtend @@ -0,0 +1,56 @@ +package fr.inria.diverse.opsemanticsview.gen.xmof + +import fr.inria.diverse.melange.metamodel.melange.Language +import fr.inria.diverse.opsemanticsview.gen.OperationalSemanticsViewGenerator +import opsemanticsview.OpsemanticsviewFactory +import org.eclipse.core.resources.IProject +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.EPackage +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl +import org.eclipse.emf.ecore.util.EcoreUtil + +class XMOFOperationalSemanticsViewGenerator implements OperationalSemanticsViewGenerator { + + override canHandle(Language melangeLanguage, IProject melangeProject) { + return melangeLanguage.xmof != null && melangeLanguage.xmof != "" + } + + override generate(Language melangeLanguage, IProject melangeProject) { + + val result = OpsemanticsviewFactory.eINSTANCE.createOperationalSemanticsView + + val rs = new ResourceSetImpl + + val asURI = URI.createURI(melangeLanguage.syntax.ecoreUri,true); + val asResource= rs.getResource(asURI,true) + val abstractSyntax = asResource.contents.filter(EPackage).head + + // Register all packages in registry + // TODO remove them afterwards? + for (p : asResource.allContents.filter(EPackage).toSet) + EPackage.Registry.INSTANCE.put(p.getNsURI(), p); + + val xmofStringURI = melangeLanguage.getXmof(); + val xmofURI = URI.createURI(xmofStringURI, true) + val xmofModel = rs.getResource(xmofURI,true) + val executionMetamodel = xmofModel.contents.filter(EPackage).head + + // Register all packages in registry + // TODO remove them afterwards? + for (p : xmofModel.allContents.filter(EPackage).toSet) + EPackage.Registry.INSTANCE.put(p.getNsURI(), p); + + EcoreUtil.resolveAll(rs) + + result.abstractSyntax = abstractSyntax + result.executionMetamodel = executionMetamodel + + + val XMOFAnalyzer eventsgen = new XMOFAnalyzer(abstractSyntax, executionMetamodel, result); + eventsgen.generate(); + + + return result + } + +} \ No newline at end of file From c0ba1e8bb82179d29c4583abd7bb41ec717f81a8 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Mon, 3 Apr 2017 17:59:33 +0200 Subject: [PATCH 125/267] Remove loads of unused code in trace constructor generator --- .../TraceConstructorGeneratorJava.xtend | 599 +++--------------- 1 file changed, 99 insertions(+), 500 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 80643cb31..dbc9a5fd4 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -10,29 +10,23 @@ *******************************************************************************/ package fr.inria.diverse.trace.plugin.generator.codegen - import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.commons.tracemetamodel.StepStrings +import fr.inria.diverse.trace.commons.model.trace.TracePackage import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import fr.inria.diverse.trace.metamodel.generator.TraceMMStrings import java.util.ArrayList import java.util.Collection -import java.util.HashMap import java.util.HashSet import java.util.List -import java.util.Map import java.util.Set +import opsemanticsview.Rule import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import org.eclipse.emf.ecore.EAttribute import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EClassifier import org.eclipse.emf.ecore.EOperation import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature -import fr.inria.diverse.trace.commons.model.trace.TracePackage -import opsemanticsview.Rule class TraceConstructorGeneratorJava { @@ -43,7 +37,6 @@ class TraceConstructorGeneratorJava { private val EPackage abstractSyntax private val TraceMMGenerationTraceability traceability private val Set refGenPackages - private val boolean gemoc private val boolean partialTraceManagement // Transient @@ -68,7 +61,6 @@ class TraceConstructorGeneratorJava { this.packageQN = packageQN this.traceability = traceability this.refGenPackages = refGenPackages - this.gemoc = gemoc this.abstractSyntax = abstractSyntax this.stateClass = traceability.traceMMExplorer.getSpecificStateClass this.specificStepClass = traceability.traceMMExplorer.getSpecificStepClass @@ -77,11 +69,6 @@ class TraceConstructorGeneratorJava { this.specificStepFQN = getJavaFQN(specificStepClass) } - private def String getActualFQN(EClass c, Rule r) { - val EOperation o = r.operation - return EcoreCraftingUtil.getBaseFQN(c) + "." + o.name - } - def Set findAllConcreteSubTypes(EClass clazz) { traceability.allMutableClasses.filter[c|!c.isAbstract && c.EAllSuperTypes.contains(clazz)].toSet } @@ -105,18 +92,7 @@ class TraceConstructorGeneratorJava { } return true } - - private static def boolean hasSuperTypeIn(EClass c, Collection eclasses) { - for (eclass : eclasses) { - if (c.EAllSuperTypes.contains(eclass)) - return true - } - return false - } - - private def String getTracedJavaFQN(EClassifier c) { - return getTracedJavaFQN(c,false) - } + private def String getTracedJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { if (c instanceof EClass) { @@ -143,10 +119,6 @@ class TraceConstructorGeneratorJava { EcoreCraftingUtil.stringSetter(f,value,refGenPackages) } - private def String stringSetter(String f, String value) { - EcoreCraftingUtil.stringSetter(f,value) - } - private static def Set findTopSuperClasses(Iterable eclasses) { val res = new HashSet @@ -195,21 +167,8 @@ class TraceConstructorGeneratorJava { } } - private Map counters = new HashMap - private def String uniqueVar(String s) { - if (!counters.containsKey(s)) { - counters.put(s, 0) - } - return s + counters.get(s) - } - private def void incVar(String s) { - if (!counters.containsKey(s)) { - counters.put(s, 0) - } - counters.put(s, counters.get(s) + 1) - } public static def String getBaseFQN(Rule r) { val EOperation o = r.operation @@ -217,22 +176,6 @@ class TraceConstructorGeneratorJava { return EcoreCraftingUtil.getBaseFQN(c) + "." + o.name } - private def EClassifier getEventParamRuntimeType(EStructuralFeature f) { - var EClass res = null - if (f instanceof EAttribute) { - // TODO - } else if (f instanceof EReference) { - val potentialRealRuntimeClass = traceability.getRealMutableClass(f.EReferenceType) - if (potentialRealRuntimeClass != null) { - // TODO here in the general case we need to find the exe class - res = potentialRealRuntimeClass - } else { - // TODO same here - res = f.EReferenceType - } - } - return res - } private def String stringGetterTracedValue(String javaVarName, EStructuralFeature p) { val pRealType = traceability.getRealMutableClass(p.EType) @@ -252,9 +195,6 @@ class TraceConstructorGeneratorJava { return res } - private def Set getAllNonEmptyMutableClasses() { - return traceability.allMutableClasses.filter[c|!c.allMutablePropertiesOf.empty].toSet - } private def String generateImports() { @@ -316,45 +256,6 @@ class TraceConstructorGeneratorJava { return "getExeToTraced" } - private def String generateStoreAsTracedMethods() { - return - ''' - - «FOR mutClass : traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name]» - private void storeAsTracedObject(«getJavaFQN(mutClass)» o) { - - «FOR subType : partialOrderSort(findAllConcreteSubTypes(mutClass)) » - if (o instanceof «getJavaFQN(subType)») { - storeAsTracedObject((«getJavaFQN(subType)»)o); - } else - «ENDFOR» - - «val traced = traceability.getTracedClass(mutClass)» - - if (!exeToTraced.containsKey(o)) { - «getJavaFQN(traced)» tracedObject; - tracedObject = «EcoreCraftingUtil.stringCreate(traced)»; - «val Set origRefs1 = traceability.getRefs_originalObject(traced)» - «FOR EReference origRef : origRefs1.sortBy[name]» - tracedObject.«stringSetter(origRef, "o")»; - «ENDFOR» - exeToTraced.put(o, tracedObject); - traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))».add(tracedObject); - } - } - «ENDFOR» - «IF getExeToTracedUsed» - private void storeAsTracedObject(EObject o) { - «FOR mutClass : partialOrderSort(traceability.allMutableClasses.filter[c|!c.isAbstract].toList.sortBy[name]) SEPARATOR "\n else "» - if (o instanceof «getJavaFQN(mutClass)») { - storeAsTracedObject((«getJavaFQN(mutClass)»)o); - } - «ENDFOR» - } - «ENDIF» - ''' - } - private def String stringFeatureID(EStructuralFeature p) { @@ -368,10 +269,8 @@ class TraceConstructorGeneratorJava { private Set getAllExecutedModelResources() { Set allResources = new HashSet<>(); allResources.add(executedModel); - «IF gemoc» allResources.addAll(org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); allResources.removeIf(r -> r== null); - «ENDIF» return allResources; } ''' @@ -421,102 +320,102 @@ class TraceConstructorGeneratorJava { private def String generateAddNewObjectToStateMethods() { return ''' - «FOR c : traceability.allMutableClasses.sortBy[name]» - «««»«FOR c : partialOrderSort(getAllNonEmptyMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList)» - «val traced = traceability.getTracedClass(c)» - «val subTypes = partialOrderSort(findAllDirectSubTypes(c))» - «IF shouldHaveAddNewObjectToStateMethod(c)» - «IF getAllMutablePropertiesOf(c).exists[p|p instanceof EReference && p.many]» - @SuppressWarnings("unchecked") - «ENDIF» - private boolean addNewObjectToState(«getJavaFQN(c)» o_cast, «stateFQN» newState) { - boolean added = false; - «val subTypesWithMethods = subTypes.filter[sub|shouldHaveAddNewObjectToStateMethod(sub)]» - «FOR subType : subTypesWithMethods SEPARATOR " else " » - if (o_cast instanceof «getJavaFQN(subType)») { - added = addNewObjectToState((«getJavaFQN(subType)»)o_cast, newState); - } - «ENDFOR» - - «IF ! c.abstract» - - if (!added && !exeToTraced.containsKey(o_cast)) { - «getJavaFQN(traced)» tracedObject = «EcoreCraftingUtil.stringCreate(traced)»; - «val Set origRefs1 = traceability.getRefs_originalObject(traced)» - «FOR EReference origRef : origRefs1.sortBy[name]» - tracedObject.«stringSetter(origRef, "o_cast")»; - «ENDFOR» - exeToTraced.put(o_cast, tracedObject); - traceRoot.getTracedObjects().add(tracedObject); - - «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» - «val EClass pdimensionClass = traceability.getDimensionClass(p)» - «val EReference pdimensionRef = traceability.getDimensionRef(p)» - «val EClass valueClass = traceability.getValueClass(p)» - «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» - - // Creation of the dimension corresponding to the field «p.name» - tracedObject.«EcoreCraftingUtil.stringSetter(pdimensionRef, EcoreCraftingUtil.stringCreate(pdimensionClass))»; - // Creation of the first value of the field «p.name» - «getJavaFQN(valueClass)» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(valueClass)»; - - «IF p.many» - - «IF p instanceof EReference» - - - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» - for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)aValue, newState); - } - «ENDIF» - - firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll - ( - (Collection) - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» - «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState) - «ELSE» - o_cast.«EcoreCraftingUtil.stringGetter(p)» - «ENDIF» - ); - «ELSE» ««« If attribute - firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» ««« End IF EReference - - - «ELSE» ««« If !many - - «IF p instanceof EReference» - «val realMutableType = traceability.getRealMutableClass(p.EType)» - if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { - «IF traceability.allMutableClasses.contains(realMutableType)» - addNewObjectToState((«getJavaFQN(realMutableType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); - firstValue_«p.name».«stringSetter(valueProperty,stringGetterTracedValue("o_cast", p))»; - «ELSE» - firstValue_«p.name».«stringSetter(valueProperty,"o_cast."+EcoreCraftingUtil.stringGetter(p))»; - «ENDIF» ««« End IF traceability.isSomehowMutable(p.EType) - } else { - firstValue_«p.name».«stringSetter(valueProperty,"null")»; - } - - «ELSE» ««« If attribute - firstValue_«p.name».«stringSetter(valueProperty,"o_cast."+EcoreCraftingUtil.stringGetter(p))»; - «ENDIF» ««« End IF EReference - «ENDIF» ««« End IF p.many - - tracedObject.«EcoreCraftingUtil.stringGetter(pdimensionRef)».getValues().add(firstValue_«p.name»); - newState.getValues().add(firstValue_«p.name»); - - «ENDFOR» ««« End FOR p : getAllMutableProperties - } // end if (!exeToTraced.containsKey - «ENDIF» ««« End IF ! c.abstract» - return added; - }// end addNewObjectToState - «ENDIF» - «ENDFOR» ««« end FOR c : traceability.allMutableClasses.sortBy[name] - ''' +«FOR c : traceability.allMutableClasses.sortBy[name]» +«««»«FOR c : partialOrderSort(getAllNonEmptyMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList)» +«val traced = traceability.getTracedClass(c)» +«val subTypes = partialOrderSort(findAllDirectSubTypes(c))» +«IF shouldHaveAddNewObjectToStateMethod(c)» +«IF getAllMutablePropertiesOf(c).exists[p|p instanceof EReference && p.many]» +@SuppressWarnings("unchecked") +«ENDIF» +private boolean addNewObjectToState(«getJavaFQN(c)» o_cast, «stateFQN» newState) { +boolean added = false; +«val subTypesWithMethods = subTypes.filter[sub|shouldHaveAddNewObjectToStateMethod(sub)]» +«FOR subType : subTypesWithMethods SEPARATOR " else " » + if (o_cast instanceof «getJavaFQN(subType)») { + added = addNewObjectToState((«getJavaFQN(subType)»)o_cast, newState); + } +«ENDFOR» + +«IF ! c.abstract» + +if (!added && !exeToTraced.containsKey(o_cast)) { + «getJavaFQN(traced)» tracedObject = «EcoreCraftingUtil.stringCreate(traced)»; + «val Set origRefs1 = traceability.getRefs_originalObject(traced)» + «FOR EReference origRef : origRefs1.sortBy[name]» + tracedObject.«stringSetter(origRef, "o_cast")»; + «ENDFOR» + exeToTraced.put(o_cast, tracedObject); + traceRoot.getTracedObjects().add(tracedObject); + + «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» + «val EClass pdimensionClass = traceability.getDimensionClass(p)» + «val EReference pdimensionRef = traceability.getDimensionRef(p)» + «val EClass valueClass = traceability.getValueClass(p)» + «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» + + // Creation of the dimension corresponding to the field «p.name» + tracedObject.«EcoreCraftingUtil.stringSetter(pdimensionRef, EcoreCraftingUtil.stringCreate(pdimensionClass))»; + // Creation of the first value of the field «p.name» + «getJavaFQN(valueClass)» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(valueClass)»; + + «IF p.many» + + «IF p instanceof EReference» + + + «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { + addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)aValue, newState); + } + «ENDIF» + + firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll + ( + (Collection) + «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState) + «ELSE» + o_cast.«EcoreCraftingUtil.stringGetter(p)» + «ENDIF» + ); + «ELSE» ««« If attribute + firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll + ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); + «ENDIF» ««« End IF EReference + + + «ELSE» ««« If !many + + «IF p instanceof EReference» + «val realMutableType = traceability.getRealMutableClass(p.EType)» + if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { + «IF traceability.allMutableClasses.contains(realMutableType)» + addNewObjectToState((«getJavaFQN(realMutableType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); + firstValue_«p.name».«stringSetter(valueProperty,stringGetterTracedValue("o_cast", p))»; + «ELSE» + firstValue_«p.name».«stringSetter(valueProperty,"o_cast."+EcoreCraftingUtil.stringGetter(p))»; + «ENDIF» ««« End IF traceability.isSomehowMutable(p.EType) + } else { + firstValue_«p.name».«stringSetter(valueProperty,"null")»; + } + + «ELSE» ««« If attribute + firstValue_«p.name».«stringSetter(valueProperty,"o_cast."+EcoreCraftingUtil.stringGetter(p))»; + «ENDIF» ««« End IF EReference + «ENDIF» ««« End IF p.many + + tracedObject.«EcoreCraftingUtil.stringGetter(pdimensionRef)».getValues().add(firstValue_«p.name»); + newState.getValues().add(firstValue_«p.name»); + +«ENDFOR» ««« End FOR p : getAllMutableProperties +} // end if (!exeToTraced.containsKey +«ENDIF» ««« End IF ! c.abstract» +return added; +}// end addNewObjectToState +«ENDIF» +«ENDFOR» ««« end FOR c : traceability.allMutableClasses.sortBy[name] +''' } private def String generateAddStateUsingListenerMethods() { @@ -527,15 +426,6 @@ private def String generateAddStateUsingListenerMethods() { superTypes.retainAll(newAbstractClassesNotEmpty) return !c.isAbstract && (!c.EStructuralFeatures.empty || !superTypes.empty) ].toList - //val newClassesNotEmptyWithMutableProperties = newClassesNotEmpty.filter[c|!traceability.getMutablePropertiesOf(c).empty] -// val newClassesNotEmptyClosure = partialOrderSort(newClassesNotEmpty.filter[c| -// val superTypes = new ArrayList(c.EAllSuperTypes) -// superTypes.retainAll(newClassesNotEmpty) -// !(c.EStructuralFeatures.empty && !superTypes.empty) -// ].toList) - val allConcreteMutableClasses = partialOrderSort(getAllNonEmptyMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList) - //val mutableClassesWithNonCollectionMutableFields = allConcreteMutableClasses.filter[c|getAllMutablePropertiesOf(c).exists[p|!p.many]] - //val mutableClassesWithCollectionMutableFields = allConcreteMutableClasses.filter[c|getAllMutablePropertiesOf(c).exists[p| p.many]] val mutableClassesWithNonCollectionMutableFields = traceability.allMutableClasses.filter[c|!traceability.getMutablePropertiesOf(c).empty && traceability.getMutablePropertiesOf(c).exists[p|!p.many]] val mutableClassesWithCollectionMutableFields = traceability.allMutableClasses.filter[c|!traceability.getMutablePropertiesOf(c).empty && traceability.getMutablePropertiesOf(c).exists[p|p.many]] return @@ -544,9 +434,6 @@ private def String generateAddStateUsingListenerMethods() { private «stateFQN» copyState(«stateFQN» oldState) { «stateFQN» newState = «EcoreCraftingUtil.stringCreate(stateClass)»; -««« «FOR p : traceability.allMutableProperties.sortBy[FQN]» -««« newState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))».addAll(oldState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))»); -««« «ENDFOR» newState.getValues().addAll(oldState.getValues()); copiedState = true; return newState; @@ -591,9 +478,7 @@ private def String generateAddStateUsingListenerMethods() { «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o_cast); ««« Loop over the fields of this class, which are all mutable «FOR p : c.EStructuralFeatures» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val EReference pdimension = traceability.getDimensionRef(p)» -««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); newState.getValues().remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); «ENDFOR» }««« end if instanceof @@ -619,7 +504,6 @@ private def String generateAddStateUsingListenerMethods() { «FOR p : nonCollectionMutableFields SEPARATOR " else "» «val EClass valueClass = traceability.getValueClass(p)» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val EReference pdimension = traceability.getDimensionRef(p)» if (p.getFeatureID() == «stringFeatureID(p)») { @@ -627,13 +511,9 @@ private def String generateAddStateUsingListenerMethods() { // Rollback: we remove the last value of this field from the new state «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o); «getJavaFQN(valueClass)» lastValue = traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1); -««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); newState.getValues().remove(lastValue); // And we create a proper new value - ««« «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» - ««« addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); - ««« «ENDIF» «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» @@ -676,7 +556,6 @@ private def String generateAddStateUsingListenerMethods() { «getJavaFQN(traced)» tracedObject = («getJavaFQN(traced)») exeToTraced.get(o_cast); «FOR p : collectionMutableFields SEPARATOR " else "» «val EClass valueClass = traceability.getValueClass(p)» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val EReference pdimension = traceability.getDimensionRef(p)» if (p.getFeatureID() == «stringFeatureID(p)») { // We compare the last collection in the value sequence, and the current one in the potentially changed object @@ -777,210 +656,11 @@ private def String generateAddStateUsingListenerMethods() { ''' } - private def String generateAddStateMethods() { - return - ''' - @Override - public boolean addStateIfChanged() { - return addState(true); - } - - @Override - public void addState() { - addState(false); - } - - private boolean addState(boolean onlyIfChange) { - - «getJavaFQN(traceability.traceMMExplorer.getSpecificStateClass)» newState = «EcoreCraftingUtil.stringCreate( - traceability.traceMMExplorer.getSpecificStateClass)»; - boolean changed = false; - - Set allResources = getAllExecutedModelResources(); - - // We look at each object instance of a class with mutable properties - // Each of these objects should eventually become a traced object - for (Resource r : allResources) - for (TreeIterator i = r.getAllContents(); i.hasNext();){ - EObject o = i.next(); - «FOR c : partialOrderSort(getAllNonEmptyMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList) SEPARATOR "\n else "» - «val traced = traceability.getTracedClass(c)» - /** - * Storing the state of a «getJavaFQN(c)» object - */ - if (o instanceof «getJavaFQN(c)») { - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - storeAsTracedObject(o_cast); - - «IF !getAllMutablePropertiesOf(c).empty» - «getJavaFQN(traced)» tracedObject = («getJavaFQN(traced)») exeToTraced.get(o); - «ENDIF» - «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» - «val EClass valueClass = traceability.getValueClass(p)» - «val EReference pdimension = traceability.getDimensionRef(p)» - «incVar("valueSequence")» - «val EReference refGlobalToState = traceability.getStateClassToValueClass(p)» - «incVar("previousValue")» - «incVar("noChange")» - - // Then we compare the value of the field with the last stored value - // If same value, we create no local state and we refer to the previous - ««« TODO to change if we switch from refering the exeMM to refering the AS (as in the ECMFA paper) -> need to compare to refs to origobjs/tracedobj - ««« TODO handle collections of datatypes - List<«getJavaFQN(valueClass)»> «uniqueVar("valueSequence")» = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues(); - «getJavaFQN(valueClass)» «uniqueVar("previousValue")» = null; - if (!«uniqueVar("valueSequence")».isEmpty()) { - «uniqueVar("previousValue")» = «uniqueVar("valueSequence")».get(«uniqueVar("valueSequence")».size() - 1); - } - ««« Case many - «IF p.many» - ««« If instances of new class, we have to make sure that there are traced versions - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» - for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - storeAsTracedObject(aValue); - } - «ENDIF» - - boolean «uniqueVar("noChange")»= true; - if («uniqueVar("previousValue")» != null) { - if («uniqueVar("previousValue")».«EcoreCraftingUtil.stringGetter(p)».size() == o_cast - .«EcoreCraftingUtil.stringGetter(p)».size()) { - ««« We this is an ordered collection, we have to compare in the correct order - «IF p.ordered» - java.util.Iterator<«getJavaFQN(p.EType,true)»> it = o_cast.«EcoreCraftingUtil.stringGetter(p)».iterator(); - for («getTracedJavaFQN(traceability.getValuePropertyOfMutableProperty(p).EType,true)» aPreviousValue : «uniqueVar("previousValue")» - .«EcoreCraftingUtil.stringGetter(p)») { - «getJavaFQN(p.EType)» aCurrentValue = it.next(); - «IF p instanceof EReference» - if (aPreviousValue != exeToTraced.get(aCurrentValue)) { - «ELSE» - if (!aPreviousValue.equals(aCurrentValue)) { - «ENDIF» - «uniqueVar("noChange")» = false; - break; - } - } - - ««« Else we simply check that the content is the same - «ELSE» - «uniqueVar("noChange")» = «uniqueVar("previousValue")».«EcoreCraftingUtil.stringGetter(p)».containsAll(«getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)»)); - «ENDIF» - ««« end case ordered - } else { - «uniqueVar("noChange")» = false; - } - } else { - «uniqueVar("noChange")» = false; - } - ««« Case single - «ELSE» - ««« If instance of new class, we have to make sure that there is a traced version - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» - storeAsTracedObject(o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - ««« Getting the content of the field - «incVar("content")» - ««« Case reference - «IF p instanceof EReference» - «getTracedJavaFQN(traceability.getValuePropertyOfMutableProperty(p).EType)» «uniqueVar("content")» = null; - if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) - «uniqueVar("content")» = «stringGetterTracedValue("o_cast", p)»; - ««« - ««« Case datatype - «ELSEIF p instanceof EAttribute» - «getJavaFQN(p.EType)» «uniqueVar("content")» = o_cast.«EcoreCraftingUtil.stringGetter(p)»; - «ENDIF» - ««« end declaring/getting content - - «IF getJavaFQN(p.EType) == "java.lang.Byte" - || getJavaFQN(p.EType) == "java.lang.Short" - || getJavaFQN(p.EType) == "java.lang.Integer" - || getJavaFQN(p.EType) == "java.lang.Long" - || getJavaFQN(p.EType) == "java.lang.Boolean" - || getJavaFQN(p.EType) == "java.lang.Float" - || getJavaFQN(p.EType) == "java.lang.Double" - || getJavaFQN(p.EType) == "java.lang.String"» - boolean «uniqueVar("noChange")» = «uniqueVar("previousValue")» != null - && «uniqueVar("previousValue")».«EcoreCraftingUtil.stringGetter(p)» != null - && «uniqueVar("previousValue")».«EcoreCraftingUtil.stringGetter(p)».equals(«uniqueVar("content")»); - «ELSE» - boolean «uniqueVar("noChange")» = «uniqueVar("previousValue")» != null - && «uniqueVar("previousValue")».«EcoreCraftingUtil.stringGetter(p)» == «uniqueVar("content")»; - «ENDIF» - - «ENDIF» - ««« end collection/single - if («uniqueVar("noChange")») { - newState.«EcoreCraftingUtil.stringGetter(refGlobalToState)».add(«uniqueVar("previousValue")»); - - } // Else we create one - else { - changed = true; - «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; - ««« Case collection - ««« TODO: handle collections of datatypes! - «IF p.many» - - «IF p instanceof EReference» - newValue.«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)»)); - «ELSE» - newValue.«EcoreCraftingUtil.stringGetter(p)».addAll - ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - ««« Case single - «ELSE» - - newValue.«stringSetter(p, uniqueVar("content"))»; - - «ENDIF» - ««« end collection/Single - tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().add(newValue); - newState.«EcoreCraftingUtil.stringGetter(refGlobalToState)».add(newValue); - } - - «ENDFOR» - } - «ENDFOR» - } - - boolean createNewState = lastState == null || (!onlyIfChange || changed); - if (createNewState) { - - final «specificStepFQN» currentStep = context.peekFirst(); - if (currentStep != null && currentStep instanceof «getJavaFQN(TracePackage.eINSTANCE.bigStep)») { - final «stateFQN» startingState = lastState; - final «stateFQN» endingState = newState; - addImplicitStep(currentStep, startingState, endingState); - } - - lastState = newState; - traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_TraceToStates)».add(lastState); - } - - // Undoing the new state created for nothing - else { - - newState.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_StateToStep_started)».clear(); - newState.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_StateToStep_ended)».clear(); - - «FOR p : traceability.allMutableProperties.sortBy[FQN]» - «val EReference tuple = traceability.getStateClassToValueClass(p)» - newState.«EcoreCraftingUtil.stringGetter(tuple)».clear(); - «ENDFOR» - } - - return createNewState; - - } - ''' - } private def String generateAddStepMethods() { return ''' «val stepRules = traceability.mmext.rules» - «IF gemoc» @SuppressWarnings("unchecked") @Override public void addStep(fr.inria.diverse.trace.commons.model.trace.Step step) { @@ -1016,83 +696,7 @@ private def String generateAddStateUsingListenerMethods() { } context.push(step_cast); } - «ELSE» - @Override - public void addStep(String stepRule, Map params) { - addStep(stepRule, params, this.getTraceSize()-1); - } - private void addStep(String stepRule, Map params, int stateIndex) { - «specificStepFQN» toPush = null; - if (stateIndex >= 0) { - «stateFQN» state = this.traceRoot.getStates().get(stateIndex); - «IF !stepRules.empty» - «FOR stepRule : stepRules.sortBy[baseFQN] SEPARATOR "else"» - «val stepCallerClass = stepRule.containingClass» - «val possibleCallerClasses = abstractSyntax.EClassifiers - .filter[c|c instanceof EClass] - .map[c|c as EClass] - .filter[c|c.equals(stepCallerClass)||c.EAllSuperTypes.contains(stepCallerClass)] - .toSet» - «val EClass stepClass = traceability.getStepClassFromStepRule(stepRule)» - «val String varName = stepClass.name.toFirstLower.replace(" ", "") + "Instance"» - «IF possibleCallerClasses.empty» - if (stepRule.equalsIgnoreCase("«getBaseFQN(stepRule)»")) { - «ELSE» - if ( - «FOR possibleCallerClass: possibleCallerClasses.sortBy[name] SEPARATOR " || "» - stepRule.equalsIgnoreCase("«getActualFQN(possibleCallerClass, stepRule)»") - «ENDFOR» - ) { - «ENDIF» - // First we create the step - «getJavaFQN(stepClass)» «varName» = «EcoreCraftingUtil.stringCreate(stepClass)»; - «varName».«stringSetter(TraceMMStrings.ref_StepToState_starting, "state")»; - - if (!context.isEmpty() && context.getFirst() != null){ - ((fr.inria.diverse.trace.commons.model.trace.SequentialStep) context.getFirst()).getSubSteps().add(«varName»); - } else { - traceRoot.getRootSteps().add(«varName»); - } - toPush = «varName»; - ««« TODO rely on information in Rule instead of the structural features? - «val properties = stepClass.EAllStructuralFeatures.filter[f| - !TracePackage.eINSTANCE.smallStep.EStructuralFeatures.contains(f) && - !TracePackage.eINSTANCE.bigStep.EStructuralFeatures.contains(f) && - !traceability.traceMMExplorer.getSpecificStepClass.EStructuralFeatures.contains(f) && - !f.name.equals(StepStrings.ref_BigStepToSub) - && !f.EContainingClass.name.equals("MSEOccurrence")]» - «IF !properties.empty» - if (params != null) { - for (String k : params.keySet()) { - switch(k) { - «FOR p : properties.sortBy[name]» - case "«p.name»": - Object «uniqueVar("v")» = params.get(k); - «val type = getEventParamRuntimeType(p)» - if («uniqueVar("v")» instanceof «getJavaFQN(type)») { - «IF type == p.EType» - «varName».«stringSetter(p, "(" + getJavaFQN(p.EType) + ")"+uniqueVar("v"))»; - «ELSE» - «varName».«stringSetter(p, "(" + getJavaFQN(p.EType) + ")exeToTraced.get("+uniqueVar("v"+")"))»; - «ENDIF» - } - break; - «incVar("v")» - «ENDFOR» - } - } - } - «ENDIF» - // Then we add it to its trace - this.traceRoot.«EcoreCraftingUtil.stringGetter(traceability.getStepSequence(stepClass))».add(«varName»); - } - «ENDFOR» - «ENDIF» - } - context.push(toPush); - } - «ENDIF» @SuppressWarnings("unchecked") private void addImplicitStep(«specificStepFQN» currentStep, @@ -1186,14 +790,9 @@ private def String generateAddStateUsingListenerMethods() { public class «className» implements ITraceConstructor { «generateFields» «generateConstructor» - «IF gemoc» «generateAddInitialStateMethod» «generateAddNewObjectToStateMethods» «generateAddStateUsingListenerMethods» - «ELSE» - «generateStoreAsTracedMethods» - «generateAddStateMethods» - «ENDIF» «generateAddStepMethods» «generateInitAndSaveTraceMethods» «generateGetAllResourcesMethod» From 5e2ca8717c196b16ac30524fbcfb49cc338836d4 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Mon, 3 Apr 2017 18:24:50 +0200 Subject: [PATCH 126/267] Remove xmof specific code in TMM generation --- .../TraceMMGenerationTraceability.xtend | 8 - .../generator/TraceMMGeneratorStates.xtend | 35 +-- ...GenericTraceConstructorGeneratorJava.xtend | 261 ++++++++---------- .../TraceConstructorGeneratorJava.xtend | 14 +- 4 files changed, 127 insertions(+), 191 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend index 98e42c66c..9a20870a6 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend @@ -254,15 +254,7 @@ class TraceMMGenerationTraceability { return mutablePropertyToValueProperty.get(mutableProperty) } - def EClassifier getRealMutableClass(EClassifier c) { - if (xmofExeToConf.containsKey(c)) xmofExeToConf.get(c) else c - } - - public val Map xmofExeToConf = new HashMap - def void addXmofExeToConf(EClass exe, EClass conf) { - xmofExeToConf.put(exe,conf) - } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index a3c540284..abb417338 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -137,19 +137,11 @@ class TraceMMGeneratorStates { return result } - private def boolean isXmofConfClassOf(EClass c, EClass s) { - if (c.name.endsWith("Configuration") && c.name.startsWith(s.name)) { - traceability.addXmofExeToConf(s, c) - return true - } - return false - } private def void getAllInheritance(Set result, EClass c) { if (!result.contains(c)) { result.add(c) - for (sup : c.ESuperTypes // TODO ugly fix to not include AS classes in the XMOF case, to remove at some point - .filter[s|! isXmofConfClassOf(c, s)]) { + for (sup : c.ESuperTypes) { getAllInheritance(result, sup) } for (sub : getSubTypesOf(c)) { @@ -213,19 +205,17 @@ class TraceMMGeneratorStates { private def EClass handleTraceClass(EClass runtimeClass) { - // If the xmof conf metamodel still has references to the AS, we replace by refs to the conf metamodel - if (traceability.xmofExeToConf.containsKey(runtimeClass)) - return handleTraceClass(traceability.xmofExeToConf.get(runtimeClass)) - if (!allRuntimeClasses.contains(runtimeClass)) return runtimeClass if (! runtimeToTraced.containsKey(runtimeClass)) { + + val boolean hasDynamicProperties = runtimeClass.EAllStructuralFeatures.exists[f|mmext.dynamicProperties.contains(f)] // Creating the traced version of the class val tracedClass = EcoreFactory.eINSTANCE.createEClass tracedClass.name = TraceMMStrings.class_createTraceClassName(runtimeClass) - tracedClass.abstract = runtimeClass.abstract || runtimeClass.interface + tracedClass.abstract = runtimeClass.abstract || runtimeClass.interface || !hasDynamicProperties runtimeToTraced.put(runtimeClass, tracedClass) // Storing traceability stuff @@ -279,17 +269,7 @@ class TraceMMGeneratorStates { traceability.addRefs_originalObject(tracedClass, ref) } -// // Link Trace class -> Traced class -// if (!tracedClass.abstract) { -// val refName = TraceMMStrings.ref_createTraceClassToTracedClass(tracedClass) -// val refTraceClassToTracedClass = addReferenceToClass(traceMMExplorer.specificTraceClass, refName, tracedClass) -// tracedClassGetters.add(EcoreCraftingUtil.stringGetter(refName)) -// refTraceClassToTracedClass.containment = true -// refTraceClassToTracedClass.ordered = false -// refTraceClassToTracedClass.unique = true -// refTraceClassToTracedClass.upperBound = -1 -// refTraceClassToTracedClass.lowerBound = 0 -// } + // Then going through all properties for the remaining generation var Set runtimeProperties = new HashSet if (allNewEClasses.contains(runtimeClass)) @@ -298,11 +278,6 @@ class TraceMMGeneratorStates { if (!dynamicProperties.empty) { runtimeProperties.addAll(dynamicProperties); } -// for (c2 : mmext.classesExtensions) { -// if(c2.extendedExistingClass == runtimeClass) { -// runtimeProperties.addAll(c2.newProperties) -// } -// } } // Storing traceability stuff diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend index 35ea65f9b..cacb6c367 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend @@ -149,18 +149,6 @@ class GenericTraceConstructorGeneratorJava { return true } - private static def boolean hasSuperTypeIn(EClass c, Collection eclasses) { - for (eclass : eclasses) { - if (c.EAllSuperTypes.contains(eclass)) - return true - } - return false - } - - private def String getTracedJavaFQN(EClassifier c) { - return getTracedJavaFQN(c,false) - } - private def String getTracedJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { if (c instanceof EClass) { val tracedClass = traceability.getTracedClass(c) @@ -194,12 +182,11 @@ class GenericTraceConstructorGeneratorJava { private static def Set findTopSuperClasses(Iterable eclasses) { val res = new HashSet for (c : eclasses) { - // TODO ugly fix to not include AS classes in the XMOF case, to remove at some point - val filtered = c.ESuperTypes.filter[s|! ( c.name.endsWith("Configuration") && c.name.startsWith(s.name))] - if (filtered.empty) { + val superTypes = c.ESuperTypes + if (superTypes.empty) { res.add(c) } else { - val candidates = findTopSuperClasses(filtered) + val candidates = findTopSuperClasses(superTypes) res.addAll(candidates) } } @@ -278,7 +265,7 @@ class GenericTraceConstructorGeneratorJava { } private def String stringGetterTracedValue(String javaVarName, EStructuralFeature p) { - val pRealType = traceability.getRealMutableClass(p.EType) + val pRealType = p.EType if (p instanceof EReference && traceability.hasTracedClass(pRealType as EClass)) { return ''' ((«getJavaFQN(traceability.getTracedClass(pRealType as EClass))»)exeToTraced.get(«javaVarName».«EcoreCraftingUtil.stringGetter(p)»)) @@ -295,9 +282,6 @@ class GenericTraceConstructorGeneratorJava { return res } - private def Set getAllNonEmptyMutableClasses() { - return traceability.allMutableClasses.filter[c|!c.allMutablePropertiesOf.empty].toSet - } private def String generateImports() { @@ -424,113 +408,113 @@ class GenericTraceConstructorGeneratorJava { private def String generateAddNewObjectToStateMethods() { return - ''' - «FOR c : traceability.allMutableClasses.sortBy[name]» - «««»«FOR c : partialOrderSort(getAllNonEmptyMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList)» - «val subTypes = partialOrderSort(findAllDirectSubTypes(c))» - «IF shouldHaveAddNewObjectToStateMethod(c)» - «IF getAllMutablePropertiesOf(c).exists[p|p instanceof EReference && p.many]» - @SuppressWarnings("unchecked") - «ENDIF» - private boolean addNewObjectToState(«getJavaFQN(c)» o_cast, «stateFQN» newState) { - boolean added = false; - «val subTypesWithMethods = subTypes.filter[sub|shouldHaveAddNewObjectToStateMethod(sub)]» - «FOR subType : subTypesWithMethods SEPARATOR " else " » - if (o_cast instanceof «getJavaFQN(subType)») { - added = addNewObjectToState((«getJavaFQN(subType)»)o_cast, newState); - } - «ENDFOR» - - «IF ! c.abstract» - - if (!added && !exeToTraced.containsKey(o_cast)) { - «tracedObjectFQN» tracedObject = «EcoreCraftingUtil.stringCreate(tracedObjectClass)»; - tracedObject.«stringSetter(tracedObjectOriginalObject, "o_cast")»; - exeToTraced.put(o_cast, tracedObject); - traceRoot.getTracedObjects().add(tracedObject); - - «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» - - // Creation of the dimension corresponding to the field «p.name» - «dimensionFQN» dimension = «EcoreCraftingUtil.stringCreate(dimensionClass)»; - tracedObject.getDimensions().add(dimension); - - «IF p.many» - - «IF p instanceof EReference» - - // Creation of the first value of the field «p.name» - «manyReferenceValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyReferenceValueClass)»; - - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» - for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)aValue, newState); - } - «ENDIF» - - firstValue_«p.name».getReferenceValues().addAll((Collection) - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» - «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState) - «ELSE» - o_cast.«EcoreCraftingUtil.stringGetter(p)» - «ENDIF» - ); - «ELSE» ««« If attribute - // Creation of the first value of the field «p.name» - «IF p.EType == EcorePackage.Literals.EINT» - «manyIntegerAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyIntegerAttributeValueClass)»; - «ELSEIF p.EType == EcorePackage.Literals.EBOOLEAN» - «manyBooleanAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyBooleanAttributeValueClass)»; - «ELSEIF p.EType == EcorePackage.Literals.ESTRING» - «manyStringAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyStringAttributeValueClass)»; - «ENDIF» - firstValue_«p.name».getAttributeValues().addAll - ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); - - «ENDIF» ««« End IF EReference/EAttribute - - «ELSE» ««« If !many - - «IF p instanceof EReference» - - // Creation of the first value of the field «p.name» - «singleReferenceValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleReferenceValueClass)»; - - «val realMutableType = traceability.getRealMutableClass(p.EType)» - if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { - «IF traceability.allMutableClasses.contains(realMutableType)» - addNewObjectToState((«getJavaFQN(realMutableType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); - firstValue_«p.name».setReferenceValue(«stringGetterTracedValue("o_cast", p)»; - «ELSE» - firstValue_«p.name».setReferenceValue(o_cast.«EcoreCraftingUtil.stringGetter(p)»)»; - «ENDIF» ««« End IF traceability.isSomehowMutable(p.EType) - } else { - firstValue_«p.name».setReferenceValue(null); - } - - «ELSE» ««« If attribute - «IF p.EType == EcorePackage.Literals.EINT» - «singleIntegerAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleIntegerAttributeValueClass)»; - «ELSEIF p.EType == EcorePackage.Literals.EBOOLEAN» - «singleBooleanAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleBooleanAttributeValueClass)»; - «ELSEIF p.EType == EcorePackage.Literals.ESTRING» - «singleStringAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleStringAttributeValueClass)»; - «ENDIF» - firstValue_«p.name».setValue(o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» ««« End IF EReference - «ENDIF» ««« End IF p.many - - dimension.getValues().add(firstValue_«p.name»); - newState.getValues().add(firstValue_«p.name»); - - «ENDFOR» ««« End FOR p : getAllMutableProperties - } // end if (!exeToTraced.containsKey - «ENDIF» ««« End IF ! c.abstract» - return added; - }// end addNewObjectToState - «ENDIF» - «ENDFOR» ««« end FOR c : traceability.allMutableClasses.sortBy[name] - ''' +''' +«FOR c : traceability.allMutableClasses.sortBy[name]» +«««»«FOR c : partialOrderSort(getAllNonEmptyMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList)» +«val subTypes = partialOrderSort(findAllDirectSubTypes(c))» +«IF shouldHaveAddNewObjectToStateMethod(c)» +«IF getAllMutablePropertiesOf(c).exists[p|p instanceof EReference && p.many]» +@SuppressWarnings("unchecked") +«ENDIF» +private boolean addNewObjectToState(«getJavaFQN(c)» o_cast, «stateFQN» newState) { +boolean added = false; +«val subTypesWithMethods = subTypes.filter[sub|shouldHaveAddNewObjectToStateMethod(sub)]» +«FOR subType : subTypesWithMethods SEPARATOR " else " » + if (o_cast instanceof «getJavaFQN(subType)») { + added = addNewObjectToState((«getJavaFQN(subType)»)o_cast, newState); + } +«ENDFOR» + +«IF ! c.abstract» + +if (!added && !exeToTraced.containsKey(o_cast)) { + «tracedObjectFQN» tracedObject = «EcoreCraftingUtil.stringCreate(tracedObjectClass)»; + tracedObject.«stringSetter(tracedObjectOriginalObject, "o_cast")»; + exeToTraced.put(o_cast, tracedObject); + traceRoot.getTracedObjects().add(tracedObject); + + «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» + + // Creation of the dimension corresponding to the field «p.name» + «dimensionFQN» dimension = «EcoreCraftingUtil.stringCreate(dimensionClass)»; + tracedObject.getDimensions().add(dimension); + + «IF p.many» + + «IF p instanceof EReference» + + // Creation of the first value of the field «p.name» + «manyReferenceValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyReferenceValueClass)»; + + «IF traceability.allMutableClasses.contains(p.EType)» + for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { + addNewObjectToState((«getJavaFQN(p.EType)»)aValue, newState); + } + «ENDIF» + + firstValue_«p.name».getReferenceValues().addAll((Collection) + «IF traceability.allMutableClasses.contains(p.EType)» + «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState) + «ELSE» + o_cast.«EcoreCraftingUtil.stringGetter(p)» + «ENDIF» + ); + «ELSE» ««« If attribute + // Creation of the first value of the field «p.name» + «IF p.EType == EcorePackage.Literals.EINT» + «manyIntegerAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyIntegerAttributeValueClass)»; + «ELSEIF p.EType == EcorePackage.Literals.EBOOLEAN» + «manyBooleanAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyBooleanAttributeValueClass)»; + «ELSEIF p.EType == EcorePackage.Literals.ESTRING» + «manyStringAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyStringAttributeValueClass)»; + «ENDIF» + firstValue_«p.name».getAttributeValues().addAll + ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); + + «ENDIF» ««« End IF EReference/EAttribute + + «ELSE» ««« If !many + + «IF p instanceof EReference» + + // Creation of the first value of the field «p.name» + «singleReferenceValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleReferenceValueClass)»; + + «val realMutableType = p.EType» + if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { + «IF traceability.allMutableClasses.contains(realMutableType)» + addNewObjectToState((«getJavaFQN(realMutableType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); + firstValue_«p.name».setReferenceValue(«stringGetterTracedValue("o_cast", p)»; + «ELSE» + firstValue_«p.name».setReferenceValue(o_cast.«EcoreCraftingUtil.stringGetter(p)»)»; + «ENDIF» ««« End IF traceability.isSomehowMutable(p.EType) + } else { + firstValue_«p.name».setReferenceValue(null); + } + + «ELSE» ««« If attribute + «IF p.EType == EcorePackage.Literals.EINT» + «singleIntegerAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleIntegerAttributeValueClass)»; + «ELSEIF p.EType == EcorePackage.Literals.EBOOLEAN» + «singleBooleanAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleBooleanAttributeValueClass)»; + «ELSEIF p.EType == EcorePackage.Literals.ESTRING» + «singleStringAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleStringAttributeValueClass)»; + «ENDIF» + firstValue_«p.name».setValue(o_cast.«EcoreCraftingUtil.stringGetter(p)»); + «ENDIF» ««« End IF EReference + «ENDIF» ««« End IF p.many + + dimension.getValues().add(firstValue_«p.name»); + newState.getValues().add(firstValue_«p.name»); + +«ENDFOR» ««« End FOR p : getAllMutableProperties +} // end if (!exeToTraced.containsKey +«ENDIF» ««« End IF ! c.abstract» +return added; +}// end addNewObjectToState +«ENDIF» +«ENDFOR» ««« end FOR c : traceability.allMutableClasses.sortBy[name] +''' } private def String generateAddStateUsingListenerMethods() { @@ -541,15 +525,6 @@ private def String generateAddStateUsingListenerMethods() { superTypes.retainAll(newAbstractClassesNotEmpty) return !c.isAbstract && (!c.EStructuralFeatures.empty || !superTypes.empty) ].toList - //val newClassesNotEmptyWithMutableProperties = newClassesNotEmpty.filter[c|!traceability.getMutablePropertiesOf(c).empty] -// val newClassesNotEmptyClosure = partialOrderSort(newClassesNotEmpty.filter[c| -// val superTypes = new ArrayList(c.EAllSuperTypes) -// superTypes.retainAll(newClassesNotEmpty) -// !(c.EStructuralFeatures.empty && !superTypes.empty) -// ].toList) - val allConcreteMutableClasses = partialOrderSort(getAllNonEmptyMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList) - //val mutableClassesWithNonCollectionMutableFields = allConcreteMutableClasses.filter[c|getAllMutablePropertiesOf(c).exists[p|!p.many]] - //val mutableClassesWithCollectionMutableFields = allConcreteMutableClasses.filter[c|getAllMutablePropertiesOf(c).exists[p| p.many]] val mutableClassesWithNonCollectionMutableFields = traceability.allMutableClasses.filter[c|!traceability.getMutablePropertiesOf(c).empty && traceability.getMutablePropertiesOf(c).exists[p|!p.many]] val mutableClassesWithCollectionMutableFields = traceability.allMutableClasses.filter[c|!traceability.getMutablePropertiesOf(c).empty && traceability.getMutablePropertiesOf(c).exists[p|p.many]] return @@ -558,9 +533,6 @@ private def String generateAddStateUsingListenerMethods() { private «stateFQN» copyState(«stateFQN» oldState) { «stateFQN» newState = «EcoreCraftingUtil.stringCreate(stateClass)»; -««« «FOR p : traceability.allMutableProperties.sortBy[FQN]» -««« newState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))».addAll(oldState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))»); -««« «ENDFOR» newState.getValues().addAll(oldState.getValues()); copiedState = true; return newState; @@ -605,7 +577,6 @@ private def String generateAddStateUsingListenerMethods() { «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o_cast); ««« Loop over the fields of this class, which are all mutable «FOR p : c.EStructuralFeatures» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val EReference pdimension = traceability.getDimensionRef(p)» ««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); newState.getValues().remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); @@ -633,7 +604,6 @@ private def String generateAddStateUsingListenerMethods() { «FOR p : nonCollectionMutableFields SEPARATOR " else "» «val EClass valueClass = traceability.getValueClass(p)» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val EReference pdimension = traceability.getDimensionRef(p)» if (p.getFeatureID() == «stringFeatureID(p)») { @@ -645,8 +615,8 @@ private def String generateAddStateUsingListenerMethods() { newState.getValues().remove(lastValue); // And we create a proper new value - ««« «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» - ««« addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); + ««« «IF traceability.allMutableClasses.contains(p.EType)» + ««« addNewObjectToState((«getJavaFQN(p.EType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); ««« «ENDIF» «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» @@ -690,7 +660,6 @@ private def String generateAddStateUsingListenerMethods() { «getJavaFQN(traced)» tracedObject = («getJavaFQN(traced)») exeToTraced.get(o_cast); «FOR p : collectionMutableFields SEPARATOR " else "» «val EClass valueClass = traceability.getValueClass(p)» - «val EReference pvalues = traceability.getStateClassToValueClass(p)» «val EReference pdimension = traceability.getDimensionRef(p)» if (p.getFeatureID() == «stringFeatureID(p)») { // We compare the last collection in the value sequence, and the current one in the potentially changed object @@ -700,9 +669,9 @@ private def String generateAddStateUsingListenerMethods() { previousValue = valueSequence.get(valueSequence.size() - 1); } ««« If instances of new class, we have to make sure that there are traced versions - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + «IF traceability.allMutableClasses.contains(p.EType)» for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)aValue, newState); + addNewObjectToState((«getJavaFQN(p.EType)»)aValue, newState); }««« end for loop on values «ENDIF» boolean change = false; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index dbc9a5fd4..ca84f9638 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -178,7 +178,7 @@ class TraceConstructorGeneratorJava { private def String stringGetterTracedValue(String javaVarName, EStructuralFeature p) { - val pRealType = traceability.getRealMutableClass(p.EType) + val pRealType = p.EType if (p instanceof EReference && traceability.hasTracedClass(pRealType as EClass)) { return ''' ((«getJavaFQN(traceability.getTracedClass(pRealType as EClass))»)exeToTraced.get(«javaVarName».«EcoreCraftingUtil.stringGetter(p)»)) @@ -364,16 +364,16 @@ if (!added && !exeToTraced.containsKey(o_cast)) { «IF p instanceof EReference» - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + «IF traceability.allMutableClasses.contains(p.EType)» for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)aValue, newState); + addNewObjectToState((«getJavaFQN(p.EType)»)aValue, newState); } «ENDIF» firstValue_«p.name».«EcoreCraftingUtil.stringGetter(p)».addAll ( (Collection) - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + «IF traceability.allMutableClasses.contains(p.EType)» «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState) «ELSE» o_cast.«EcoreCraftingUtil.stringGetter(p)» @@ -388,7 +388,7 @@ if (!added && !exeToTraced.containsKey(o_cast)) { «ELSE» ««« If !many «IF p instanceof EReference» - «val realMutableType = traceability.getRealMutableClass(p.EType)» + «val realMutableType = p.EType» if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { «IF traceability.allMutableClasses.contains(realMutableType)» addNewObjectToState((«getJavaFQN(realMutableType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); @@ -565,9 +565,9 @@ private def String generateAddStateUsingListenerMethods() { previousValue = valueSequence.get(valueSequence.size() - 1); } ««« If instances of new class, we have to make sure that there are traced versions - «IF traceability.allMutableClasses.contains(traceability.getRealMutableClass(p.EType))» + «IF traceability.allMutableClasses.contains(p.EType)» for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - addNewObjectToState((«getJavaFQN(traceability.getRealMutableClass(p.EType))»)aValue, newState); + addNewObjectToState((«getJavaFQN(p.EType)»)aValue, newState); }««« end for loop on values «ENDIF» boolean change = false; From a1d0839341a326eb2057588a070632380cf51132 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 4 Apr 2017 10:20:52 +0200 Subject: [PATCH 127/267] Rollbaxk abstract Traced classes --- .../trace/metamodel/generator/TraceMMGeneratorStates.xtend | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend index abb417338..9fd539c72 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -210,12 +210,11 @@ class TraceMMGeneratorStates { if (! runtimeToTraced.containsKey(runtimeClass)) { - val boolean hasDynamicProperties = runtimeClass.EAllStructuralFeatures.exists[f|mmext.dynamicProperties.contains(f)] // Creating the traced version of the class val tracedClass = EcoreFactory.eINSTANCE.createEClass tracedClass.name = TraceMMStrings.class_createTraceClassName(runtimeClass) - tracedClass.abstract = runtimeClass.abstract || runtimeClass.interface || !hasDynamicProperties + tracedClass.abstract = runtimeClass.abstract || runtimeClass.interface runtimeToTraced.put(runtimeClass, tracedClass) // Storing traceability stuff From 64700db915d0582b8da686d35326483f7930490d Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 4 Apr 2017 10:21:36 +0200 Subject: [PATCH 128/267] BatchModelChangeListener: remove changes from new/removed objects --- .../modelchangelistener/BatchModelChangeListener.xtend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend index 24657f6ec..c149f0e2d 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend @@ -191,6 +191,9 @@ public class BatchModelChangeListener { for (removedObject : removedObjects) { result.add(0, new RemovedObjectModelChange(removedObject)) } + + // And we remove changes registered in new/deleted objects + result.removeIf([c|c instanceof FieldModelChange && (newObjects.contains(c.changedObject) || removedObjects.contains(c.changedObject))]) return result; } From 4dff76c87b24dc3720c6f50ba083a22f796d53ed Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 4 Apr 2017 10:23:21 +0200 Subject: [PATCH 129/267] Remove all trace projects not required anymore --- .../fr.inria.diverse.trace.api/.checkstyle | 13 - .../fr.inria.diverse.trace.api/.classpath | 7 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../META-INF/MANIFEST.MF | 15 - .../fr.inria.diverse.trace.api/about.html | 27 - .../build.properties | 11 - .../plugin.properties | 4 - .../fr.inria.diverse.trace.api/plugin.xml | 10 - .../fr.inria.diverse.trace.api/pom.xml | 18 - .../src/fr/inria/diverse/trace/api/IStep.java | 34 - .../diverse/trace/api/ITraceManager.java | 73 - .../inria/diverse/trace/api/IValueTrace.java | 51 - .../diverse/trace/api/impl/GenericStep.java | 80 - .../trace/api/impl/GenericValueTrace.java | 96 -- .../trace/api/impl/LazyGenericStep.java | 111 -- .../api/impl/PartiallyLazyGenericStep.java | 112 -- .../.classpath | 1 + .../fr.inria.diverse.trace.gemoc.api/.project | 6 + .../META-INF/MANIFEST.MF | 38 +- .../trace/gemoc/api/IGemocTraceManager.java | 42 - .../fr.inria.diverse.ecorext/.checkstyle | 13 - .../fr.inria.diverse.ecorext/.classpath | 7 - .../fr.inria.diverse.ecorext/.gitignore | 1 - .../plugins/fr.inria.diverse.ecorext/.project | 34 - .../META-INF/MANIFEST.MF | 20 - .../fr.inria.diverse.ecorext/about.html | 27 - .../fr.inria.diverse.ecorext/build.properties | 12 - .../model/ecorext.aird | 1381 ----------------- .../model/ecorext.ecore | 36 - .../model/ecorext.genmodel | 29 - .../plugin.properties | 4 - .../fr.inria.diverse.ecorext/plugin.xml | 18 - .../plugins/fr.inria.diverse.ecorext/pom.xml | 18 - .../src/ecorext/ClassExtension.java | 79 - .../src/ecorext/Ecorext.java | 85 - .../src/ecorext/EcorextFactory.java | 68 - .../src/ecorext/EcorextPackage.java | 601 ------- .../src/ecorext/Rule.java | 235 --- .../src/ecorext/impl/ClassExtensionImpl.java | 222 --- .../src/ecorext/impl/EcorextFactoryImpl.java | 125 -- .../src/ecorext/impl/EcorextImpl.java | 234 --- .../src/ecorext/impl/EcorextPackageImpl.java | 360 ----- .../src/ecorext/impl/RuleImpl.java | 602 ------- .../ecorext/util/EcorextAdapterFactory.java | 164 -- .../src/ecorext/util/EcorextSwitch.java | 160 -- .../.checkstyle | 13 - .../.classpath | 8 - .../.project | 40 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../META-INF/MANIFEST.MF | 14 - .../build.properties | 6 - .../plugin.xml | 10 - .../pom.xml | 51 - ...donGeneratorIntegrationConfiguration.xtend | 75 - .../.checkstyle | 13 - .../.classpath | 8 - .../.gitignore | 3 - .../.project | 40 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../META-INF/MANIFEST.MF | 20 - .../about.html | 27 - .../build.properties | 7 - .../pom.xml | 52 - .../K3ExecutionExtensionGenerator.xtend | 99 -- .../K3StepExtractor.xtend | 496 ------ 65 files changed, 26 insertions(+), 6261 deletions(-) delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/.checkstyle delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/.classpath delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/.settings/org.eclipse.jdt.core.prefs delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/META-INF/MANIFEST.MF delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/about.html delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/build.properties delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/plugin.properties delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/plugin.xml delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/pom.xml delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/IStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/ITraceManager.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/IValueTrace.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/GenericStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/GenericValueTrace.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/LazyGenericStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/PartiallyLazyGenericStep.java delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IGemocTraceManager.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/.classpath delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/.gitignore delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/.project delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/META-INF/MANIFEST.MF delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/about.html delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/build.properties delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.aird delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.ecore delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.genmodel delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/plugin.properties delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/plugin.xml delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/pom.xml delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/ClassExtension.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/Ecorext.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/EcorextFactory.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/EcorextPackage.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/Rule.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/ClassExtensionImpl.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextFactoryImpl.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextImpl.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextPackageImpl.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/RuleImpl.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/util/EcorextAdapterFactory.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/util/EcorextSwitch.java delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.classpath delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.project delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.settings/org.eclipse.jdt.core.prefs delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/META-INF/MANIFEST.MF delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/build.properties delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/plugin.xml delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/pom.xml delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/src/fr/inria/diverse/trace/gemoc/generator/k3/K3TraceAddonGeneratorIntegrationConfiguration.xtend delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.classpath delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.gitignore delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.project delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.settings/org.eclipse.jdt.core.prefs delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/META-INF/MANIFEST.MF delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/about.html delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/build.properties delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/pom.xml delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3ExecutionExtensionGenerator.xtend delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/.checkstyle b/trace/commons/plugins/fr.inria.diverse.trace.api/.checkstyle deleted file mode 100644 index 2d51ed574..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/.checkstyle +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/.classpath b/trace/commons/plugins/fr.inria.diverse.trace.api/.classpath deleted file mode 100644 index eca7bdba8..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/.settings/org.eclipse.jdt.core.prefs b/trace/commons/plugins/fr.inria.diverse.trace.api/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dc..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/META-INF/MANIFEST.MF b/trace/commons/plugins/fr.inria.diverse.trace.api/META-INF/MANIFEST.MF deleted file mode 100644 index d8b0c9d65..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: fr.inria.diverse.trace.api;singleton:=true -Bundle-Version: 2.3.0.qualifier -Bundle-ClassPath: . -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Export-Package: fr.inria.diverse.trace.api, - fr.inria.diverse.trace.api.impl -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/about.html b/trace/commons/plugins/fr.inria.diverse.trace.api/about.html deleted file mode 100644 index 420ad0f93..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/about.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - -About - - -

    About This Content

    - -

    June 5, 2006

    -

    License

    - -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    - -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    - - - \ No newline at end of file diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/build.properties b/trace/commons/plugins/fr.inria.diverse.trace.api/build.properties deleted file mode 100644 index 22d99992f..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/build.properties +++ /dev/null @@ -1,11 +0,0 @@ -# - -bin.includes = .,\ - META-INF/,\ - plugin.xml,\ - plugin.properties,\ - about.html -jars.compile.order = . -source.. = src/ -output.. = bin/ -src.includes = about.html diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/plugin.properties b/trace/commons/plugins/fr.inria.diverse.trace.api/plugin.properties deleted file mode 100644 index eb9c74dc3..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/plugin.properties +++ /dev/null @@ -1,4 +0,0 @@ -# - -pluginName = Traceapi Model -providerName = www.example.org diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/plugin.xml b/trace/commons/plugins/fr.inria.diverse.trace.api/plugin.xml deleted file mode 100644 index 7337c948a..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/plugin.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/pom.xml b/trace/commons/plugins/fr.inria.diverse.trace.api/pom.xml deleted file mode 100644 index 6ecf57a4a..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - org.gemoc.modeldebugging.trace.commons - fr.inria.diverse.trace.api - 2.3.0-SNAPSHOT - eclipse-plugin - - - org.gemoc.modeldebugging.trace.commons - org.gemoc.modeldebugging.trace.commons.root - 2.3.0-SNAPSHOT - ../.. - - - - diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/IStep.java b/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/IStep.java deleted file mode 100644 index c4d135f71..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/IStep.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.api; - -import java.util.List; -import java.util.Map; - -public interface IStep { - - Map getParameters(); - - String getContainingClassName(); - - String getOperationName(); - - void addParameter(String name, Object value); - - int getEndingIndex(); - - int getStartingIndex(); - - IStep getParentStep(); - - List getSubSteps(); - -} diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/ITraceManager.java b/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/ITraceManager.java deleted file mode 100644 index 1519c6da7..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/ITraceManager.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.api; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; - -import fr.inria.diverse.trace.commons.model.trace.Step; - -public interface ITraceManager { - - void save(); - - void save(URI uri); - - void addState(); - - boolean addStateIfChanged(); - - void addStep(String stepRuleFQN, Map params); - - void endStep(String stepNameFQN, Object returnValue); - - void initTrace(); - - int getTraceSize(); - - void goTo(int index); - - void goTo(EObject stateOrValue); - - EObject getExecutionState(int index); - - String getDescriptionOfExecutionState(int index); - - String currentBigStep(); - - int getNumberOfValueTraces(); - - List getAllValueTraces(); - - String getDescriptionOfValue(EObject value); - - default Object getContainedValue(EObject value) { - // For now we do nothing by default, so that former trace managers can - // keep compiling - throw new IllegalStateException( - "The new getContainedValue method should not be used with old trace managers! Regenerate a trace manager to use it."); - }; - - Set getAllCurrentValues(int stateIndex); - - int getStateOrValueIndex(EObject stateOrValue); - - List getStepsForStates(int startingState, int endingState); - - default boolean isPartialTraceManager() { - return false; - } - -} diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/IValueTrace.java b/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/IValueTrace.java deleted file mode 100644 index 7e8e653d5..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/IValueTrace.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.api; - -import org.eclipse.emf.ecore.EObject; - -public interface IValueTrace { - - /** - * - * @return the number of stored values within the trace - */ - int getSize(); - - /** - * - * @param index the index of the desired value in the value trace - * @return the value in this trace contained at the given index - */ - EObject getValue(int index); - - /** - * - * @param stateIndex the index of the desired state in the global trace - * @return the active value of the given state in this trace - */ - EObject getActiveValue(int stateIndex); - - /** - * - * @param stateIndex the index of the desired state in the global trace - * @return the index of the active value of the given state in this trace - */ - int getActiveValueIndex(int stateIndex); - - /** - * - * @param stateIndex the index of the desired state in the global trace - * @return the index of the first state of the active value of the given state in this trace - */ - int getActiveValueStartingState(int stateIndex); - -} diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/GenericStep.java b/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/GenericStep.java deleted file mode 100644 index 3e57c714a..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/GenericStep.java +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.api.impl; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import fr.inria.diverse.trace.api.IStep; - -public class GenericStep implements IStep { - - private final Map parameters; - private final String operationName; - private final String containingClassName; - private final int endingIndex; - private final int startingIndex; - private final IStep parentStep; - private final List subSteps; - - public GenericStep(String containingClassName, String operationName, int startingIndex, - int endingState, IStep parentStep, List subSteps) { - this.parameters = new HashMap(); - this.operationName = operationName; - this.containingClassName = containingClassName; - this.startingIndex = startingIndex; - this.endingIndex = endingState; - this.parentStep = parentStep; - this.subSteps = subSteps; - } - - @Override - public Map getParameters() { - return parameters; - } - - @Override - public String getOperationName() { - return operationName; - } - - @Override - public String getContainingClassName() { - return containingClassName; - } - - @Override - public void addParameter(String name, Object value) { - parameters.put(name, value); - } - - @Override - public int getEndingIndex() { - return endingIndex; - } - - @Override - public int getStartingIndex() { - return startingIndex; - } - - @Override - public IStep getParentStep() { - return parentStep; - } - - @Override - public List getSubSteps() { - return subSteps; - } - -} diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/GenericValueTrace.java b/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/GenericValueTrace.java deleted file mode 100644 index 405171a3f..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/GenericValueTrace.java +++ /dev/null @@ -1,96 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.api.impl; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.ecore.EObject; - -import fr.inria.diverse.trace.api.ITraceManager; -import fr.inria.diverse.trace.api.IValueTrace; - -public class GenericValueTrace implements IValueTrace { - - List values; - ITraceManager manager; - - public GenericValueTrace(List values, ITraceManager manager) { - this.values = values; - this.manager = manager; - } - - @Override - public int getSize() { - return values.size(); - } - - @Override - public int getActiveValueIndex(int stateIndex) { - int realStateIndex = stateIndex; - if (stateIndex == -1) { - realStateIndex = manager.getTraceSize() - 1; - } - List currentValues = intersect(manager.getAllCurrentValues(realStateIndex), values); - if (!currentValues.isEmpty()) { - EObject currentValue = currentValues.get(0); - return values.indexOf(currentValue); - } else { - return -1; - } - } - - @Override - public EObject getActiveValue(int stateIndex) { - int realStateIndex = stateIndex; - if (stateIndex == -1) { - realStateIndex = manager.getTraceSize() - 1; - } - List currentValues = intersect(manager.getAllCurrentValues(realStateIndex), values); - if (!currentValues.isEmpty()) { - EObject currentValue = currentValues.get(0); - return currentValue; - } else { - return null; - } - } - - @Override - public int getActiveValueStartingState(int stateIndex) { - int realStateIndex = stateIndex; - if (stateIndex == -1) { - realStateIndex = manager.getTraceSize() - 1; - } - List currentValues = intersect(manager.getAllCurrentValues(realStateIndex), values); - if (!currentValues.isEmpty()) { - EObject currentValue = currentValues.get(0); - return manager.getStateOrValueIndex(currentValue); - } else { - return -1; - } - } - - @Override - public EObject getValue(int index) { - if (index > -1 && index < values.size()) { - return values.get(index); - } - return null; - } - - private static List intersect(Collection s1, Collection s2) { - List copy = new ArrayList(s1); - copy.retainAll(s2); - return copy; - } - -} diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/LazyGenericStep.java b/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/LazyGenericStep.java deleted file mode 100644 index 54c7460dd..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/LazyGenericStep.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.api.impl; - -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; - -import fr.inria.diverse.trace.api.IStep; - -public class LazyGenericStep implements IStep { - - private Map parameters; - private String operationName; - private String containingClassName; - private int endingIndex; - private int startingIndex; - private IStep parentStep; - private List subSteps; - private Supplier supplier; - private boolean resolved = false; - - public LazyGenericStep(Supplier stepSupplier) { - supplier = stepSupplier; - } - - private void resolve() { - IStep internalStep = supplier.get(); - parameters = internalStep.getParameters(); - operationName = internalStep.getOperationName(); - containingClassName = internalStep.getContainingClassName(); - endingIndex = internalStep.getEndingIndex(); - startingIndex = internalStep.getStartingIndex(); - parentStep = internalStep.getParentStep(); - subSteps = internalStep.getSubSteps(); - resolved = true; - supplier = null; - } - - @Override - public Map getParameters() { - if (!resolved) { - resolve(); - } - return parameters; - } - - @Override - public String getOperationName() { - if (!resolved) { - resolve(); - } - return operationName; - } - - @Override - public String getContainingClassName() { - if (!resolved) { - resolve(); - } - return containingClassName; - } - - @Override - public int getEndingIndex() { - if (!resolved) { - resolve(); - } - return endingIndex; - } - - @Override - public int getStartingIndex() { - if (!resolved) { - resolve(); - } - return startingIndex; - } - - @Override - public IStep getParentStep() { - if (!resolved) { - resolve(); - } - return parentStep; - } - - @Override - public List getSubSteps() { - if (!resolved) { - resolve(); - } - return subSteps; - } - - @Override - public void addParameter(String name, Object value) { - if (!resolved) { - resolve(); - } - parameters.put(name, value); - } -} diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/PartiallyLazyGenericStep.java b/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/PartiallyLazyGenericStep.java deleted file mode 100644 index f861f08ec..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/src/fr/inria/diverse/trace/api/impl/PartiallyLazyGenericStep.java +++ /dev/null @@ -1,112 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.api.impl; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import fr.inria.diverse.trace.api.IStep; - -public class PartiallyLazyGenericStep implements IStep { - - private Map parameters; - private String operationName; - private String containingClassName; - private int endingIndex; - private int startingIndex; - private IStep parentStep; - private List subSteps; - private Function> supplier; - private Predicate predicate; - private boolean resolved = false; - - public PartiallyLazyGenericStep(String containingClassName, String operationName, int startingIndex, - int endingState, IStep parentStep, Function> supplier) { - this.parameters = new HashMap(); - this.operationName = operationName; - this.containingClassName = containingClassName; - this.startingIndex = startingIndex; - this.endingIndex = endingState; - this.parentStep = parentStep; - this.supplier = supplier; - this.predicate = null; - } - - public PartiallyLazyGenericStep(String containingClassName, String operationName, int startingIndex, - int endingState, IStep parentStep, Function> supplier, Predicate predicate) { - this.parameters = new HashMap(); - this.operationName = operationName; - this.containingClassName = containingClassName; - this.startingIndex = startingIndex; - this.endingIndex = endingState; - this.parentStep = parentStep; - this.supplier = supplier; - this.predicate = predicate; - } - - private void resolve() { - if (predicate != null) { - subSteps = supplier.apply(this).stream().filter(predicate).collect(Collectors.toList()); - } else { - subSteps = supplier.apply(this); - } - resolved = true; - supplier = null; - predicate = null; - } - - @Override - public Map getParameters() { - return parameters; - } - - @Override - public String getOperationName() { - return operationName; - } - - @Override - public String getContainingClassName() { - return containingClassName; - } - - @Override - public int getEndingIndex() { - return endingIndex; - } - - @Override - public int getStartingIndex() { - return startingIndex; - } - - @Override - public IStep getParentStep() { - return parentStep; - } - - @Override - public List getSubSteps() { - if (!resolved) { - resolve(); - } - return subSteps; - } - - @Override - public void addParameter(String name, Object value) { - parameters.put(name, value); - } -} diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.classpath b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.classpath index eca7bdba8..428337e56 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.classpath +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.classpath @@ -3,5 +3,6 @@ + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project index 60e7deeb2..ad0021777 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project @@ -5,6 +5,11 @@ + + org.eclipse.xtext.ui.shared.xtextBuilder + + + org.eclipse.jdt.core.javabuilder @@ -30,5 +35,6 @@ org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature net.sf.eclipsecs.core.CheckstyleNature + org.eclipse.xtext.ui.shared.xtextNature diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF index 49c5f4f9b..ac3cb9393 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF @@ -1,19 +1,19 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Api -Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.api -Bundle-Version: 2.3.0.qualifier -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.emf.ecore;bundle-version="2.10.2", - fr.inria.diverse.trace.api;bundle-version="1.0.0", - fr.obeo.timeline;bundle-version="1.0.0", - org.gemoc.xdsmlframework.api;bundle-version="0.1.0", - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: fr.inria.diverse.trace.gemoc.api; - uses:="org.eclipse.emf.ecore, - org.gemoc.executionframework.engine.mse, - fr.inria.diverse.trace.api, - org.gemoc.xdsmlframework.api.engine_addon, - fr.obeo.timeline.view" +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Api +Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.api +Bundle-Version: 2.3.0.qualifier +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.emf.ecore;bundle-version="2.10.2", + fr.inria.diverse.trace.api;bundle-version="1.0.0", + fr.obeo.timeline;bundle-version="1.0.0", + org.gemoc.xdsmlframework.api;bundle-version="0.1.0", + fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", + com.google.guava, + org.eclipse.xtext.xbase.lib, + org.eclipse.xtend.lib, + org.eclipse.xtend.lib.macro +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: fr.inria.diverse.trace.gemoc.api; uses:="org.eclipse.emf.ecore, org.gemoc.executionframework.engine.mse, fr.inria.diverse.trace.api, org.gemoc.xdsmlframework.api.engine_addon, fr.obeo.timeline.view" + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IGemocTraceManager.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IGemocTraceManager.java deleted file mode 100644 index 019dbe812..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IGemocTraceManager.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; - -import java.util.Set; - -import org.eclipse.emf.ecore.EObject; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; - -import fr.inria.diverse.trace.api.ITraceManager; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; - -public interface IGemocTraceManager extends ITraceManager { - - boolean addStep(MSEOccurrence mseOccurrence); - - default void addState() { - throw new IllegalStateException( - "The old addState method should not be used with new trace managers! Regenerate a trace manager."); - } - - default boolean addStateIfChanged() { - throw new IllegalStateException( - "The old addState method should not be used with new trace managers! Regenerate a trace manager."); - } - - default void addState(Set modelChanges) { - // For now we do nothing by default, so that former trace managers can keep compiling - throw new IllegalStateException( - "The new addState method should not be used with old trace managers! Regenerate a trace manager."); - } - - public abstract void setTraceRoot(EObject object); -} diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle b/trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle deleted file mode 100644 index 42097404b..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/.checkstyle +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/.classpath b/trace/generator/plugins/fr.inria.diverse.ecorext/.classpath deleted file mode 100644 index 1fa3e6803..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/.gitignore b/trace/generator/plugins/fr.inria.diverse.ecorext/.gitignore deleted file mode 100644 index 5e56e040e..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/.project b/trace/generator/plugins/fr.inria.diverse.ecorext/.project deleted file mode 100644 index cdc3a0854..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - fr.inria.diverse.ecorext - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.ecorext/META-INF/MANIFEST.MF deleted file mode 100644 index da605a690..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: fr.inria.diverse.ecorext;singleton:=true -Bundle-Version: 2.3.0.qualifier -Bundle-ClassPath: . -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: ecorext, - ecorext.impl, - ecorext.util, - ecorext, - ecorext.impl, - ecorext.util -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.xmi;bundle-version="2.9.1" -Bundle-ActivationPolicy: lazy - diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/about.html b/trace/generator/plugins/fr.inria.diverse.ecorext/about.html deleted file mode 100644 index 420ad0f93..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/about.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - -About - - -

    About This Content

    - -

    June 5, 2006

    -

    License

    - -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    - -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    - - - \ No newline at end of file diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/build.properties b/trace/generator/plugins/fr.inria.diverse.ecorext/build.properties deleted file mode 100644 index 8a899917a..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/build.properties +++ /dev/null @@ -1,12 +0,0 @@ -# - -bin.includes = .,\ - model/,\ - META-INF/,\ - plugin.xml,\ - plugin.properties,\ - about.html -jars.compile.order = . -source.. = src/ -output.. = bin/ -src.includes = about.html diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.aird b/trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.aird deleted file mode 100644 index 827448fc9..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.aird +++ /dev/null @@ -1,1381 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - - - - - - - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - labelSize - - - - labelSize - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.ecore b/trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.ecore deleted file mode 100644 index 4826fcdb4..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.ecore +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.genmodel b/trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.genmodel deleted file mode 100644 index 52bbee0a5..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/model/ecorext.genmodel +++ /dev/null @@ -1,29 +0,0 @@ - - - ecorext.ecore - - - - - - - - - - - - - - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/plugin.properties b/trace/generator/plugins/fr.inria.diverse.ecorext/plugin.properties deleted file mode 100644 index 36b122076..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/plugin.properties +++ /dev/null @@ -1,4 +0,0 @@ -# - -pluginName = All Model -providerName = www.example.org diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/plugin.xml b/trace/generator/plugins/fr.inria.diverse.ecorext/plugin.xml deleted file mode 100644 index da54d05f8..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/plugin.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/pom.xml b/trace/generator/plugins/fr.inria.diverse.ecorext/pom.xml deleted file mode 100644 index 2baa9fd8c..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - fr.inria.diverse.ecorext - fr.inria.diverse.ecorext - 2.3.0-SNAPSHOT - eclipse-plugin - - - org.gemoc.modeldebugging.trace.generator - org.gemoc.modeldebugging.trace.generator.root - 2.3.0-SNAPSHOT - ../.. - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/ClassExtension.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/ClassExtension.java deleted file mode 100644 index 6aedb272c..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/ClassExtension.java +++ /dev/null @@ -1,79 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; - -/** - * - * A representation of the model object 'Class Extension'. - * - * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link ecorext.ClassExtension#getExtendedExistingClass Extended Existing Class}
      • - *
    • {@link ecorext.ClassExtension#getNewProperties New Properties}
      • - *
    - * - * @see ecorext.EcorextPackage#getClassExtension() - * @model - * @generated - */ -public interface ClassExtension extends EObject { - /** - * Returns the value of the 'Extended Existing Class' reference. - * - *

    - * If the meaning of the 'Extended Existing Class' reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Extended Existing Class' reference. - * @see #setExtendedExistingClass(EClass) - * @see ecorext.EcorextPackage#getClassExtension_ExtendedExistingClass() - * @model - * @generated - */ - EClass getExtendedExistingClass(); - - /** - * Sets the value of the '{@link ecorext.ClassExtension#getExtendedExistingClass Extended Existing Class}' reference. - * - * - * @param value the new value of the 'Extended Existing Class' reference. - * @see #getExtendedExistingClass() - * @generated - */ - void setExtendedExistingClass(EClass value); - - /** - * Returns the value of the 'New Properties' containment reference list. - * The list contents are of type {@link org.eclipse.emf.ecore.EStructuralFeature}. - * - *

    - * If the meaning of the 'New Properties' containment reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'New Properties' containment reference list. - * @see ecorext.EcorextPackage#getClassExtension_NewProperties() - * @model containment="true" ordered="false" - * @generated - */ - EList getNewProperties(); - -} // ClassExtension diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/Ecorext.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/Ecorext.java deleted file mode 100644 index 404fed238..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/Ecorext.java +++ /dev/null @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; - -/** - * - * A representation of the model object 'Ecorext'. - * - * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link ecorext.Ecorext#getNewPackages New Packages}
      • - *
    • {@link ecorext.Ecorext#getClassesExtensions Classes Extensions}
      • - *
    • {@link ecorext.Ecorext#getRules Rules}
      • - *
    - * - * @see ecorext.EcorextPackage#getEcorext() - * @model - * @generated - */ -public interface Ecorext extends EObject { - /** - * Returns the value of the 'New Packages' containment reference list. - * The list contents are of type {@link org.eclipse.emf.ecore.EPackage}. - * - *

    - * If the meaning of the 'New Packages' containment reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'New Packages' containment reference list. - * @see ecorext.EcorextPackage#getEcorext_NewPackages() - * @model containment="true" ordered="false" - * @generated - */ - EList getNewPackages(); - - /** - * Returns the value of the 'Classes Extensions' containment reference list. - * The list contents are of type {@link ecorext.ClassExtension}. - * - *

    - * If the meaning of the 'Classes Extensions' containment reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Classes Extensions' containment reference list. - * @see ecorext.EcorextPackage#getEcorext_ClassesExtensions() - * @model containment="true" ordered="false" - * @generated - */ - EList getClassesExtensions(); - - /** - * Returns the value of the 'Rules' containment reference list. - * The list contents are of type {@link ecorext.Rule}. - * - *

    - * If the meaning of the 'Rules' containment reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Rules' containment reference list. - * @see ecorext.EcorextPackage#getEcorext_Rules() - * @model containment="true" ordered="false" - * @generated - */ - EList getRules(); - -} // Ecorext diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/EcorextFactory.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/EcorextFactory.java deleted file mode 100644 index 9b3ebdc5e..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/EcorextFactory.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext; - -import org.eclipse.emf.ecore.EFactory; - -/** - * - * The Factory for the model. - * It provides a create method for each non-abstract class of the model. - * - * @see ecorext.EcorextPackage - * @generated - */ -public interface EcorextFactory extends EFactory { - /** - * The singleton instance of the factory. - * - * - * @generated - */ - EcorextFactory eINSTANCE = ecorext.impl.EcorextFactoryImpl.init(); - - /** - * Returns a new object of class 'Ecorext'. - * - * - * @return a new object of class 'Ecorext'. - * @generated - */ - Ecorext createEcorext(); - - /** - * Returns a new object of class 'Class Extension'. - * - * - * @return a new object of class 'Class Extension'. - * @generated - */ - ClassExtension createClassExtension(); - - /** - * Returns a new object of class 'Rule'. - * - * - * @return a new object of class 'Rule'. - * @generated - */ - Rule createRule(); - - /** - * Returns the package supported by this factory. - * - * - * @return the package supported by this factory. - * @generated - */ - EcorextPackage getEcorextPackage(); - -} //EcorextFactory diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/EcorextPackage.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/EcorextPackage.java deleted file mode 100644 index bda7bf7ee..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/EcorextPackage.java +++ /dev/null @@ -1,601 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - -/** - * - * The Package for the model. - * It contains accessors for the meta objects to represent - *
      - *
    • each class,
      • - *
    • each feature of each class,
      • - *
    • each operation of each class,
      • - *
    • each enum,
      • - *
    • and each data type
      • - *
    - * - * @see ecorext.EcorextFactory - * @model kind="package" - * @generated - */ -public interface EcorextPackage extends EPackage { - /** - * The package name. - * - * - * @generated - */ - String eNAME = "ecorext"; - - /** - * The package namespace URI. - * - * - * @generated - */ - String eNS_URI = "http://ecorext/1.0"; - - /** - * The package namespace name. - * - * - * @generated - */ - String eNS_PREFIX = "ecorext"; - - /** - * The singleton instance of the package. - * - * - * @generated - */ - EcorextPackage eINSTANCE = ecorext.impl.EcorextPackageImpl.init(); - - /** - * The meta object id for the '{@link ecorext.impl.EcorextImpl Ecorext}' class. - * - * - * @see ecorext.impl.EcorextImpl - * @see ecorext.impl.EcorextPackageImpl#getEcorext() - * @generated - */ - int ECOREXT = 0; - - /** - * The feature id for the 'New Packages' containment reference list. - * - * - * @generated - * @ordered - */ - int ECOREXT__NEW_PACKAGES = 0; - - /** - * The feature id for the 'Classes Extensions' containment reference list. - * - * - * @generated - * @ordered - */ - int ECOREXT__CLASSES_EXTENSIONS = 1; - - /** - * The feature id for the 'Rules' containment reference list. - * - * - * @generated - * @ordered - */ - int ECOREXT__RULES = 2; - - /** - * The number of structural features of the 'Ecorext' class. - * - * - * @generated - * @ordered - */ - int ECOREXT_FEATURE_COUNT = 3; - - /** - * The number of operations of the 'Ecorext' class. - * - * - * @generated - * @ordered - */ - int ECOREXT_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link ecorext.impl.ClassExtensionImpl Class Extension}' class. - * - * - * @see ecorext.impl.ClassExtensionImpl - * @see ecorext.impl.EcorextPackageImpl#getClassExtension() - * @generated - */ - int CLASS_EXTENSION = 1; - - /** - * The feature id for the 'Extended Existing Class' reference. - * - * - * @generated - * @ordered - */ - int CLASS_EXTENSION__EXTENDED_EXISTING_CLASS = 0; - - /** - * The feature id for the 'New Properties' containment reference list. - * - * - * @generated - * @ordered - */ - int CLASS_EXTENSION__NEW_PROPERTIES = 1; - - /** - * The number of structural features of the 'Class Extension' class. - * - * - * @generated - * @ordered - */ - int CLASS_EXTENSION_FEATURE_COUNT = 2; - - /** - * The number of operations of the 'Class Extension' class. - * - * - * @generated - * @ordered - */ - int CLASS_EXTENSION_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link ecorext.impl.RuleImpl Rule}' class. - * - * - * @see ecorext.impl.RuleImpl - * @see ecorext.impl.EcorextPackageImpl#getRule() - * @generated - */ - int RULE = 2; - - /** - * The feature id for the 'Called Rules' reference list. - * - * - * @generated - * @ordered - */ - int RULE__CALLED_RULES = 0; - - /** - * The feature id for the 'Operation' containment reference. - * - * - * @generated - * @ordered - */ - int RULE__OPERATION = 1; - - /** - * The feature id for the 'Step Rule' attribute. - * - * - * @generated - * @ordered - */ - int RULE__STEP_RULE = 2; - - /** - * The feature id for the 'Overriden By' reference list. - * - * - * @generated - * @ordered - */ - int RULE__OVERRIDEN_BY = 3; - - /** - * The feature id for the 'Overrides' reference. - * - * - * @generated - * @ordered - */ - int RULE__OVERRIDES = 4; - - /** - * The feature id for the 'Containing Class' reference. - * - * - * @generated - * @ordered - */ - int RULE__CONTAINING_CLASS = 5; - - /** - * The feature id for the 'Abstract' attribute. - * - * - * @generated - * @ordered - */ - int RULE__ABSTRACT = 6; - - /** - * The feature id for the 'Main' attribute. - * - * - * @generated - * @ordered - */ - int RULE__MAIN = 7; - - /** - * The number of structural features of the 'Rule' class. - * - * - * @generated - * @ordered - */ - int RULE_FEATURE_COUNT = 8; - - /** - * The number of operations of the 'Rule' class. - * - * - * @generated - * @ordered - */ - int RULE_OPERATION_COUNT = 0; - - - /** - * Returns the meta object for class '{@link ecorext.Ecorext Ecorext}'. - * - * - * @return the meta object for class 'Ecorext'. - * @see ecorext.Ecorext - * @generated - */ - EClass getEcorext(); - - /** - * Returns the meta object for the containment reference list '{@link ecorext.Ecorext#getNewPackages New Packages}'. - * - * - * @return the meta object for the containment reference list 'New Packages'. - * @see ecorext.Ecorext#getNewPackages() - * @see #getEcorext() - * @generated - */ - EReference getEcorext_NewPackages(); - - /** - * Returns the meta object for the containment reference list '{@link ecorext.Ecorext#getClassesExtensions Classes Extensions}'. - * - * - * @return the meta object for the containment reference list 'Classes Extensions'. - * @see ecorext.Ecorext#getClassesExtensions() - * @see #getEcorext() - * @generated - */ - EReference getEcorext_ClassesExtensions(); - - /** - * Returns the meta object for the containment reference list '{@link ecorext.Ecorext#getRules Rules}'. - * - * - * @return the meta object for the containment reference list 'Rules'. - * @see ecorext.Ecorext#getRules() - * @see #getEcorext() - * @generated - */ - EReference getEcorext_Rules(); - - /** - * Returns the meta object for class '{@link ecorext.ClassExtension Class Extension}'. - * - * - * @return the meta object for class 'Class Extension'. - * @see ecorext.ClassExtension - * @generated - */ - EClass getClassExtension(); - - /** - * Returns the meta object for the reference '{@link ecorext.ClassExtension#getExtendedExistingClass Extended Existing Class}'. - * - * - * @return the meta object for the reference 'Extended Existing Class'. - * @see ecorext.ClassExtension#getExtendedExistingClass() - * @see #getClassExtension() - * @generated - */ - EReference getClassExtension_ExtendedExistingClass(); - - /** - * Returns the meta object for the containment reference list '{@link ecorext.ClassExtension#getNewProperties New Properties}'. - * - * - * @return the meta object for the containment reference list 'New Properties'. - * @see ecorext.ClassExtension#getNewProperties() - * @see #getClassExtension() - * @generated - */ - EReference getClassExtension_NewProperties(); - - /** - * Returns the meta object for class '{@link ecorext.Rule Rule}'. - * - * - * @return the meta object for class 'Rule'. - * @see ecorext.Rule - * @generated - */ - EClass getRule(); - - /** - * Returns the meta object for the reference list '{@link ecorext.Rule#getCalledRules Called Rules}'. - * - * - * @return the meta object for the reference list 'Called Rules'. - * @see ecorext.Rule#getCalledRules() - * @see #getRule() - * @generated - */ - EReference getRule_CalledRules(); - - /** - * Returns the meta object for the containment reference '{@link ecorext.Rule#getOperation Operation}'. - * - * - * @return the meta object for the containment reference 'Operation'. - * @see ecorext.Rule#getOperation() - * @see #getRule() - * @generated - */ - EReference getRule_Operation(); - - /** - * Returns the meta object for the attribute '{@link ecorext.Rule#isStepRule Step Rule}'. - * - * - * @return the meta object for the attribute 'Step Rule'. - * @see ecorext.Rule#isStepRule() - * @see #getRule() - * @generated - */ - EAttribute getRule_StepRule(); - - /** - * Returns the meta object for the reference list '{@link ecorext.Rule#getOverridenBy Overriden By}'. - * - * - * @return the meta object for the reference list 'Overriden By'. - * @see ecorext.Rule#getOverridenBy() - * @see #getRule() - * @generated - */ - EReference getRule_OverridenBy(); - - /** - * Returns the meta object for the reference '{@link ecorext.Rule#getOverrides Overrides}'. - * - * - * @return the meta object for the reference 'Overrides'. - * @see ecorext.Rule#getOverrides() - * @see #getRule() - * @generated - */ - EReference getRule_Overrides(); - - /** - * Returns the meta object for the reference '{@link ecorext.Rule#getContainingClass Containing Class}'. - * - * - * @return the meta object for the reference 'Containing Class'. - * @see ecorext.Rule#getContainingClass() - * @see #getRule() - * @generated - */ - EReference getRule_ContainingClass(); - - /** - * Returns the meta object for the attribute '{@link ecorext.Rule#isAbstract Abstract}'. - * - * - * @return the meta object for the attribute 'Abstract'. - * @see ecorext.Rule#isAbstract() - * @see #getRule() - * @generated - */ - EAttribute getRule_Abstract(); - - /** - * Returns the meta object for the attribute '{@link ecorext.Rule#isMain Main}'. - * - * - * @return the meta object for the attribute 'Main'. - * @see ecorext.Rule#isMain() - * @see #getRule() - * @generated - */ - EAttribute getRule_Main(); - - /** - * Returns the factory that creates the instances of the model. - * - * - * @return the factory that creates the instances of the model. - * @generated - */ - EcorextFactory getEcorextFactory(); - - /** - * - * Defines literals for the meta objects that represent - *
      - *
    • each class,
      • - *
    • each feature of each class,
      • - *
    • each operation of each class,
      • - *
    • each enum,
      • - *
    • and each data type
      • - *
    - * - * @generated - */ - interface Literals { - /** - * The meta object literal for the '{@link ecorext.impl.EcorextImpl Ecorext}' class. - * - * - * @see ecorext.impl.EcorextImpl - * @see ecorext.impl.EcorextPackageImpl#getEcorext() - * @generated - */ - EClass ECOREXT = eINSTANCE.getEcorext(); - - /** - * The meta object literal for the 'New Packages' containment reference list feature. - * - * - * @generated - */ - EReference ECOREXT__NEW_PACKAGES = eINSTANCE.getEcorext_NewPackages(); - - /** - * The meta object literal for the 'Classes Extensions' containment reference list feature. - * - * - * @generated - */ - EReference ECOREXT__CLASSES_EXTENSIONS = eINSTANCE.getEcorext_ClassesExtensions(); - - /** - * The meta object literal for the 'Rules' containment reference list feature. - * - * - * @generated - */ - EReference ECOREXT__RULES = eINSTANCE.getEcorext_Rules(); - - /** - * The meta object literal for the '{@link ecorext.impl.ClassExtensionImpl Class Extension}' class. - * - * - * @see ecorext.impl.ClassExtensionImpl - * @see ecorext.impl.EcorextPackageImpl#getClassExtension() - * @generated - */ - EClass CLASS_EXTENSION = eINSTANCE.getClassExtension(); - - /** - * The meta object literal for the 'Extended Existing Class' reference feature. - * - * - * @generated - */ - EReference CLASS_EXTENSION__EXTENDED_EXISTING_CLASS = eINSTANCE.getClassExtension_ExtendedExistingClass(); - - /** - * The meta object literal for the 'New Properties' containment reference list feature. - * - * - * @generated - */ - EReference CLASS_EXTENSION__NEW_PROPERTIES = eINSTANCE.getClassExtension_NewProperties(); - - /** - * The meta object literal for the '{@link ecorext.impl.RuleImpl Rule}' class. - * - * - * @see ecorext.impl.RuleImpl - * @see ecorext.impl.EcorextPackageImpl#getRule() - * @generated - */ - EClass RULE = eINSTANCE.getRule(); - - /** - * The meta object literal for the 'Called Rules' reference list feature. - * - * - * @generated - */ - EReference RULE__CALLED_RULES = eINSTANCE.getRule_CalledRules(); - - /** - * The meta object literal for the 'Operation' containment reference feature. - * - * - * @generated - */ - EReference RULE__OPERATION = eINSTANCE.getRule_Operation(); - - /** - * The meta object literal for the 'Step Rule' attribute feature. - * - * - * @generated - */ - EAttribute RULE__STEP_RULE = eINSTANCE.getRule_StepRule(); - - /** - * The meta object literal for the 'Overriden By' reference list feature. - * - * - * @generated - */ - EReference RULE__OVERRIDEN_BY = eINSTANCE.getRule_OverridenBy(); - - /** - * The meta object literal for the 'Overrides' reference feature. - * - * - * @generated - */ - EReference RULE__OVERRIDES = eINSTANCE.getRule_Overrides(); - - /** - * The meta object literal for the 'Containing Class' reference feature. - * - * - * @generated - */ - EReference RULE__CONTAINING_CLASS = eINSTANCE.getRule_ContainingClass(); - - /** - * The meta object literal for the 'Abstract' attribute feature. - * - * - * @generated - */ - EAttribute RULE__ABSTRACT = eINSTANCE.getRule_Abstract(); - - /** - * The meta object literal for the 'Main' attribute feature. - * - * - * @generated - */ - EAttribute RULE__MAIN = eINSTANCE.getRule_Main(); - - } - -} //EcorextPackage diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/Rule.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/Rule.java deleted file mode 100644 index 458dd0842..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/Rule.java +++ /dev/null @@ -1,235 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EOperation; - -/** - * - * A representation of the model object 'Rule'. - * - * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link ecorext.Rule#getCalledRules Called Rules}
      • - *
    • {@link ecorext.Rule#getOperation Operation}
      • - *
    • {@link ecorext.Rule#isStepRule Step Rule}
      • - *
    • {@link ecorext.Rule#getOverridenBy Overriden By}
      • - *
    • {@link ecorext.Rule#getOverrides Overrides}
      • - *
    • {@link ecorext.Rule#getContainingClass Containing Class}
      • - *
    • {@link ecorext.Rule#isAbstract Abstract}
      • - *
    • {@link ecorext.Rule#isMain Main}
      • - *
    - * - * @see ecorext.EcorextPackage#getRule() - * @model - * @generated - */ -public interface Rule extends EObject { - /** - * Returns the value of the 'Called Rules' reference list. - * The list contents are of type {@link ecorext.Rule}. - * - *

    - * If the meaning of the 'Called Rules' reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Called Rules' reference list. - * @see ecorext.EcorextPackage#getRule_CalledRules() - * @model ordered="false" - * @generated - */ - EList getCalledRules(); - - /** - * Returns the value of the 'Operation' containment reference. - * - *

    - * If the meaning of the 'Operation' containment reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Operation' containment reference. - * @see #setOperation(EOperation) - * @see ecorext.EcorextPackage#getRule_Operation() - * @model containment="true" required="true" - * @generated - */ - EOperation getOperation(); - - /** - * Sets the value of the '{@link ecorext.Rule#getOperation Operation}' containment reference. - * - * - * @param value the new value of the 'Operation' containment reference. - * @see #getOperation() - * @generated - */ - void setOperation(EOperation value); - - /** - * Returns the value of the 'Step Rule' attribute. - * - *

    - * If the meaning of the 'Step Rule' attribute isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Step Rule' attribute. - * @see #setStepRule(boolean) - * @see ecorext.EcorextPackage#getRule_StepRule() - * @model required="true" - * @generated - */ - boolean isStepRule(); - - /** - * Sets the value of the '{@link ecorext.Rule#isStepRule Step Rule}' attribute. - * - * - * @param value the new value of the 'Step Rule' attribute. - * @see #isStepRule() - * @generated - */ - void setStepRule(boolean value); - - /** - * Returns the value of the 'Overriden By' reference list. - * The list contents are of type {@link ecorext.Rule}. - * It is bidirectional and its opposite is '{@link ecorext.Rule#getOverrides Overrides}'. - * - *

    - * If the meaning of the 'Overriden By' reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Overriden By' reference list. - * @see ecorext.EcorextPackage#getRule_OverridenBy() - * @see ecorext.Rule#getOverrides - * @model opposite="overrides" ordered="false" - * @generated - */ - EList getOverridenBy(); - - /** - * Returns the value of the 'Overrides' reference. - * It is bidirectional and its opposite is '{@link ecorext.Rule#getOverridenBy Overriden By}'. - * - *

    - * If the meaning of the 'Overrides' reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Overrides' reference. - * @see #setOverrides(Rule) - * @see ecorext.EcorextPackage#getRule_Overrides() - * @see ecorext.Rule#getOverridenBy - * @model opposite="overridenBy" - * @generated - */ - Rule getOverrides(); - - /** - * Sets the value of the '{@link ecorext.Rule#getOverrides Overrides}' reference. - * - * - * @param value the new value of the 'Overrides' reference. - * @see #getOverrides() - * @generated - */ - void setOverrides(Rule value); - - /** - * Returns the value of the 'Containing Class' reference. - * - *

    - * If the meaning of the 'Containing Class' reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Containing Class' reference. - * @see #setContainingClass(EClass) - * @see ecorext.EcorextPackage#getRule_ContainingClass() - * @model - * @generated - */ - EClass getContainingClass(); - - /** - * Sets the value of the '{@link ecorext.Rule#getContainingClass Containing Class}' reference. - * - * - * @param value the new value of the 'Containing Class' reference. - * @see #getContainingClass() - * @generated - */ - void setContainingClass(EClass value); - - /** - * Returns the value of the 'Abstract' attribute. - * - *

    - * If the meaning of the 'Abstract' attribute isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Abstract' attribute. - * @see #setAbstract(boolean) - * @see ecorext.EcorextPackage#getRule_Abstract() - * @model required="true" - * @generated - */ - boolean isAbstract(); - - /** - * Sets the value of the '{@link ecorext.Rule#isAbstract Abstract}' attribute. - * - * - * @param value the new value of the 'Abstract' attribute. - * @see #isAbstract() - * @generated - */ - void setAbstract(boolean value); - - /** - * Returns the value of the 'Main' attribute. - * - *

    - * If the meaning of the 'Main' attribute isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Main' attribute. - * @see #setMain(boolean) - * @see ecorext.EcorextPackage#getRule_Main() - * @model - * @generated - */ - boolean isMain(); - - /** - * Sets the value of the '{@link ecorext.Rule#isMain Main}' attribute. - * - * - * @param value the new value of the 'Main' attribute. - * @see #isMain() - * @generated - */ - void setMain(boolean value); - -} // Rule diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/ClassExtensionImpl.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/ClassExtensionImpl.java deleted file mode 100644 index b6a22cefa..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/ClassExtensionImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext.impl; - -import ecorext.ClassExtension; -import ecorext.EcorextPackage; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Class Extension'. - * - *

    - * The following features are implemented: - *

    - *
      - *
    • {@link ecorext.impl.ClassExtensionImpl#getExtendedExistingClass Extended Existing Class}
      • - *
    • {@link ecorext.impl.ClassExtensionImpl#getNewProperties New Properties}
      • - *
    - * - * @generated - */ -public class ClassExtensionImpl extends MinimalEObjectImpl.Container implements ClassExtension { - /** - * The cached value of the '{@link #getExtendedExistingClass() Extended Existing Class}' reference. - * - * - * @see #getExtendedExistingClass() - * @generated - * @ordered - */ - protected EClass extendedExistingClass; - - /** - * The cached value of the '{@link #getNewProperties() New Properties}' containment reference list. - * - * - * @see #getNewProperties() - * @generated - * @ordered - */ - protected EList newProperties; - - /** - * - * - * @generated - */ - protected ClassExtensionImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return EcorextPackage.Literals.CLASS_EXTENSION; - } - - /** - * - * - * @generated - */ - public EClass getExtendedExistingClass() { - if (extendedExistingClass != null && extendedExistingClass.eIsProxy()) { - InternalEObject oldExtendedExistingClass = (InternalEObject)extendedExistingClass; - extendedExistingClass = (EClass)eResolveProxy(oldExtendedExistingClass); - if (extendedExistingClass != oldExtendedExistingClass) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, EcorextPackage.CLASS_EXTENSION__EXTENDED_EXISTING_CLASS, oldExtendedExistingClass, extendedExistingClass)); - } - } - return extendedExistingClass; - } - - /** - * - * - * @generated - */ - public EClass basicGetExtendedExistingClass() { - return extendedExistingClass; - } - - /** - * - * - * @generated - */ - public void setExtendedExistingClass(EClass newExtendedExistingClass) { - EClass oldExtendedExistingClass = extendedExistingClass; - extendedExistingClass = newExtendedExistingClass; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EcorextPackage.CLASS_EXTENSION__EXTENDED_EXISTING_CLASS, oldExtendedExistingClass, extendedExistingClass)); - } - - /** - * - * - * @generated - */ - public EList getNewProperties() { - if (newProperties == null) { - newProperties = new EObjectContainmentEList(EStructuralFeature.class, this, EcorextPackage.CLASS_EXTENSION__NEW_PROPERTIES); - } - return newProperties; - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case EcorextPackage.CLASS_EXTENSION__NEW_PROPERTIES: - return ((InternalEList)getNewProperties()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case EcorextPackage.CLASS_EXTENSION__EXTENDED_EXISTING_CLASS: - if (resolve) return getExtendedExistingClass(); - return basicGetExtendedExistingClass(); - case EcorextPackage.CLASS_EXTENSION__NEW_PROPERTIES: - return getNewProperties(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case EcorextPackage.CLASS_EXTENSION__EXTENDED_EXISTING_CLASS: - setExtendedExistingClass((EClass)newValue); - return; - case EcorextPackage.CLASS_EXTENSION__NEW_PROPERTIES: - getNewProperties().clear(); - getNewProperties().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case EcorextPackage.CLASS_EXTENSION__EXTENDED_EXISTING_CLASS: - setExtendedExistingClass((EClass)null); - return; - case EcorextPackage.CLASS_EXTENSION__NEW_PROPERTIES: - getNewProperties().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case EcorextPackage.CLASS_EXTENSION__EXTENDED_EXISTING_CLASS: - return extendedExistingClass != null; - case EcorextPackage.CLASS_EXTENSION__NEW_PROPERTIES: - return newProperties != null && !newProperties.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //ClassExtensionImpl diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextFactoryImpl.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextFactoryImpl.java deleted file mode 100644 index 01e49e90b..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextFactoryImpl.java +++ /dev/null @@ -1,125 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext.impl; - -import ecorext.*; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.impl.EFactoryImpl; - -import org.eclipse.emf.ecore.plugin.EcorePlugin; - -/** - * - * An implementation of the model Factory. - * - * @generated - */ -public class EcorextFactoryImpl extends EFactoryImpl implements EcorextFactory { - /** - * Creates the default factory implementation. - * - * - * @generated - */ - public static EcorextFactory init() { - try { - EcorextFactory theEcorextFactory = (EcorextFactory)EPackage.Registry.INSTANCE.getEFactory(EcorextPackage.eNS_URI); - if (theEcorextFactory != null) { - return theEcorextFactory; - } - } - catch (Exception exception) { - EcorePlugin.INSTANCE.log(exception); - } - return new EcorextFactoryImpl(); - } - - /** - * Creates an instance of the factory. - * - * - * @generated - */ - public EcorextFactoryImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - public EObject create(EClass eClass) { - switch (eClass.getClassifierID()) { - case EcorextPackage.ECOREXT: return createEcorext(); - case EcorextPackage.CLASS_EXTENSION: return createClassExtension(); - case EcorextPackage.RULE: return createRule(); - default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); - } - } - - /** - * - * - * @generated - */ - public Ecorext createEcorext() { - EcorextImpl ecorext = new EcorextImpl(); - return ecorext; - } - - /** - * - * - * @generated - */ - public ClassExtension createClassExtension() { - ClassExtensionImpl classExtension = new ClassExtensionImpl(); - return classExtension; - } - - /** - * - * - * @generated - */ - public Rule createRule() { - RuleImpl rule = new RuleImpl(); - return rule; - } - - /** - * - * - * @generated - */ - public EcorextPackage getEcorextPackage() { - return (EcorextPackage)getEPackage(); - } - - /** - * - * - * @deprecated - * @generated - */ - @Deprecated - public static EcorextPackage getPackage() { - return EcorextPackage.eINSTANCE; - } - -} //EcorextFactoryImpl diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextImpl.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextImpl.java deleted file mode 100644 index 012298d33..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextImpl.java +++ /dev/null @@ -1,234 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext.impl; - -import ecorext.ClassExtension; -import ecorext.Ecorext; -import ecorext.EcorextPackage; -import ecorext.Rule; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Ecorext'. - * - *

    - * The following features are implemented: - *

    - *
      - *
    • {@link ecorext.impl.EcorextImpl#getNewPackages New Packages}
      • - *
    • {@link ecorext.impl.EcorextImpl#getClassesExtensions Classes Extensions}
      • - *
    • {@link ecorext.impl.EcorextImpl#getRules Rules}
      • - *
    - * - * @generated - */ -public class EcorextImpl extends MinimalEObjectImpl.Container implements Ecorext { - /** - * The cached value of the '{@link #getNewPackages() New Packages}' containment reference list. - * - * - * @see #getNewPackages() - * @generated - * @ordered - */ - protected EList newPackages; - - /** - * The cached value of the '{@link #getClassesExtensions() Classes Extensions}' containment reference list. - * - * - * @see #getClassesExtensions() - * @generated - * @ordered - */ - protected EList classesExtensions; - - /** - * The cached value of the '{@link #getRules() Rules}' containment reference list. - * - * - * @see #getRules() - * @generated - * @ordered - */ - protected EList rules; - - /** - * - * - * @generated - */ - protected EcorextImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return EcorextPackage.Literals.ECOREXT; - } - - /** - * - * - * @generated - */ - public EList getNewPackages() { - if (newPackages == null) { - newPackages = new EObjectContainmentEList(EPackage.class, this, EcorextPackage.ECOREXT__NEW_PACKAGES); - } - return newPackages; - } - - /** - * - * - * @generated - */ - public EList getClassesExtensions() { - if (classesExtensions == null) { - classesExtensions = new EObjectContainmentEList(ClassExtension.class, this, EcorextPackage.ECOREXT__CLASSES_EXTENSIONS); - } - return classesExtensions; - } - - /** - * - * - * @generated - */ - public EList getRules() { - if (rules == null) { - rules = new EObjectContainmentEList(Rule.class, this, EcorextPackage.ECOREXT__RULES); - } - return rules; - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case EcorextPackage.ECOREXT__NEW_PACKAGES: - return ((InternalEList)getNewPackages()).basicRemove(otherEnd, msgs); - case EcorextPackage.ECOREXT__CLASSES_EXTENSIONS: - return ((InternalEList)getClassesExtensions()).basicRemove(otherEnd, msgs); - case EcorextPackage.ECOREXT__RULES: - return ((InternalEList)getRules()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case EcorextPackage.ECOREXT__NEW_PACKAGES: - return getNewPackages(); - case EcorextPackage.ECOREXT__CLASSES_EXTENSIONS: - return getClassesExtensions(); - case EcorextPackage.ECOREXT__RULES: - return getRules(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case EcorextPackage.ECOREXT__NEW_PACKAGES: - getNewPackages().clear(); - getNewPackages().addAll((Collection)newValue); - return; - case EcorextPackage.ECOREXT__CLASSES_EXTENSIONS: - getClassesExtensions().clear(); - getClassesExtensions().addAll((Collection)newValue); - return; - case EcorextPackage.ECOREXT__RULES: - getRules().clear(); - getRules().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case EcorextPackage.ECOREXT__NEW_PACKAGES: - getNewPackages().clear(); - return; - case EcorextPackage.ECOREXT__CLASSES_EXTENSIONS: - getClassesExtensions().clear(); - return; - case EcorextPackage.ECOREXT__RULES: - getRules().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case EcorextPackage.ECOREXT__NEW_PACKAGES: - return newPackages != null && !newPackages.isEmpty(); - case EcorextPackage.ECOREXT__CLASSES_EXTENSIONS: - return classesExtensions != null && !classesExtensions.isEmpty(); - case EcorextPackage.ECOREXT__RULES: - return rules != null && !rules.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //EcorextImpl diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextPackageImpl.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextPackageImpl.java deleted file mode 100644 index 8b406fac8..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/EcorextPackageImpl.java +++ /dev/null @@ -1,360 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext.impl; - -import ecorext.ClassExtension; -import ecorext.Ecorext; -import ecorext.EcorextFactory; -import ecorext.EcorextPackage; -import ecorext.Rule; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - -import org.eclipse.emf.ecore.impl.EPackageImpl; - -/** - * - * An implementation of the model Package. - * - * @generated - */ -public class EcorextPackageImpl extends EPackageImpl implements EcorextPackage { - /** - * - * - * @generated - */ - private EClass ecorextEClass = null; - - /** - * - * - * @generated - */ - private EClass classExtensionEClass = null; - - /** - * - * - * @generated - */ - private EClass ruleEClass = null; - - /** - * Creates an instance of the model Package, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package - * package URI value. - *

    Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * - * - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see ecorext.EcorextPackage#eNS_URI - * @see #init() - * @generated - */ - private EcorextPackageImpl() { - super(eNS_URI, EcorextFactory.eINSTANCE); - } - - /** - * - * - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * - *

    This method is used to initialize {@link EcorextPackage#eINSTANCE} when that field is accessed. - * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. - * - * - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static EcorextPackage init() { - if (isInited) return (EcorextPackage)EPackage.Registry.INSTANCE.getEPackage(EcorextPackage.eNS_URI); - - // Obtain or create and register package - EcorextPackageImpl theEcorextPackage = (EcorextPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EcorextPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EcorextPackageImpl()); - - isInited = true; - - // Create package meta-data objects - theEcorextPackage.createPackageContents(); - - // Initialize created meta-data - theEcorextPackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theEcorextPackage.freeze(); - - - // Update the registry and return the package - EPackage.Registry.INSTANCE.put(EcorextPackage.eNS_URI, theEcorextPackage); - return theEcorextPackage; - } - - /** - * - * - * @generated - */ - public EClass getEcorext() { - return ecorextEClass; - } - - /** - * - * - * @generated - */ - public EReference getEcorext_NewPackages() { - return (EReference)ecorextEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getEcorext_ClassesExtensions() { - return (EReference)ecorextEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getEcorext_Rules() { - return (EReference)ecorextEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EClass getClassExtension() { - return classExtensionEClass; - } - - /** - * - * - * @generated - */ - public EReference getClassExtension_ExtendedExistingClass() { - return (EReference)classExtensionEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getClassExtension_NewProperties() { - return (EReference)classExtensionEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EClass getRule() { - return ruleEClass; - } - - /** - * - * - * @generated - */ - public EReference getRule_CalledRules() { - return (EReference)ruleEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getRule_Operation() { - return (EReference)ruleEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EAttribute getRule_StepRule() { - return (EAttribute)ruleEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EReference getRule_OverridenBy() { - return (EReference)ruleEClass.getEStructuralFeatures().get(3); - } - - /** - * - * - * @generated - */ - public EReference getRule_Overrides() { - return (EReference)ruleEClass.getEStructuralFeatures().get(4); - } - - /** - * - * - * @generated - */ - public EReference getRule_ContainingClass() { - return (EReference)ruleEClass.getEStructuralFeatures().get(5); - } - - /** - * - * - * @generated - */ - public EAttribute getRule_Abstract() { - return (EAttribute)ruleEClass.getEStructuralFeatures().get(6); - } - - /** - * - * - * @generated - */ - public EAttribute getRule_Main() { - return (EAttribute)ruleEClass.getEStructuralFeatures().get(7); - } - - /** - * - * - * @generated - */ - public EcorextFactory getEcorextFactory() { - return (EcorextFactory)getEFactoryInstance(); - } - - /** - * - * - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void createPackageContents() { - if (isCreated) return; - isCreated = true; - - // Create classes and their features - ecorextEClass = createEClass(ECOREXT); - createEReference(ecorextEClass, ECOREXT__NEW_PACKAGES); - createEReference(ecorextEClass, ECOREXT__CLASSES_EXTENSIONS); - createEReference(ecorextEClass, ECOREXT__RULES); - - classExtensionEClass = createEClass(CLASS_EXTENSION); - createEReference(classExtensionEClass, CLASS_EXTENSION__EXTENDED_EXISTING_CLASS); - createEReference(classExtensionEClass, CLASS_EXTENSION__NEW_PROPERTIES); - - ruleEClass = createEClass(RULE); - createEReference(ruleEClass, RULE__CALLED_RULES); - createEReference(ruleEClass, RULE__OPERATION); - createEAttribute(ruleEClass, RULE__STEP_RULE); - createEReference(ruleEClass, RULE__OVERRIDEN_BY); - createEReference(ruleEClass, RULE__OVERRIDES); - createEReference(ruleEClass, RULE__CONTAINING_CLASS); - createEAttribute(ruleEClass, RULE__ABSTRACT); - createEAttribute(ruleEClass, RULE__MAIN); - } - - /** - * - * - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void initializePackageContents() { - if (isInitialized) return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Create type parameters - - // Set bounds for type parameters - - // Add supertypes to classes - - // Initialize classes, features, and operations; add parameters - initEClass(ecorextEClass, Ecorext.class, "Ecorext", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getEcorext_NewPackages(), ecorePackage.getEPackage(), null, "newPackages", null, 0, -1, Ecorext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getEcorext_ClassesExtensions(), this.getClassExtension(), null, "classesExtensions", null, 0, -1, Ecorext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getEcorext_Rules(), this.getRule(), null, "rules", null, 0, -1, Ecorext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - - initEClass(classExtensionEClass, ClassExtension.class, "ClassExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getClassExtension_ExtendedExistingClass(), ecorePackage.getEClass(), null, "extendedExistingClass", null, 0, 1, ClassExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getClassExtension_NewProperties(), ecorePackage.getEStructuralFeature(), null, "newProperties", null, 0, -1, ClassExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - - initEClass(ruleEClass, Rule.class, "Rule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRule_CalledRules(), this.getRule(), null, "calledRules", null, 0, -1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getRule_Operation(), ecorePackage.getEOperation(), null, "operation", null, 1, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getRule_StepRule(), ecorePackage.getEBoolean(), "stepRule", null, 1, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRule_OverridenBy(), this.getRule(), this.getRule_Overrides(), "overridenBy", null, 0, -1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getRule_Overrides(), this.getRule(), this.getRule_OverridenBy(), "overrides", null, 0, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRule_ContainingClass(), ecorePackage.getEClass(), null, "containingClass", null, 0, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getRule_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 1, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getRule_Main(), ecorePackage.getEBoolean(), "main", null, 0, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - // Create resource - createResource(eNS_URI); - } - -} //EcorextPackageImpl diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/RuleImpl.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/RuleImpl.java deleted file mode 100644 index 08a786144..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/impl/RuleImpl.java +++ /dev/null @@ -1,602 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext.impl; - -import ecorext.EcorextPackage; -import ecorext.Rule; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EOperation; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectResolvingEList; -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Rule'. - * - *

    - * The following features are implemented: - *

    - *
      - *
    • {@link ecorext.impl.RuleImpl#getCalledRules Called Rules}
      • - *
    • {@link ecorext.impl.RuleImpl#getOperation Operation}
      • - *
    • {@link ecorext.impl.RuleImpl#isStepRule Step Rule}
      • - *
    • {@link ecorext.impl.RuleImpl#getOverridenBy Overriden By}
      • - *
    • {@link ecorext.impl.RuleImpl#getOverrides Overrides}
      • - *
    • {@link ecorext.impl.RuleImpl#getContainingClass Containing Class}
      • - *
    • {@link ecorext.impl.RuleImpl#isAbstract Abstract}
      • - *
    • {@link ecorext.impl.RuleImpl#isMain Main}
      • - *
    - * - * @generated - */ -public class RuleImpl extends MinimalEObjectImpl.Container implements Rule { - /** - * The cached value of the '{@link #getCalledRules() Called Rules}' reference list. - * - * - * @see #getCalledRules() - * @generated - * @ordered - */ - protected EList calledRules; - - /** - * The cached value of the '{@link #getOperation() Operation}' containment reference. - * - * - * @see #getOperation() - * @generated - * @ordered - */ - protected EOperation operation; - - /** - * The default value of the '{@link #isStepRule() Step Rule}' attribute. - * - * - * @see #isStepRule() - * @generated - * @ordered - */ - protected static final boolean STEP_RULE_EDEFAULT = false; - - /** - * The cached value of the '{@link #isStepRule() Step Rule}' attribute. - * - * - * @see #isStepRule() - * @generated - * @ordered - */ - protected boolean stepRule = STEP_RULE_EDEFAULT; - - /** - * The cached value of the '{@link #getOverridenBy() Overriden By}' reference list. - * - * - * @see #getOverridenBy() - * @generated - * @ordered - */ - protected EList overridenBy; - - /** - * The cached value of the '{@link #getOverrides() Overrides}' reference. - * - * - * @see #getOverrides() - * @generated - * @ordered - */ - protected Rule overrides; - - /** - * The cached value of the '{@link #getContainingClass() Containing Class}' reference. - * - * - * @see #getContainingClass() - * @generated - * @ordered - */ - protected EClass containingClass; - - /** - * The default value of the '{@link #isAbstract() Abstract}' attribute. - * - * - * @see #isAbstract() - * @generated - * @ordered - */ - protected static final boolean ABSTRACT_EDEFAULT = false; - - /** - * The cached value of the '{@link #isAbstract() Abstract}' attribute. - * - * - * @see #isAbstract() - * @generated - * @ordered - */ - protected boolean abstract_ = ABSTRACT_EDEFAULT; - - /** - * The default value of the '{@link #isMain() Main}' attribute. - * - * - * @see #isMain() - * @generated - * @ordered - */ - protected static final boolean MAIN_EDEFAULT = false; - - /** - * The cached value of the '{@link #isMain() Main}' attribute. - * - * - * @see #isMain() - * @generated - * @ordered - */ - protected boolean main = MAIN_EDEFAULT; - - /** - * - * - * @generated - */ - protected RuleImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return EcorextPackage.Literals.RULE; - } - - /** - * - * - * @generated - */ - public EList getCalledRules() { - if (calledRules == null) { - calledRules = new EObjectResolvingEList(Rule.class, this, EcorextPackage.RULE__CALLED_RULES); - } - return calledRules; - } - - /** - * - * - * @generated - */ - public EOperation getOperation() { - return operation; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetOperation(EOperation newOperation, NotificationChain msgs) { - EOperation oldOperation = operation; - operation = newOperation; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EcorextPackage.RULE__OPERATION, oldOperation, newOperation); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setOperation(EOperation newOperation) { - if (newOperation != operation) { - NotificationChain msgs = null; - if (operation != null) - msgs = ((InternalEObject)operation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EcorextPackage.RULE__OPERATION, null, msgs); - if (newOperation != null) - msgs = ((InternalEObject)newOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EcorextPackage.RULE__OPERATION, null, msgs); - msgs = basicSetOperation(newOperation, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EcorextPackage.RULE__OPERATION, newOperation, newOperation)); - } - - /** - * - * - * @generated - */ - public boolean isStepRule() { - return stepRule; - } - - /** - * - * - * @generated - */ - public void setStepRule(boolean newStepRule) { - boolean oldStepRule = stepRule; - stepRule = newStepRule; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EcorextPackage.RULE__STEP_RULE, oldStepRule, stepRule)); - } - - /** - * - * - * @generated - */ - public EList getOverridenBy() { - if (overridenBy == null) { - overridenBy = new EObjectWithInverseResolvingEList(Rule.class, this, EcorextPackage.RULE__OVERRIDEN_BY, EcorextPackage.RULE__OVERRIDES); - } - return overridenBy; - } - - /** - * - * - * @generated - */ - public Rule getOverrides() { - if (overrides != null && overrides.eIsProxy()) { - InternalEObject oldOverrides = (InternalEObject)overrides; - overrides = (Rule)eResolveProxy(oldOverrides); - if (overrides != oldOverrides) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, EcorextPackage.RULE__OVERRIDES, oldOverrides, overrides)); - } - } - return overrides; - } - - /** - * - * - * @generated - */ - public Rule basicGetOverrides() { - return overrides; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetOverrides(Rule newOverrides, NotificationChain msgs) { - Rule oldOverrides = overrides; - overrides = newOverrides; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EcorextPackage.RULE__OVERRIDES, oldOverrides, newOverrides); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setOverrides(Rule newOverrides) { - if (newOverrides != overrides) { - NotificationChain msgs = null; - if (overrides != null) - msgs = ((InternalEObject)overrides).eInverseRemove(this, EcorextPackage.RULE__OVERRIDEN_BY, Rule.class, msgs); - if (newOverrides != null) - msgs = ((InternalEObject)newOverrides).eInverseAdd(this, EcorextPackage.RULE__OVERRIDEN_BY, Rule.class, msgs); - msgs = basicSetOverrides(newOverrides, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EcorextPackage.RULE__OVERRIDES, newOverrides, newOverrides)); - } - - /** - * - * - * @generated - */ - public EClass getContainingClass() { - if (containingClass != null && containingClass.eIsProxy()) { - InternalEObject oldContainingClass = (InternalEObject)containingClass; - containingClass = (EClass)eResolveProxy(oldContainingClass); - if (containingClass != oldContainingClass) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, EcorextPackage.RULE__CONTAINING_CLASS, oldContainingClass, containingClass)); - } - } - return containingClass; - } - - /** - * - * - * @generated - */ - public EClass basicGetContainingClass() { - return containingClass; - } - - /** - * - * - * @generated - */ - public void setContainingClass(EClass newContainingClass) { - EClass oldContainingClass = containingClass; - containingClass = newContainingClass; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EcorextPackage.RULE__CONTAINING_CLASS, oldContainingClass, containingClass)); - } - - /** - * - * - * @generated - */ - public boolean isAbstract() { - return abstract_; - } - - /** - * - * - * @generated - */ - public void setAbstract(boolean newAbstract) { - boolean oldAbstract = abstract_; - abstract_ = newAbstract; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EcorextPackage.RULE__ABSTRACT, oldAbstract, abstract_)); - } - - /** - * - * - * @generated - */ - public boolean isMain() { - return main; - } - - /** - * - * - * @generated - */ - public void setMain(boolean newMain) { - boolean oldMain = main; - main = newMain; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EcorextPackage.RULE__MAIN, oldMain, main)); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case EcorextPackage.RULE__OVERRIDEN_BY: - return ((InternalEList)(InternalEList)getOverridenBy()).basicAdd(otherEnd, msgs); - case EcorextPackage.RULE__OVERRIDES: - if (overrides != null) - msgs = ((InternalEObject)overrides).eInverseRemove(this, EcorextPackage.RULE__OVERRIDEN_BY, Rule.class, msgs); - return basicSetOverrides((Rule)otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case EcorextPackage.RULE__OPERATION: - return basicSetOperation(null, msgs); - case EcorextPackage.RULE__OVERRIDEN_BY: - return ((InternalEList)getOverridenBy()).basicRemove(otherEnd, msgs); - case EcorextPackage.RULE__OVERRIDES: - return basicSetOverrides(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case EcorextPackage.RULE__CALLED_RULES: - return getCalledRules(); - case EcorextPackage.RULE__OPERATION: - return getOperation(); - case EcorextPackage.RULE__STEP_RULE: - return isStepRule(); - case EcorextPackage.RULE__OVERRIDEN_BY: - return getOverridenBy(); - case EcorextPackage.RULE__OVERRIDES: - if (resolve) return getOverrides(); - return basicGetOverrides(); - case EcorextPackage.RULE__CONTAINING_CLASS: - if (resolve) return getContainingClass(); - return basicGetContainingClass(); - case EcorextPackage.RULE__ABSTRACT: - return isAbstract(); - case EcorextPackage.RULE__MAIN: - return isMain(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case EcorextPackage.RULE__CALLED_RULES: - getCalledRules().clear(); - getCalledRules().addAll((Collection)newValue); - return; - case EcorextPackage.RULE__OPERATION: - setOperation((EOperation)newValue); - return; - case EcorextPackage.RULE__STEP_RULE: - setStepRule((Boolean)newValue); - return; - case EcorextPackage.RULE__OVERRIDEN_BY: - getOverridenBy().clear(); - getOverridenBy().addAll((Collection)newValue); - return; - case EcorextPackage.RULE__OVERRIDES: - setOverrides((Rule)newValue); - return; - case EcorextPackage.RULE__CONTAINING_CLASS: - setContainingClass((EClass)newValue); - return; - case EcorextPackage.RULE__ABSTRACT: - setAbstract((Boolean)newValue); - return; - case EcorextPackage.RULE__MAIN: - setMain((Boolean)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case EcorextPackage.RULE__CALLED_RULES: - getCalledRules().clear(); - return; - case EcorextPackage.RULE__OPERATION: - setOperation((EOperation)null); - return; - case EcorextPackage.RULE__STEP_RULE: - setStepRule(STEP_RULE_EDEFAULT); - return; - case EcorextPackage.RULE__OVERRIDEN_BY: - getOverridenBy().clear(); - return; - case EcorextPackage.RULE__OVERRIDES: - setOverrides((Rule)null); - return; - case EcorextPackage.RULE__CONTAINING_CLASS: - setContainingClass((EClass)null); - return; - case EcorextPackage.RULE__ABSTRACT: - setAbstract(ABSTRACT_EDEFAULT); - return; - case EcorextPackage.RULE__MAIN: - setMain(MAIN_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case EcorextPackage.RULE__CALLED_RULES: - return calledRules != null && !calledRules.isEmpty(); - case EcorextPackage.RULE__OPERATION: - return operation != null; - case EcorextPackage.RULE__STEP_RULE: - return stepRule != STEP_RULE_EDEFAULT; - case EcorextPackage.RULE__OVERRIDEN_BY: - return overridenBy != null && !overridenBy.isEmpty(); - case EcorextPackage.RULE__OVERRIDES: - return overrides != null; - case EcorextPackage.RULE__CONTAINING_CLASS: - return containingClass != null; - case EcorextPackage.RULE__ABSTRACT: - return abstract_ != ABSTRACT_EDEFAULT; - case EcorextPackage.RULE__MAIN: - return main != MAIN_EDEFAULT; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (stepRule: "); - result.append(stepRule); - result.append(", abstract: "); - result.append(abstract_); - result.append(", main: "); - result.append(main); - result.append(')'); - return result.toString(); - } - -} //RuleImpl diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/util/EcorextAdapterFactory.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/util/EcorextAdapterFactory.java deleted file mode 100644 index ba8e122fb..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/util/EcorextAdapterFactory.java +++ /dev/null @@ -1,164 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext.util; - -import ecorext.*; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notifier; - -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * The Adapter Factory for the model. - * It provides an adapter createXXX method for each class of the model. - * - * @see ecorext.EcorextPackage - * @generated - */ -public class EcorextAdapterFactory extends AdapterFactoryImpl { - /** - * The cached model package. - * - * - * @generated - */ - protected static EcorextPackage modelPackage; - - /** - * Creates an instance of the adapter factory. - * - * - * @generated - */ - public EcorextAdapterFactory() { - if (modelPackage == null) { - modelPackage = EcorextPackage.eINSTANCE; - } - } - - /** - * Returns whether this factory is applicable for the type of the object. - * - * This implementation returns true if the object is either the model's package or is an instance object of the model. - * - * @return whether this factory is applicable for the type of the object. - * @generated - */ - @Override - public boolean isFactoryForType(Object object) { - if (object == modelPackage) { - return true; - } - if (object instanceof EObject) { - return ((EObject)object).eClass().getEPackage() == modelPackage; - } - return false; - } - - /** - * The switch that delegates to the createXXX methods. - * - * - * @generated - */ - protected EcorextSwitch modelSwitch = - new EcorextSwitch() { - @Override - public Adapter caseEcorext(Ecorext object) { - return createEcorextAdapter(); - } - @Override - public Adapter caseClassExtension(ClassExtension object) { - return createClassExtensionAdapter(); - } - @Override - public Adapter caseRule(Rule object) { - return createRuleAdapter(); - } - @Override - public Adapter defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; - - /** - * Creates an adapter for the target. - * - * - * @param target the object to adapt. - * @return the adapter for the target. - * @generated - */ - @Override - public Adapter createAdapter(Notifier target) { - return modelSwitch.doSwitch((EObject)target); - } - - - /** - * Creates a new adapter for an object of class '{@link ecorext.Ecorext Ecorext}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see ecorext.Ecorext - * @generated - */ - public Adapter createEcorextAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link ecorext.ClassExtension Class Extension}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see ecorext.ClassExtension - * @generated - */ - public Adapter createClassExtensionAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link ecorext.Rule Rule}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see ecorext.Rule - * @generated - */ - public Adapter createRuleAdapter() { - return null; - } - - /** - * Creates a new adapter for the default case. - * - * This default implementation returns null. - * - * @return the new adapter. - * @generated - */ - public Adapter createEObjectAdapter() { - return null; - } - -} //EcorextAdapterFactory diff --git a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/util/EcorextSwitch.java b/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/util/EcorextSwitch.java deleted file mode 100644 index 579ca278d..000000000 --- a/trace/generator/plugins/fr.inria.diverse.ecorext/src/ecorext/util/EcorextSwitch.java +++ /dev/null @@ -1,160 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package ecorext.util; - -import ecorext.*; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.util.Switch; - -/** - * - * The Switch for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} - * to invoke the caseXXX method for each class of the model, - * starting with the actual class of the object - * and proceeding up the inheritance hierarchy - * until a non-null result is returned, - * which is the result of the switch. - * - * @see ecorext.EcorextPackage - * @generated - */ -public class EcorextSwitch extends Switch { - /** - * The cached model package - * - * - * @generated - */ - protected static EcorextPackage modelPackage; - - /** - * Creates an instance of the switch. - * - * - * @generated - */ - public EcorextSwitch() { - if (modelPackage == null) { - modelPackage = EcorextPackage.eINSTANCE; - } - } - - /** - * Checks whether this is a switch for the given package. - * - * - * @param ePackage the package in question. - * @return whether this is a switch for the given package. - * @generated - */ - @Override - protected boolean isSwitchFor(EPackage ePackage) { - return ePackage == modelPackage; - } - - /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. - * - * - * @return the first non-null result returned by a caseXXX call. - * @generated - */ - @Override - protected T doSwitch(int classifierID, EObject theEObject) { - switch (classifierID) { - case EcorextPackage.ECOREXT: { - Ecorext ecorext = (Ecorext)theEObject; - T result = caseEcorext(ecorext); - if (result == null) result = defaultCase(theEObject); - return result; - } - case EcorextPackage.CLASS_EXTENSION: { - ClassExtension classExtension = (ClassExtension)theEObject; - T result = caseClassExtension(classExtension); - if (result == null) result = defaultCase(theEObject); - return result; - } - case EcorextPackage.RULE: { - Rule rule = (Rule)theEObject; - T result = caseRule(rule); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); - } - } - - /** - * Returns the result of interpreting the object as an instance of 'Ecorext'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Ecorext'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEcorext(Ecorext object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Class Extension'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Class Extension'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseClassExtension(ClassExtension object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Rule'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Rule'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseRule(Rule object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'EObject'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last case anyway. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'EObject'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) - * @generated - */ - @Override - public T defaultCase(EObject object) { - return null; - } - -} //EcorextSwitch diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle deleted file mode 100644 index 42097404b..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.checkstyle +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.classpath b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.classpath deleted file mode 100644 index 428337e56..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.project b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.project deleted file mode 100644 index 678f97180..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - fr.inria.diverse.trace.gemoc.generator.k3 - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.settings/org.eclipse.jdt.core.prefs b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dc..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/META-INF/MANIFEST.MF deleted file mode 100644 index 4ceb96d27..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: K3 -Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.generator.k3;singleton:=true -Bundle-Version: 2.3.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.xtend.lib, - fr.inria.diverse.trace.gemoc.generator, - fr.inria.diverse.melange.metamodel, - fr.inria.diverse.trace.plaink3.tracematerialextractor, - org.eclipse.core.resources, - org.eclipse.jdt.core, - fr.inria.diverse.ecorext, - org.eclipse.core.runtime diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/build.properties b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/build.properties deleted file mode 100644 index 600d1b446..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/plugin.xml b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/plugin.xml deleted file mode 100644 index af7e15618..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/plugin.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/pom.xml deleted file mode 100644 index ef779c63b..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - org.gemoc.multidimensional_trace_management - fr.inria.diverse.trace.gemoc.generator.k3 - 2.3.0-SNAPSHOT - eclipse-plugin - - - org.gemoc.modeldebugging.trace.generator - org.gemoc.modeldebugging.trace.generator.root - 2.3.0-SNAPSHOT - ../.. - - - - - - org.eclipse.xtend - xtend-maven-plugin - ${xtend.version} - - - - compile - - - xtend-gen - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 2.5 - - - - xtend-gen - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/src/fr/inria/diverse/trace/gemoc/generator/k3/K3TraceAddonGeneratorIntegrationConfiguration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/src/fr/inria/diverse/trace/gemoc/generator/k3/K3TraceAddonGeneratorIntegrationConfiguration.xtend deleted file mode 100644 index b792857db..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator.k3/src/fr/inria/diverse/trace/gemoc/generator/k3/K3TraceAddonGeneratorIntegrationConfiguration.xtend +++ /dev/null @@ -1,75 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.k3 - -import fr.inria.diverse.melange.metamodel.melange.Language -import fr.inria.diverse.trace.plaink3.tracematerialextractor.K3ExecutionExtensionGenerator -import fr.inria.diverse.trace.plaink3.tracematerialextractor.K3StepExtractor -import java.util.Set -import org.eclipse.core.resources.IProject -import org.eclipse.emf.ecore.EPackage -import org.eclipse.jdt.core.IJavaProject -import org.eclipse.jdt.core.JavaCore -import org.eclipse.emf.ecore.resource.ResourceSet -import org.eclipse.jdt.core.IType -import fr.inria.diverse.trace.gemoc.generator.TraceAddonGeneratorIntegrationConfiguration -import ecorext.Ecorext - -/** - * Plenty of ways to call the generator in an eclipse context - */ -class K3TraceAddonGeneratorIntegrationConfiguration implements TraceAddonGeneratorIntegrationConfiguration { - - private var Ecorext mmextension - private var Set executionMetamodel - - private static def Set findAspects(Language language, IProject melangeProject) { - val aspectNames = language.semantics.map[aspectTypeRef.type.qualifiedName].toList - val IJavaProject javaProject = JavaCore.create(melangeProject); - val aspectClasses = aspectNames.map[it|javaProject.findType(it)].toSet - return aspectClasses - - } - - override compute(Language language, String selectedLanguage, IProject melangeProject, Set abstractSyntax, - ResourceSet rs) { - - this.executionMetamodel = abstractSyntax - - val aspectClasses = findAspects(language, melangeProject) - - val K3ExecutionExtensionGenerator extgen = new K3ExecutionExtensionGenerator(abstractSyntax.head); - extgen.generate(); - - val mmextension = extgen.mmextensionResult - - val K3StepExtractor eventsgen = new K3StepExtractor(aspectClasses, selectedLanguage, abstractSyntax.head, - mmextension); - eventsgen.generate(); - - this.mmextension = mmextension - - } - - override canWorkWith(Language language, IProject melangeProject) { - val aspectClasses = findAspects(language, melangeProject) - return !aspectClasses.empty - } - - override getExecutionExtension() { - return mmextension - } - - override getExecutionMetamodel() { - return executionMetamodel - } - -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle deleted file mode 100644 index 42097404b..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.checkstyle +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.classpath b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.classpath deleted file mode 100644 index 87e8cd659..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.gitignore b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.gitignore deleted file mode 100644 index ed683fd9e..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/xtend-gen/* -/xtend-gen/ diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.project b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.project deleted file mode 100644 index e99db4b56..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - fr.inria.diverse.trace.plaink3.tracematerialextractor - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.settings/org.eclipse.jdt.core.prefs b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dc..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/META-INF/MANIFEST.MF deleted file mode 100644 index 924517666..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: fr.inria.diverse.trace.metamodel.generator.k3al -Bundle-SymbolicName: fr.inria.diverse.trace.plaink3.tracematerialextractor -Bundle-Version: 2.3.0.qualifier -Require-Bundle: org.eclipse.emf.ecore, - org.eclipse.xtend.core, - org.eclipse.xtext, - org.eclipse.jdt.core, - fr.inria.diverse.trace.commons, - org.eclipse.core.resources, - org.eclipse.core.runtime, - fr.inria.diverse.ecorext, - org.apache.log4j, - org.eclipse.xtend.ide, - org.gemoc.xdsmlframework.commons, - org.eclipse.jdt.ui, - fr.inria.diverse.commons.eclipse.pde -Export-Package: fr.inria.diverse.trace.plaink3.tracematerialextractor -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/about.html b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/about.html deleted file mode 100644 index 420ad0f93..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/about.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - -About - - -

    About This Content

    - -

    June 5, 2006

    -

    License

    - -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    - -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    - - - \ No newline at end of file diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/build.properties b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/build.properties deleted file mode 100644 index 0ca040a19..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - about.html -src.includes = about.html diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/pom.xml deleted file mode 100644 index 35c889f6f..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - org.gemoc.multidimensional_trace_management - fr.inria.diverse.trace.plaink3.tracematerialextractor - 2.3.0-SNAPSHOT - eclipse-plugin - - - org.gemoc.modeldebugging.trace.generator - org.gemoc.modeldebugging.trace.generator.root - 2.3.0-SNAPSHOT - ../.. - - - - - - org.eclipse.xtend - xtend-maven-plugin - ${xtend.version} - - - - compile - - - xtend-gen - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 2.5 - - - - xtend-gen - - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3ExecutionExtensionGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3ExecutionExtensionGenerator.xtend deleted file mode 100644 index 70f70270f..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3ExecutionExtensionGenerator.xtend +++ /dev/null @@ -1,99 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.plaink3.tracematerialextractor - -import org.eclipse.emf.ecore.EPackage -import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.EStructuralFeature -import ecorext.Ecorext -import ecorext.EcorextFactory -import org.eclipse.emf.ecore.util.EcoreUtil.Copier -import org.eclipse.xtend.lib.annotations.Accessors -import org.eclipse.emf.ecore.EcoreFactory -import org.gemoc.xdsmlframework.commons.DynamicAnnotationHelper - -class K3ExecutionExtensionGenerator { - - // Input - private val EPackage extendedMetamodel - - // Output - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) - private var Ecorext mmextensionResult - - new(EPackage extendedMetamodel) { - this.extendedMetamodel = extendedMetamodel - this.mmextensionResult = EcorextFactory.eINSTANCE.createEcorext - } - - protected def EPackage obtainExtensionPackage(EPackage runtimePackage) { - - // Null means that the root is the Ecorext object - var EPackage result = null - - if (runtimePackage != null) { - - val tracedSuperPackage = obtainExtensionPackage(runtimePackage.ESuperPackage) - - if (tracedSuperPackage == null) - result = mmextensionResult.newPackages.findFirst[p|p.name.equals(runtimePackage.name)] - else - result = tracedSuperPackage.ESubpackages.findFirst[p|p.name.equals(runtimePackage.name)] - - if (result == null) { - result = EcoreFactory.eINSTANCE.createEPackage - result.name = runtimePackage.name - result.nsURI = result.name // TODO - result.nsPrefix = "" // TODO - if (tracedSuperPackage == null) { - mmextensionResult.newPackages.add(result) - } else - tracedSuperPackage.ESubpackages.add(result) - } - - } - return result - } - - def void generate() { - - val Copier copier = new Copier() - - for (c : extendedMetamodel.eAllContents.filter(EClass).toSet) { - - // Either partially mutable or not mutable at all - if (!DynamicAnnotationHelper.isDynamic(c)) { - - val mutableProperties = c.EStructuralFeatures.filter[p|DynamicAnnotationHelper.isDynamic(p)] - if (mutableProperties != null && !mutableProperties.empty) { - val classExt = EcorextFactory.eINSTANCE.createClassExtension - - // TODO for now we refer to the extended metamodel, not the original one! - classExt.extendedExistingClass = c - mmextensionResult.classesExtensions.add(classExt) - for (p : mutableProperties) { - val copiedProp = copier.copy(p) as EStructuralFeature - classExt.newProperties.add(copiedProp) - } - } - } // Or completely mutable - else { - - val EClass copiedClass = copier.copy(c) as EClass - val EPackage containingPackage = obtainExtensionPackage(c.EPackage) - containingPackage.EClassifiers.add(copiedClass) - - } - } - copier.copyReferences - - } -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend deleted file mode 100644 index 82efd3348..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/K3StepExtractor.xtend +++ /dev/null @@ -1,496 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.plaink3.tracematerialextractor - -import ecorext.Ecorext -import ecorext.EcorextFactory -import ecorext.Rule -import fr.inria.diverse.commons.eclipse.callgraph.CallHierarchyHelper -import java.util.ArrayList -import java.util.HashMap -import java.util.HashSet -import java.util.List -import java.util.Map -import java.util.Set -import org.eclipse.core.runtime.NullProgressMonitor -import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.EOperation -import org.eclipse.emf.ecore.EPackage -import org.eclipse.emf.ecore.EcoreFactory -import org.eclipse.jdt.core.IAnnotation -import org.eclipse.jdt.core.IMethod -import org.eclipse.jdt.core.IType -class K3StepExtractor { - - // Input - private val Set allClasses - private val EPackage extendedMetamodel - - // Input / Output - private val Ecorext ecoreExtension - - // Transient - private val Map stepAspectsClassToAspectedClasses = new HashMap - private val Set allMethods = new HashSet - private val Set allk3Methods = new HashSet - private val Set allSuperMethods = new HashSet - private val Set stepFunctions = new HashSet - private val Set eventFunctions = new HashSet - private val Map functionToRule = new HashMap - private val Set inspectedClasses = new HashSet - - private val Map methodToK3Method = new HashMap - private val Map k3MethodToMethod = new HashMap - private val Map superMethodTok3Method = new HashMap - private val Map> k3MethodToCalledMethods = new HashMap - private val Map> methodToOverridingMethods = new HashMap - private val Map> callGraph = new HashMap - private val Map> classToSubClasses = new HashMap - private val Map> classToSuperClasses = new HashMap - - - new(Set aspects, String languageName, EPackage extendedMetamodel, Ecorext inConstructionEcorext) { - this.allClasses = aspects - this.extendedMetamodel = extendedMetamodel - this.ecoreExtension = inConstructionEcorext - } - - public def void generate() { - generateStepFromXtend(allClasses) - } - - private def Rule getRuleOfFunction(IMethod function) { - if (functionToRule.containsKey(function)) - return functionToRule.get(function) - else { - val Rule rule = EcorextFactory.eINSTANCE.createRule; - this.ecoreExtension.rules.add(rule) - - // We find the ecore class matching the aspected java class - val containingClass = function.declaringType - rule.containingClass = stepAspectsClassToAspectedClasses.get(containingClass) - - var EOperation candidate = null - if (rule.containingClass != null) { - candidate = rule.containingClass.EAllOperations.findFirst [ o | - o.name.equals(function.elementName) - ] - - } - if (candidate != null) { - rule.operation = candidate - } else { - rule.operation = xtendFunctionToEOperation(function) - } - - rule.stepRule = stepFunctions.contains(function) - rule.main = isMain(function) - functionToRule.put(function, rule) - return rule - } - } - - private def void inspectForBigStep(IMethod function) { - - // We consider that each Kermeta function is a transformation rule (even through we cannot know if it modifies anything) - val Rule rule = getRuleOfFunction(function) - - // We retrieve which functions are called by the function - val calledFunctions = callGraph.get(function) - if (calledFunctions != null) { - for (calledFunction : calledFunctions) { - if (calledFunction !== null) { - val Rule calledRule = getRuleOfFunction(calledFunction) - rule.calledRules.add(calledRule) - } - } - } - - // Finally we look if this function was overriden/implemented by subtypes - // TODO use annotation? - val subtypes = classToSubClasses.get(function.declaringType) - if (subtypes != null) { - for (t : subtypes) { - for (f : t.methods) { - if (f.elementName.equals(function.elementName)) { - val Rule overridingRule = getRuleOfFunction(f) - rule.overridenBy.add(overridingRule) - } - } - } - } - } - - private def EOperation xtendFunctionToEOperation(IMethod function) { - val result = EcoreFactory.eINSTANCE.createEOperation - result.name = function.elementName - // TODO finish the translation and/or ask Thomas - // TODO or consider it is already in the ecore? - return result - } - - private def void inspectClass(IType type) { - if (!inspectedClasses.contains(type)) { - // Gather all the actual bodies of the methods (_privk3_ methods) - val typeK3Methods = type.methods.filter[elementName.startsWith("_privk3_")] - allk3Methods.addAll(typeK3Methods) - - // Gather the methods calling those k3 methods - val typeMethods = type.methods.filter[m|typeK3Methods.exists[c| - c.elementName.substring(8).equals(m.elementName) - ]] - allMethods.addAll(typeMethods) - - typeMethods.forEach[m| - val k3m = typeK3Methods.findFirst[c|c.elementName.substring(8).equals(m.elementName)] - k3MethodToMethod.put(k3m,m) - methodToK3Method.put(m,k3m) - ] - - val Set candidateSupers = new HashSet - candidateSupers.addAll(type.methods.filter[elementName.startsWith("super_")]) - - // Gather all k3 generated super methods - allSuperMethods.addAll(candidateSupers.filter[c|type.methods.exists[m| - c.elementName.substring(6).equals(m.elementName) - ]]) - - // For each aspect annotation of the class - for (a : getAspectAnnotations(type)) { - - // We find the JVM aspected class - val aspectedEClass = getAspectized(a) - - // We store the aspect class and the aspected class - stepAspectsClassToAspectedClasses.put(type, aspectedEClass) - - // We store all the functions with @Step - stepFunctions.addAll(type.methods.filter[isStep]) - - // And we store all the functions with @EventProcessor - eventFunctions.addAll(type.methods.filter[isEvent]) - } - inspectedClasses.add(type) - } - } - - private def void gatherCallsFromK3(IMethod function) { - val callingSites = CallHierarchyHelper.getCallLocationsOf(function) - callingSites.forEach[cl| - val f = function - val member = cl.member - val method = getContainingAspectMethod(member as IMethod) - allk3Methods - // Filter out non-k3 methods - .filter[m|m == method] - // And add 'function' to the called methods of each calling k3 method - .forEach[m| - var calledMethods = k3MethodToCalledMethods.get(m) - if (calledMethods == null) { - calledMethods = new HashSet - k3MethodToCalledMethods.put(m,calledMethods) - } - calledMethods.add(f) - ] - ] - } - - private def void gatherCallsFromSuper(IMethod function) { - val callingSites = CallHierarchyHelper.getCallLocationsOf(function) - callingSites.forEach[cl| - allSuperMethods - // TODO unfold lambdas - - // Filter out non-super methods - .filter[m|m == cl.member] - // And set 'function' to be the called method of each calling super method - .forEach[m|superMethodTok3Method.put(m,function)] - ] - } - - private def void gatherOverridenMethods(IMethod method) { - if (method.override) { - val methodName = method.elementName - val declaringType = method.declaringType - val superClasses = classToSuperClasses.get(declaringType) - if (superClasses != null) { - superClasses.forEach[c| - val overridenMethod = c.methods.findFirst[m|m.elementName.equals(methodName)] - if (overridenMethod != null) { - var overridingMethods = methodToOverridingMethods.get(overridenMethod) - if (overridingMethods == null) { - overridingMethods = new HashSet - methodToOverridingMethods.put(overridenMethod,overridingMethods) - } - overridingMethods.add(method) - } - ] - } - } - } - - private def generateStepFromXtend(Set files) { - // First we store the class hierarchy of each class. - allClasses.forEach[c| - val allSuperClasses = c.allSuperClasses.filter[t|allClasses.contains(t)].toSet - classToSuperClasses.put(c,allSuperClasses) - val allSubClasses = c.allSubClasses.filter[t|allClasses.contains(t)].toSet - classToSubClasses.put(c,allSubClasses) - ] - - // Then we look for functions, step aspects and step functions - for (c : allClasses) { - inspectClass(c) - } - - allk3Methods.forEach[gatherCallsFromSuper] - allMethods.forEach[gatherOverridenMethods] - allMethods.forEach[gatherCallsFromK3] - allSuperMethods.forEach[gatherCallsFromK3] - - // We establish the base callgraph. - allMethods.forEach[m| - val k3m = methodToK3Method.get(m) - if (k3m != null) { - val calledMethods = k3MethodToCalledMethods.get(k3m) - if (calledMethods != null) { - calledMethods.forEach[c| - if (allMethods.contains(c)) { - var tmp = callGraph.get(m) - if (tmp == null) { - tmp = new HashSet - callGraph.put(m,tmp) - } - tmp.add(c) - } - ] - } - } - ] - - val callGraphTotalLengthComputer = [|callGraph.values.map[s|s.size].reduce[i1, i2|i1 + i2]] - - // For each method, we add to its called methods the methods that can be called - // from each of its overriding methods. - var totalLength = callGraphTotalLengthComputer.apply() - var previousTotalLength = -1 - while(totalLength > previousTotalLength) { - allMethods.forEach[m| - val calledMethods = - if (callGraph.get(m) == null) { - val tmp = new HashSet - callGraph.put(m,tmp) - tmp - } else { - callGraph.get(m) - } - val overridingMethods = methodToOverridingMethods.get(m) - if (overridingMethods != null) { - overridingMethods.forEach[n| - val calledByOverride = callGraph.get(n) - if (calledByOverride != null) { - calledMethods.addAll(calledByOverride) - } - ] - } - ] - previousTotalLength = totalLength - totalLength = callGraphTotalLengthComputer.apply() - } - - // For each method, we add to their called methods the methods overriding - // those called methods. - totalLength = callGraphTotalLengthComputer.apply() - previousTotalLength = -1 - while(totalLength > previousTotalLength) { - allMethods.forEach[m| - val calledMethods = callGraph.get(m) - if (calledMethods != null) { - val tmp = new HashSet - calledMethods.forEach[n| - val overridingMethods = methodToOverridingMethods.get(n) - if (overridingMethods != null) { - tmp.addAll(overridingMethods) - } - ] - calledMethods.addAll(tmp) - } - ] - previousTotalLength = totalLength - totalLength = callGraphTotalLengthComputer.apply() - } - - allMethods.forEach[m| - var calledMethods = callGraph.get(m) - if (calledMethods == null) { - calledMethods = new HashSet - callGraph.put(m,calledMethods) - } - calledMethods.addAll(eventFunctions) - ] - - // We then add in the support for calls to super methods. - allMethods.forEach[m| - val k3m = methodToK3Method.get(m) - if (k3m != null) { - val calledMethods = k3MethodToCalledMethods.get(k3m) - if (calledMethods != null) { - calledMethods.forEach[c| - if (allSuperMethods.contains(c)) { - val actualk3Method = superMethodTok3Method.get(c) - if (actualk3Method != null) { - val actualMethod = k3MethodToMethod.get(actualk3Method) - if (actualMethod != null && allMethods.contains(actualMethod)) { - var tmp = callGraph.get(m) - if (tmp == null) { - tmp = new HashSet - callGraph.put(m,tmp) - } - tmp.add(actualMethod) - } - } - } - ] - } - } - ] - - println("Callgraph : \n\n") - callGraph.forEach[m,s| - println(m.declaringType.elementName + "." + m.elementName + " : \n" + s.map[n| - n.declaringType.elementName + "." + n.elementName - ].reduce[s1, s2|s1 + ", " + s2] + "\n") - ] - - // Next we create the Rule objects with all that - for (function : allMethods) { - inspectForBigStep(function) - } - } - - /** - * Find annotations "@Aspect" - */ - private def List getAspectAnnotations(IType type) { - // TODO compare with: fr.inria.diverse.k3.al.annotationprocessor.Aspect - if (type.isClass) { - return type.annotations.filter [ annot | - val name = annot.elementName // may be qualified - val lastDotIndex = name.lastIndexOf('.') - var simpleName = name - if (lastDotIndex !== -1) { - simpleName = name.substring(lastDotIndex + 1) - } - simpleName.equals("Aspect") - ].toList - } - return new ArrayList() - } - - private def boolean testAnnotation(IMethod method, String annotationSimpleName) { - // TODO compare with: fr.inria.diverse.k3.al.annotationprocessor.XXX - return method.annotations.exists [ annot | - val name = annot.elementName // may be qualified - val lastDotIndex = name.lastIndexOf('.') - var simpleName = name - if (lastDotIndex !== -1) { - simpleName = name.substring(lastDotIndex + 1) - } - return simpleName.equals(annotationSimpleName) - ] - } - - /** - * Return true if 'method' is tagged with "@Step" - */ - private def boolean isStep(IMethod method) { - testAnnotation(method, "Step") - } - - /** - * Return true if 'method' is tagged with "@EventProcessor" - */ - private def boolean isEvent(IMethod method) { - val annotation = method.annotations.findFirst[a| - val name = a.elementName - val lastDotIndex = name.lastIndexOf('.') - var simpleName = name - if (lastDotIndex !== -1) { - simpleName = name.substring(lastDotIndex + 1) - } - return simpleName == "Step" - ] - annotation != null && annotation.memberValuePairs.exists[p| - p.memberName == "eventTriggerable" && p.value instanceof Boolean && p.value as Boolean - ] - } - - /** - * Return true if 'method' is tagged with "@OverrideAspectMethod" - */ - private def boolean isOverride(IMethod method) { - testAnnotation(method, "OverrideAspectMethod") - } - - /** - * Return true if 'method' is tagged with "@Main" - */ - private def boolean isMain(IMethod method) { - testAnnotation(method, "Main") - } - - /** - * Return all sub types - */ - private def Set getAllSubClasses(IType type) { - val hierarchy = type.newTypeHierarchy(new NullProgressMonitor) - return hierarchy.getAllSubtypes(type).toSet - } - - /** - * Return all super types - */ - private def Set getAllSuperClasses(IType type) { - val hierarchy = type.newTypeHierarchy(new NullProgressMonitor) - return hierarchy.getAllSuperclasses(type).toSet - } - - private def EClass getAspectized(IAnnotation annot) { - val aspectedClassName = annot.memberValuePairs.findFirst[p|p.memberName == "className"].value as String - return extendedMetamodel.eAllContents.filter(EClass).findFirst[c1|aspectedClassName.equals(c1.name)] - } - - /** - * Return the top level method in a type tagged @aspect - * that contains 'function'
    - *
    - * Return 'function' if it is already a top level method.
    - *
    - * Return null if not inside a type with @aspect - */ - private def IMethod getContainingAspectMethod(IMethod function) { - val container = function.declaringType - if (allClasses.contains(container)) { - return function - } - - // function can be in annonymous/inner classes (e.g in lamba) - var parent = function.parent - while (parent !== null) { - if (parent instanceof IMethod) { - return getContainingAspectMethod(parent) - } - parent = parent.parent - } - - return null - } -} From b7555096174ed2926646188dfa4a7b7b98d09e9d Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 4 Apr 2017 10:28:28 +0200 Subject: [PATCH 130/267] TraceConstructorGeneratorJava: ignore resource contained in MelangeResource --- .../generator/codegen/TraceConstructorGeneratorJava.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index ca84f9638..3c42e48e3 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -270,7 +270,7 @@ class TraceConstructorGeneratorJava { Set allResources = new HashSet<>(); allResources.add(executedModel); allResources.addAll(org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); - allResources.removeIf(r -> r== null); + allResources.removeIf(r -> r == null || (r != executedModel && executedModel.getContents().contains(r.getContents().get(0)))); return allResources; } ''' From 4707d434272e43eaee2e57ea21cb0886c3b0f9be Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 4 Apr 2017 10:30:39 +0200 Subject: [PATCH 131/267] TraceConstructorGenerator: don't use changes if initial state --- .../generator/codegen/TraceConstructorGeneratorJava.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 3c42e48e3..7ba270a0e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -445,7 +445,7 @@ private def String generateAddStateUsingListenerMethods() { if (lastState == null) { addInitialState(); }««« end if laststate null - if (!changes.isEmpty()) { + else if (!changes.isEmpty()) { boolean stateChanged = false; // We start by a (shallow) copy of the last state // But we will have to rollback a little by replacing values that changed From 72fb7cf130505c4c25ed30e930cbfdfb76cd2c16 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 4 Apr 2017 15:05:31 +0200 Subject: [PATCH 132/267] TraceConstructorGeneratorJava: use "shouldHaveAddNewObjectToStateMethod" everywhere --- .../codegen/TraceConstructorGeneratorJava.xtend | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend index 7ba270a0e..e33f5f6a2 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -301,6 +301,13 @@ class TraceConstructorGeneratorJava { ''' } + private def boolean shouldHaveAddNewObjectToStateMethod(EClassifier c){ + if (c instanceof EClass) { + shouldHaveAddNewObjectToStateMethod(c) + } else + false + } + private def boolean shouldHaveAddNewObjectToStateMethod(EClass c){ val subTypes = findAllDirectSubTypes(c) @@ -364,7 +371,7 @@ if (!added && !exeToTraced.containsKey(o_cast)) { «IF p instanceof EReference» - «IF traceability.allMutableClasses.contains(p.EType)» + «IF shouldHaveAddNewObjectToStateMethod(p.EType)» for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { addNewObjectToState((«getJavaFQN(p.EType)»)aValue, newState); } @@ -390,7 +397,7 @@ if (!added && !exeToTraced.containsKey(o_cast)) { «IF p instanceof EReference» «val realMutableType = p.EType» if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { - «IF traceability.allMutableClasses.contains(realMutableType)» + «IF shouldHaveAddNewObjectToStateMethod(realMutableType)» addNewObjectToState((«getJavaFQN(realMutableType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); firstValue_«p.name».«stringSetter(valueProperty,stringGetterTracedValue("o_cast", p))»; «ELSE» @@ -458,7 +465,7 @@ private def String generateAddStateUsingListenerMethods() { if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange) { stateChanged = true; ««« Loop over all classes that may be constructed and that have mutable fields - «FOR c : partialOrderSort(findTopSuperClasses(newConcreteClassesNotEmpty))» + «FOR c : partialOrderSort(findTopSuperClasses(newConcreteClassesNotEmpty)).filter[c|shouldHaveAddNewObjectToStateMethod(c)]» if (o instanceof «getJavaFQN(c)») { «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; addNewObjectToState(o_cast, newState); @@ -565,7 +572,7 @@ private def String generateAddStateUsingListenerMethods() { previousValue = valueSequence.get(valueSequence.size() - 1); } ««« If instances of new class, we have to make sure that there are traced versions - «IF traceability.allMutableClasses.contains(p.EType)» + «IF shouldHaveAddNewObjectToStateMethod(p.EType)» for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { addNewObjectToState((«getJavaFQN(p.EType)»)aValue, newState); }««« end for loop on values From fe5dc91c514c3bb5654ca19f1a1aa0620b5bed9f Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 4 Apr 2017 18:51:25 +0200 Subject: [PATCH 133/267] Remove opsemanticsview xmof plugin --- .../.classpath | 8 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../META-INF/MANIFEST.MF | 17 - .../build.properties | 5 - .../plugin.xml | 11 - .../gen/xmof/XMOFAnalyzer.xtend | 397 ------------------ ...MOFOperationalSemanticsViewGenerator.xtend | 56 --- 7 files changed, 501 deletions(-) delete mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.classpath delete mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.settings/org.eclipse.jdt.core.prefs delete mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF delete mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties delete mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/plugin.xml delete mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFAnalyzer.xtend delete mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFOperationalSemanticsViewGenerator.xtend diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.classpath b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.classpath deleted file mode 100644 index 428337e56..000000000 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.settings/org.eclipse.jdt.core.prefs b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dc..000000000 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF deleted file mode 100644 index 5547fcb33..000000000 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Xmof -Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen.xmof;singleton:=true -Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: com.google.guava, - org.eclipse.xtext.xbase.lib, - org.eclipse.xtend.lib, - org.eclipse.xtend.lib.macro, - fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", - fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", - fr.inria.diverse.opsemanticsview.gen;bundle-version="1.0.0", - org.eclipse.core.resources;bundle-version="3.11.1", - org.modelexecution.xmof;bundle-version="1.0.0", - fr.inria.diverse.trace.commons;bundle-version="2.3.0" - diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties deleted file mode 100644 index e9863e281..000000000 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/plugin.xml b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/plugin.xml deleted file mode 100644 index f5a4b0deb..000000000 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/plugin.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFAnalyzer.xtend b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFAnalyzer.xtend deleted file mode 100644 index 884465caa..000000000 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFAnalyzer.xtend +++ /dev/null @@ -1,397 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.opsemanticsview.gen.xmof - -import java.util.ArrayList -import java.util.Collection -import java.util.HashMap -import java.util.HashSet -import java.util.List -import java.util.Map -import java.util.Set -import opsemanticsview.OperationalSemanticsView -import opsemanticsview.OpsemanticsviewFactory -import opsemanticsview.Rule -import org.eclipse.emf.common.util.Diagnostic -import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.EModelElement -import org.eclipse.emf.ecore.EObject -import org.eclipse.emf.ecore.EOperation -import org.eclipse.emf.ecore.EPackage -import org.eclipse.emf.ecore.EParameter -import org.eclipse.emf.ecore.EStructuralFeature -import org.eclipse.emf.ecore.EcoreFactory -import org.eclipse.emf.ecore.EcorePackage -import org.eclipse.emf.ecore.util.Diagnostician -import org.eclipse.xtend.lib.annotations.Accessors -import org.modelexecution.xmof.Syntax.Actions.BasicActions.CallAction -import org.modelexecution.xmof.Syntax.Actions.BasicActions.CallBehaviorAction -import org.modelexecution.xmof.Syntax.Actions.BasicActions.CallOperationAction -import org.modelexecution.xmof.Syntax.Activities.IntermediateActivities.Activity -import org.modelexecution.xmof.Syntax.Classes.Kernel.BehavioredEClass -import org.modelexecution.xmof.Syntax.Classes.Kernel.BehavioredEOperation -import org.modelexecution.xmof.Syntax.Classes.Kernel.DirectedParameter -import org.modelexecution.xmof.Syntax.Classes.Kernel.ParameterDirectionKind - -class XMOFAnalyzer { - - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) OperationalSemanticsView mmextensionResult - - // Input - protected val EPackage xmofModel - protected val EPackage abstractSyntaxModel - - // Transient - protected boolean done = false - protected val Map activityToRule = new HashMap - protected val Map operationToRule = new HashMap - val Set abstractSyntaxClasses = new HashSet - - private static def void debug(Object toPrint) { - // println(toPrint) - } - - new(EPackage abstractSyntax, EPackage xmofModel, OperationalSemanticsView view) { - this.xmofModel = xmofModel - this.abstractSyntaxModel = abstractSyntax - this.mmextensionResult = view - } - - public def void generate() { - - abstractSyntaxClasses.addAll(abstractSyntaxModel.eAllContents.filter(EClass).toSet) - - // We process each class of the model - xmofModel.eAllContents.filter(EClass).filter[c|!(c instanceof Activity)].toSet.forEach[inspectClass] - - // Validation - val results = Diagnostician.INSTANCE.validate(this.getMmextensionResult); - val error = results.children.findFirst[r|r.severity == Diagnostic.ERROR] - if (error != null) - throw new IllegalStateException( - "The extracted execution extension from the xmof model is invalid for at least one reason: " + error) - } - - /* - * Called exactly once per class. - */ - private def void inspectClass(EClass xmofClass) { - - // We create the basic class or extension - findDynamicProperties(xmofClass) - - // Then we look at the activities of the class to transform them into rules - if (xmofClass instanceof BehavioredEClass) { - for (activity : xmofClass.ownedBehavior.filter(Activity)) - inspectActivity(xmofClass, activity) - for (operation : xmofClass.getEOperations.filter(BehavioredEOperation)) - inspectBehavioredEOperation(xmofClass, operation) - } - -// addTraceabilityAnnotations(xmofClass); - } - - /* - * Called exactly once per Activity. - */ - private def void inspectActivity(BehavioredEClass xmofClass, Activity activity) { - - // We create the corresponding rule object - val inspectedActivityRule = getRuleOf(activity) - - // And we find relationships between rules - for (callAction : activity.eAllContents.filter(CallAction).toSet) { - - var Rule calledRule = null - - if (callAction instanceof CallOperationAction) { - calledRule = getRuleOf(callAction.operation) - } else if (callAction instanceof CallBehaviorAction) { - if (callAction.behavior instanceof Activity) - calledRule = getRuleOf(callAction.behavior as Activity) - } - - if (calledRule != null) - inspectedActivityRule.calledRules.add(calledRule) - - } - - } - - /* - * Called exactly once per BehavioredEOperation. - */ - private def void inspectBehavioredEOperation(BehavioredEClass xmofClass, BehavioredEOperation operation) { - - // We create the corresponding rule object - val inspectedOperationRule = getRuleOf(operation) - inspectedOperationRule.containingClass = xmofClass - } - - private def void findDynamicProperties(EClass xmofClass) { - - // We find the extended class of the abstract syntax - val extendedClass = findExtendedClass(xmofClass) - - // Either we found extended classes, in which case this is a class extension - if (xmofClass instanceof BehavioredEClass && extendedClass != null) { - debug("Found a class inheriting a class of the ecore model! " + xmofClass) - mmextensionResult.dynamicProperties.addAll(xmofClass.EStructuralFeatures) - val entry = OpsemanticsviewFactory.eINSTANCE.createExecutionToASEntry => [ - ASclass = extendedClass - executionClass = xmofClass - ] - mmextensionResult.executionToASmapping.add(entry) - - } // Or not, in which case this is a new class, if it does comes from the xmof model - else { - - debug("Found new class! " + xmofClass) - mmextensionResult.dynamicClasses.add(xmofClass) - mmextensionResult.dynamicProperties.addAll(xmofClass.EStructuralFeatures) - } - - } - - protected def EClass findExtendedClass(EClass confClass) { - - var EClass res = null - val otherResultsFar = new HashSet - for (superType : confClass.getESuperTypes.filter[c|c != confClass]) { - - if (abstractSyntaxClasses.contains(superType)) - res = superType - else { - var indirectSuperType = findExtendedClass(superType) - if (indirectSuperType != null) - otherResultsFar.add(indirectSuperType) - } - } - if (res != null) { - return res - } else if (otherResultsFar.size > 0) { - return otherResultsFar.get(0) - } else { - return null - } - - } - -// protected def EPackage obtainExtensionPackage(EPackage runtimePackage) { -// -// // Null means that the root is the Ecorext object -// var EPackage result = null -// -// if (runtimePackage != null) { -// -// val tracedSuperPackage = obtainExtensionPackage(runtimePackage.getESuperPackage) -// -// if (tracedSuperPackage == null) -// result = mmextensionResult.newPackages.findFirst[p|p.name.equals(runtimePackage.name)] -// else -// result = tracedSuperPackage.getESubpackages.findFirst[p|p.name.equals(runtimePackage.name)] -// -// if (result == null) { -// result = EcoreFactory.eINSTANCE.createEPackage -// result.name = runtimePackage.name -// result.nsURI = result.name + "_trace" -// result.nsPrefix = runtimePackage.nsPrefix + "_trace" -// if (tracedSuperPackage == null) { -// mmextensionResult.newPackages.add(result) -// } else -// tracedSuperPackage.getESubpackages.add(result) -// } -// -// } -// return result -// } - private static def Rule createRule(boolean isAbstract, boolean isStep) { - val rule = OpsemanticsviewFactory.eINSTANCE.createRule - rule.stepRule = isStep - rule.abstract = isAbstract - return rule - } - - private def hasOperationInClass(Activity activity) { - activity.specification != null && activity.eContainer == activity.specification.EContainingClass - } - - private def findMethodInClass(BehavioredEOperation xmofOperation) { - return xmofOperation.method.filter(Activity).findFirst [ activity | - activity.eContainer == xmofOperation.EContainingClass - ] - - } - - def List createInputParameters(List directedParameters) { - val List result = new ArrayList - - val List inputParams = directedParameters.filter [ p | - (p instanceof DirectedParameter && (p as DirectedParameter).direction == ParameterDirectionKind.IN || - (p as DirectedParameter).direction == ParameterDirectionKind.INOUT - ) || (! (p instanceof DirectedParameter)) - ].toList - - for (xmofParam : inputParams) { - val newParameter = EcoreFactory.eINSTANCE.createEParameter - copyAttributes(xmofParam, newParameter) - if (xmofParam.getEType != null) - newParameter.EType = xmofParam.getEType - else - newParameter.EType = EcorePackage.eINSTANCE.getEObject - result.add(newParameter) - } - - if (result.filter[p|p.name.equals("tokens")].size > 1) - debug(result) - - return result - } - - def void findAndUseOutputParameter(EOperation operation, List directedParameters) { - var returnParam = directedParameters.filter(DirectedParameter).findFirst [ p | - p.direction == ParameterDirectionKind.RETURN - ] - if (returnParam == null) - returnParam = directedParameters.filter(DirectedParameter).findFirst [ p | - p.direction == ParameterDirectionKind.OUT - ] - if (returnParam != null) { - operation.ordered = returnParam.ordered - operation.unique = returnParam.unique - operation.lowerBound = returnParam.lowerBound - operation.upperBound = returnParam.upperBound - if (returnParam.getEType != null) - operation.EType = returnParam.getEType - else - operation.EType = EcorePackage.eINSTANCE.getEObject - - } - } - - private def Rule getRuleOf(Activity activity) { - if (activityToRule.containsKey(activity)) { - return activityToRule.get(activity) - } else { - val isStep = hasStepAnnotation(activity) || - (activity.specification != null && hasStepAnnotation(activity.specification)) - var Rule rule = createRule(false, isStep) - mmextensionResult.rules.add(rule) - activityToRule.put(activity, rule) - - rule.containingClass = activity.eContainer as EClass - - val EOperation operation = EcoreFactory.eINSTANCE.createEOperation - operation.name = activity.name - - // If our specification is in the same class of the activity, we use its list of methods to discover overriding activities - if (hasOperationInClass(activity)) { - for (activityMethod : activity.specification.method.filter(Activity).filter[a|a != activity]) { - val Rule overrideRule = getRuleOf(activityMethod) - rule.overridenBy.add(overrideRule) - } - } - - // First inputs - operation.getEParameters.addAll(createInputParameters(activity.ownedParameter.filter(EParameter).toList)) - - // Then output param. There can be only one, so we look for the first RETURN, or the first OUT - findAndUseOutputParameter(operation, activity.ownedParameter.filter(EParameter).toList) - - // An EOperation with void return type *must* have an upper bound of 1 - if (operation.getEType == null && operation.upperBound != 1) - operation.upperBound = 1 - - rule.operation = operation - return rule - } - - } - - private def Rule getRuleOf(BehavioredEOperation xmofOperation) { - val method = findMethodInClass(xmofOperation) - if (operationToRule.containsKey(xmofOperation)) { - return operationToRule.get(xmofOperation) - } else // If the operation has one method in the same class with the same name, we ignore the operation - if (method != null) { - return getRuleOf(method) - } else { - val isStep = hasStepAnnotation(xmofOperation) - val Rule rule = createRule(true, isStep) - mmextensionResult.rules.add(rule) - operationToRule.put(xmofOperation, rule) - rule.containingClass = xmofOperation.EContainingClass - - val EOperation newEOperation = EcoreFactory.eINSTANCE.createEOperation - copyAttributes(xmofOperation, newEOperation) - rule.operation = newEOperation - - if (xmofOperation.EType != null) - newEOperation.EType = xmofOperation.EType - else - findAndUseOutputParameter(newEOperation, xmofOperation.EParameters) - - // Input parameters - newEOperation.getEParameters.addAll(createInputParameters(xmofOperation.EParameters)) - - // An EOperation with void return type *must* have an upper bound of 1, while a param - if (newEOperation.getEType == null && newEOperation.upperBound != 1) - newEOperation.upperBound = 1 - - for (activityMethod : xmofOperation.method.filter(Activity)) { - val Rule overrideRule = getRuleOf(activityMethod) - rule.overridenBy.add(overrideRule) - } - - return rule - } - - } - -// private def void addTraceabilityAnnotations(EClass executionClass) { -// addTraceabilityAnnotations(executionClass, executionClass as EClass); -// addTraceabilityAnnotations(executionClass.getEAttributes); -// addTraceabilityAnnotations(executionClass.getEReferences); -// } -// private def void addTraceabilityAnnotations(Collection executionClassProperties) { -// executionClassProperties.forEach [ property | -// addTraceabilityAnnotations(property, xmofPropertyToNewProperty.get(property)) -// ]; -// } -// private def void addTraceabilityAnnotations(EModelElement originalExecutionMetamodelElement, -// EModelElement extensionModelElement) { -// val executionMetamodelElementURI = originalExecutionMetamodelElement.eResource.getURIFragment( -// originalExecutionMetamodelElement); -// ExecutionMetamodelTraceability.createTraceabilityAnnotation(extensionModelElement, -// executionMetamodelElementURI); -// } - private static def copyAttributes(EObject from, EObject to) { - for (prop : to.eClass.getEAllAttributes) { - val value = from.eGet(prop) - - // We try to set everything, but there are many derived properties etc. thus many errors - // (but not a problem) - try { - if (prop.many) - (to.eGet(prop) as Collection).addAll(value as Collection) - else - to.eSet(prop, value) - } catch (Exception e) { - } - } - } - - private static def hasStepAnnotation(EModelElement element) { - val annotation = element.getEAnnotation("http://www.modelexecution.org/xmof") - return annotation != null && annotation.details.containsKey("Step") - } - -} diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFOperationalSemanticsViewGenerator.xtend b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFOperationalSemanticsViewGenerator.xtend deleted file mode 100644 index d4e04096a..000000000 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/src/fr/inria/diverse/opsemanticsview/gen/xmof/XMOFOperationalSemanticsViewGenerator.xtend +++ /dev/null @@ -1,56 +0,0 @@ -package fr.inria.diverse.opsemanticsview.gen.xmof - -import fr.inria.diverse.melange.metamodel.melange.Language -import fr.inria.diverse.opsemanticsview.gen.OperationalSemanticsViewGenerator -import opsemanticsview.OpsemanticsviewFactory -import org.eclipse.core.resources.IProject -import org.eclipse.emf.common.util.URI -import org.eclipse.emf.ecore.EPackage -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl -import org.eclipse.emf.ecore.util.EcoreUtil - -class XMOFOperationalSemanticsViewGenerator implements OperationalSemanticsViewGenerator { - - override canHandle(Language melangeLanguage, IProject melangeProject) { - return melangeLanguage.xmof != null && melangeLanguage.xmof != "" - } - - override generate(Language melangeLanguage, IProject melangeProject) { - - val result = OpsemanticsviewFactory.eINSTANCE.createOperationalSemanticsView - - val rs = new ResourceSetImpl - - val asURI = URI.createURI(melangeLanguage.syntax.ecoreUri,true); - val asResource= rs.getResource(asURI,true) - val abstractSyntax = asResource.contents.filter(EPackage).head - - // Register all packages in registry - // TODO remove them afterwards? - for (p : asResource.allContents.filter(EPackage).toSet) - EPackage.Registry.INSTANCE.put(p.getNsURI(), p); - - val xmofStringURI = melangeLanguage.getXmof(); - val xmofURI = URI.createURI(xmofStringURI, true) - val xmofModel = rs.getResource(xmofURI,true) - val executionMetamodel = xmofModel.contents.filter(EPackage).head - - // Register all packages in registry - // TODO remove them afterwards? - for (p : xmofModel.allContents.filter(EPackage).toSet) - EPackage.Registry.INSTANCE.put(p.getNsURI(), p); - - EcoreUtil.resolveAll(rs) - - result.abstractSyntax = abstractSyntax - result.executionMetamodel = executionMetamodel - - - val XMOFAnalyzer eventsgen = new XMOFAnalyzer(abstractSyntax, executionMetamodel, result); - eventsgen.generate(); - - - return result - } - -} \ No newline at end of file From 68f769b98a4a8657f5cd4fbe9f1cea50b31139c5 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 4 Apr 2017 18:58:46 +0200 Subject: [PATCH 134/267] Update poms and features for removed and new opsemantics plugins --- .../.project | 34 ------------------- framework/framework_commons/pom.xml | 5 ++- .../feature.xml | 22 ++++++++++++ trace/generator/pom.xml | 3 -- .../feature.xml | 21 ------------ 5 files changed, 26 insertions(+), 59 deletions(-) delete mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.project diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.project b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.project deleted file mode 100644 index e6d5ffcbb..000000000 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.xmof/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - fr.inria.diverse.opsemanticsview.gen.xmof - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/framework/framework_commons/pom.xml b/framework/framework_commons/pom.xml index 0106e4a4e..12f4d8e55 100644 --- a/framework/framework_commons/pom.xml +++ b/framework/framework_commons/pom.xml @@ -15,9 +15,12 @@ plugins/org.gemoc.xdsmlframework.api plugins/org.gemoc.executionframework.reflectivetrace.model - plugins/org.gemoc.xdsmlframework.commons + plugins/fr.inria.diverse.opsemanticsview.gen + plugins/fr.inria.diverse.opsemanticsview.gen.k3 + plugins/fr.inria.diverse.opsemanticsview.model + releng/org.gemoc.modeldebugging.framework.commons.feature diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml index 66edf60dc..dd620e644 100644 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml +++ b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml @@ -38,4 +38,26 @@ version="0.0.0" unpack="false"/> + + + + + + + diff --git a/trace/generator/pom.xml b/trace/generator/pom.xml index 6828441e0..b8845fdfa 100644 --- a/trace/generator/pom.xml +++ b/trace/generator/pom.xml @@ -17,13 +17,10 @@ - plugins/fr.inria.diverse.ecorext plugins/fr.inria.diverse.trace.gemoc plugins/fr.inria.diverse.trace.gemoc.generator - plugins/fr.inria.diverse.trace.gemoc.generator.k3 plugins/fr.inria.diverse.trace.gemoc.ui plugins/fr.inria.diverse.trace.metamodel.generator - plugins/fr.inria.diverse.trace.plaink3.tracematerialextractor plugins/fr.inria.diverse.trace.plugin.generator plugins/fr.inria.diverse.trace.annotations diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml index 51ba6aae9..aae12324b 100644 --- a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml +++ b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml @@ -16,13 +16,6 @@ [Enter License Description here.] - - - - - - Date: Thu, 6 Apr 2017 17:42:53 +0200 Subject: [PATCH 135/267] opsemanticsview projects: add xtend-gen in build.properties --- .../fr.inria.diverse.opsemanticsview.gen.k3/build.properties | 3 ++- .../fr.inria.diverse.opsemanticsview.gen/build.properties | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties index e9863e281..600d1b446 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + xtend-gen/ output.. = bin/ bin.includes = META-INF/,\ .,\ diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/build.properties b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/build.properties index e9863e281..600d1b446 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/build.properties +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + xtend-gen/ output.. = bin/ bin.includes = META-INF/,\ .,\ From 2b779e45ce2355af4e52af315f356232ee76ef7b Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 6 Apr 2017 18:06:29 +0200 Subject: [PATCH 136/267] opsenmanticsview projects: add missing pom.xml files --- .../pom.xml | 51 +++++++++++++++++++ .../pom.xml | 51 +++++++++++++++++++ .../pom.xml | 19 +++++++ 3 files changed, 121 insertions(+) create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/pom.xml create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/pom.xml create mode 100644 framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/pom.xml diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/pom.xml b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/pom.xml new file mode 100644 index 000000000..9734db20c --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + org.gemoc.modeldebugging.framework.commons + fr.inria.diverse.opsemanticsview.gen.k3 + 2.3.0-SNAPSHOT + eclipse-plugin + + + org.gemoc.modeldebugging.framework.commons + org.gemoc.modeldebugging.framework.commons.root + 2.3.0-SNAPSHOT + ../.. + + + + + + org.eclipse.xtend + xtend-maven-plugin + ${xtend.version} + + + + compile + + + xtend-gen + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + + + + xtend-gen + + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/pom.xml b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/pom.xml new file mode 100644 index 000000000..29128f624 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + org.gemoc.modeldebugging.framework.commons + fr.inria.diverse.opsemanticsview.gen + 2.3.0-SNAPSHOT + eclipse-plugin + + + org.gemoc.modeldebugging.framework.commons + org.gemoc.modeldebugging.framework.commons.root + 2.3.0-SNAPSHOT + ../.. + + + + + + org.eclipse.xtend + xtend-maven-plugin + ${xtend.version} + + + + compile + + + xtend-gen + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + + + + xtend-gen + + + + + + + + diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/pom.xml b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/pom.xml new file mode 100644 index 000000000..e415f09d2 --- /dev/null +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + org.gemoc.modeldebugging.framework.commons + fr.inria.diverse.opsemanticsview.model + 2.3.0-SNAPSHOT + eclipse-plugin + + + org.gemoc.modeldebugging.framework.commons + org.gemoc.modeldebugging.framework.commons.root + 2.3.0-SNAPSHOT + ../.. + + + + From 7657d470cd0c020b9d93cbf83e891736e7f24ad0 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 6 Apr 2017 18:11:09 +0200 Subject: [PATCH 137/267] Remove last traces of project fr.inria.diverse.trace.api --- .../fr.inria.diverse.trace.api/.project | 34 ------------------- trace/commons/pom.xml | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 trace/commons/plugins/fr.inria.diverse.trace.api/.project diff --git a/trace/commons/plugins/fr.inria.diverse.trace.api/.project b/trace/commons/plugins/fr.inria.diverse.trace.api/.project deleted file mode 100644 index 8427f0797..000000000 --- a/trace/commons/plugins/fr.inria.diverse.trace.api/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - fr.inria.diverse.trace.api - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/trace/commons/pom.xml b/trace/commons/pom.xml index 6af8bba52..961dc4f95 100644 --- a/trace/commons/pom.xml +++ b/trace/commons/pom.xml @@ -16,11 +16,9 @@ - plugins/fr.inria.diverse.trace.api plugins/fr.inria.diverse.trace.commons plugins/fr.inria.diverse.trace.gemoc.api plugins/fr.inria.diverse.trace.commons.model - releng/fr.inria.diverse.trace.commons.feature From e741aa67eca04728196d2cb7512009e108be6bb0 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 7 Apr 2017 08:00:01 +0200 Subject: [PATCH 138/267] Remove all references to fr.inria.diverse.trace.api --- framework/execution_framework/pom.xml | 2 +- framework/framework_commons/pom.xml | 2 +- framework/xdsml_framework/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 1 - .../fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF | 3 +-- .../fr.inria.diverse.trace.commons.feature/feature.xml | 8 +------- .../fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF | 1 - .../plugin/generator/GenericTracePluginGenerator.xtend | 1 - .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 - .../fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF | 1 - 11 files changed, 5 insertions(+), 18 deletions(-) diff --git a/framework/execution_framework/pom.xml b/framework/execution_framework/pom.xml index 62ad4f404..572e21b5c 100644 --- a/framework/execution_framework/pom.xml +++ b/framework/execution_framework/pom.xml @@ -24,7 +24,7 @@ +--> diff --git a/framework/framework_commons/pom.xml b/framework/framework_commons/pom.xml index 12f4d8e55..b82d8e67b 100644 --- a/framework/framework_commons/pom.xml +++ b/framework/framework_commons/pom.xml @@ -27,7 +27,7 @@ +--> diff --git a/framework/xdsml_framework/pom.xml b/framework/xdsml_framework/pom.xml index ad231e3fc..82dbf564e 100644 --- a/framework/xdsml_framework/pom.xml +++ b/framework/xdsml_framework/pom.xml @@ -23,7 +23,7 @@ +--> diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index b8b7dd4a6..5cc53da82 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.gemoc.execution.sequential.javaxdsml.api;bundle-version="0.1.0", org.gemoc.executionframework.ui, org.gemoc.execution.sequential.javaengine;bundle-version="0.1.0", - fr.inria.diverse.trace.api, fr.inria.diverse.trace.gemoc;bundle-version="1.0.0", fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", fr.inria.diverse.k3.al.annotationprocessor.plugin, diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF index ac3cb9393..3cb095ca0 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.ecore;bundle-version="2.10.2", - fr.inria.diverse.trace.api;bundle-version="1.0.0", fr.obeo.timeline;bundle-version="1.0.0", org.gemoc.xdsmlframework.api;bundle-version="0.1.0", fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", @@ -15,5 +14,5 @@ Require-Bundle: org.eclipse.ui, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: fr.inria.diverse.trace.gemoc.api; uses:="org.eclipse.emf.ecore, org.gemoc.executionframework.engine.mse, fr.inria.diverse.trace.api, org.gemoc.xdsmlframework.api.engine_addon, fr.obeo.timeline.view" +Export-Package: fr.inria.diverse.trace.gemoc.api; uses:="org.eclipse.emf.ecore, org.gemoc.executionframework.engine.mse, org.gemoc.xdsmlframework.api.engine_addon, fr.obeo.timeline.view" diff --git a/trace/commons/releng/fr.inria.diverse.trace.commons.feature/feature.xml b/trace/commons/releng/fr.inria.diverse.trace.commons.feature/feature.xml index 69c142d5d..44bc944b3 100644 --- a/trace/commons/releng/fr.inria.diverse.trace.commons.feature/feature.xml +++ b/trace/commons/releng/fr.inria.diverse.trace.commons.feature/feature.xml @@ -16,13 +16,7 @@ [Enter License Description here.] - - + Date: Fri, 7 Apr 2017 08:58:40 +0200 Subject: [PATCH 139/267] Removing all references to ecorext --- trace/generator/README.md | 6 +++--- .../META-INF/MANIFEST.MF | 1 - .../GenericEngineTraceAddonGenerator.xtend | 12 ++++++------ .../generator/GenericTracePluginGenerator.xtend | 14 +++++++------- .../gemoc/generator/test/AddonGeneratorTest.xtend | 4 ++-- .../META-INF/MANIFEST.MF | 1 - .../metamodel/test/TraceMMGeneratorTest.xtend | 5 ++--- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 - .../generator/test/TestTracePluginGenerator.xtend | 4 ++-- 10 files changed, 22 insertions(+), 27 deletions(-) diff --git a/trace/generator/README.md b/trace/generator/README.md index 0341be4ce..84ec26436 100644 --- a/trace/generator/README.md +++ b/trace/generator/README.md @@ -12,7 +12,7 @@ Among others, we consider an xDSML to be composed of: The generation process is divided in three steps: -1. Because operation semantics can be defined in using any language(s), we first extract the execution extension into an intermediate representation in order to then generically process it with the generator. The intermediate representation is defined using the Ecore metamodel that can be found in the plugin `fr.inria.diverse.ecorext`. An conforming model is composed of new `EStructuralFeature` added to classes of the abstract classes, of new `EClass` objects, and of transformation rules specified as `EOperation` objects. Two extractors are provided for now: +1. Because operation semantics can be defined in using any language(s), we first extract the execution extension into an intermediate representation in order to then generically process it with the generator. The intermediate representation is defined using the Ecore metamodel that can be found in the plugin `fr.inria.diverse.opsemanticsview.model`. An conforming model is composed of new `EStructuralFeature` added to classes of the abstract classes, of new `EClass` objects, and of transformation rules specified as `EOperation` objects. Two extractors are provided for now: - One for Kermeta in the plugin `fr.inria.diverse.trace.plaink3.tracematerialextractor`. - One for xMOF in the plugin `fr.inria.diverse.trace.xmof.tracematerialextractor`. @@ -29,6 +29,6 @@ This part of the GEMOC Studio is based on the paper "A Generative Approach to De **Abstract:** -> Executable Domain-Specific Modeling Languages (xDSMLs) open many possibilities for performing early verification and validation (V&V) of systems. Dynamic V&V approaches rely on execution traces, which represent the evolution of models during their execution. In order to construct traces, generic trace metamodels can be used. Yet, regarding trace manipulations, they lack both efficiency because of their sequential structure, and usability because of their gap to the xDSML. Our contribution is a generative approach that defines a rich and domain-specific trace metamodel enabling the construction of execution traces for models conforming to a given xDSML. Efficiency is increased by providing a variety of navigation paths within traces, while usability is improved by narrowing the concepts of the trace metamodel to fit the considered xDSML. We evaluated our approach by generating a trace metamodel for fUML and using it for semantic differencing, which is an important V&V activity in the realm of model evolution. Results show a significant performance improvement and simplification of the semantic differencing rules as compared to the usage of a generic trace metamodel. +> Executable Domain-Specific Modeling Languages (xDSMLs) open many possibilities for performing early verification and validation (V&V) of systems. Dynamic V&V approaches rely on execution traces, which represent the evolution of models during their execution. In order to construct traces, generic trace metamodels can be used. Yet, regarding trace manipulations, they lack both efficiency because of their sequential structure, and usability because of their gap to the xDSML. Our contribution is a generative approach that defines a rich and domain-specific trace metamodel enabling the construction of execution traces for models conforming to a given xDSML. Efficiency is increased by providing a variety of navigation paths within traces, while usability is improved by narrowing the concepts of the trace metamodel to fit the considered xDSML. We evaluated our approach by generating a trace metamodel for fUML and using it for semantic differencing, which is an important V&V activity in the realm of model evolution. Results show a significant performance improvement and simplification of the semantic differencing rules as compared to the usage of a generic trace metamodel. -The paper can be downloaded here https://hal.inria.fr/hal-01154225 \ No newline at end of file +The paper can be downloaded here https://hal.inria.fr/hal-01154225 diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF index b9e25dd2a..627356433 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Require-Bundle: com.google.guava, org.eclipse.ui, org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.core.resources;bundle-version="3.9.1", - fr.inria.diverse.ecorext;bundle-version="0.1.0", org.gemoc.executionframework.ui;bundle-version="0.1.0", org.gemoc.xdsmlframework.ide.ui;bundle-version="0.1.0", fr.inria.diverse.trace.metamodel.generator;bundle-version="1.0.0", diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index e971fb4db..a40e1bc3e 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -38,7 +38,7 @@ import org.jdom2.filter.ElementFilter class GenericEngineTraceAddonGenerator { // Inputs - private val OperationalSemanticsView executionEcorExt // URI + private val OperationalSemanticsView opsemanticsview // URI private val String pluginName // Transient @@ -54,8 +54,8 @@ class GenericEngineTraceAddonGenerator { @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) IProject project - new(OperationalSemanticsView executionEcorExt, String pluginName) { - this.executionEcorExt = executionEcorExt + new(OperationalSemanticsView opsemanticsview, String pluginName) { + this.opsemanticsview = opsemanticsview this.pluginName = pluginName } @@ -82,7 +82,7 @@ class GenericEngineTraceAddonGenerator { public def void generateCompleteAddon(IProgressMonitor m) { // Generate trace plugin - val GenericTracePluginGenerator GenericTracePluginGenerator = new GenericTracePluginGenerator(executionEcorExt, + val GenericTracePluginGenerator GenericTracePluginGenerator = new GenericTracePluginGenerator(opsemanticsview, pluginName, true) GenericTracePluginGenerator.generate(m) @@ -219,7 +219,7 @@ public class «className» extends AbstractTraceAddon { private def Set potentialCallerClasses(EClass stepCallerClass) { val possibleCallerClasses = new HashSet - possibleCallerClasses.addAll(executionEcorExt.executionMetamodel.EClassifiers.filter(EClass)) + possibleCallerClasses.addAll(opsemanticsview.executionMetamodel.EClassifiers.filter(EClass)) possibleCallerClasses.addAll(traceability.allMutableClasses) val filtered = possibleCallerClasses.filter(EClass) .filter[c|c.equals(stepCallerClass)||c.EAllSuperTypes.contains(stepCallerClass)] @@ -245,7 +245,7 @@ org.eclipse.emf.ecore.EClass ec = mse.getCaller().eClass(); String stepRule = fr.inria.diverse.trace.commons.EcoreCraftingUtil.getFQN(ec, ".") + "." + mse.getAction().getName(); - «FOR Rule rule : executionEcorExt.rules.sortBy[baseFQN] SEPARATOR "else" AFTER "else"» + «FOR Rule rule : opsemanticsview.rules.sortBy[baseFQN] SEPARATOR "else" AFTER "else"» «val stepCallerClass = rule.containingClass» «val filtered = potentialCallerClasses(stepCallerClass)» diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend index b2b5bb85c..6b58f00b2 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend @@ -41,7 +41,7 @@ import tracingannotations.TracingAnnotations class GenericTracePluginGenerator { // Inputs - private val OperationalSemanticsView executionEcorExt // URI + private val OperationalSemanticsView opsemanticsview // URI private val String pluginName private val boolean gemoc @@ -76,9 +76,9 @@ class GenericTracePluginGenerator { @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) var Set referencedGenPackages - new(OperationalSemanticsView executionEcorExt, String pluginName, boolean gemoc) { + new(OperationalSemanticsView opsemanticsview, String pluginName, boolean gemoc) { - this.executionEcorExt = executionEcorExt + this.opsemanticsview = opsemanticsview this.pluginName = pluginName this.packageQN = pluginName + ".tracemanager" this.gemoc = gemoc @@ -110,7 +110,7 @@ class GenericTracePluginGenerator { } def void generate(IProgressMonitor m) { - tracedLanguageName = executionEcorExt.executionMetamodel.name + tracedLanguageName = opsemanticsview.executionMetamodel.name languageName = tracedLanguageName.replaceAll(" ", "") + "Trace" var partialTraceManagement = false @@ -120,13 +120,13 @@ class GenericTracePluginGenerator { // var Set propertiesToTrace = new HashSet // classesToTrace.addAll(tracingAnnotations.classestoTrace) // propertiesToTrace.addAll(tracingAnnotations.propertiesToTrace) -// val filter = new ExtensionFilter(executionEcorExt, classesToTrace, propertiesToTrace) +// val filter = new ExtensionFilter(opsemanticsview, classesToTrace, propertiesToTrace) // filter.execute() // partialTraceManagement = filter.didFilterSomething // } // Generate trace metamodel - val TraceMMGenerator tmmgenerator = new TraceMMGenerator(executionEcorExt, gemoc) + val TraceMMGenerator tmmgenerator = new TraceMMGenerator(opsemanticsview, gemoc) tmmgenerator.computeAllMaterial tmmgenerator.sortResult val EPackage tracemm = tmmgenerator.tracemmresult @@ -173,7 +173,7 @@ class GenericTracePluginGenerator { // Generate trace constructor val TraceConstructorGeneratorJava tconstructorgen = new TraceConstructorGeneratorJava(languageName, pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, - executionEcorExt.executionMetamodel, partialTraceManagement) + opsemanticsview.executionMetamodel, partialTraceManagement) traceConstructorClassName = tconstructorgen.className packageFragment.createCompilationUnit(traceConstructorClassName + ".java", tconstructorgen.generateCode, true, m) diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/src/fr/inria/diverse/trace/gemoc/generator/test/AddonGeneratorTest.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/src/fr/inria/diverse/trace/gemoc/generator/test/AddonGeneratorTest.xtend index 6fe8996dc..183a0f4c9 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/src/fr/inria/diverse/trace/gemoc/generator/test/AddonGeneratorTest.xtend +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/src/fr/inria/diverse/trace/gemoc/generator/test/AddonGeneratorTest.xtend @@ -9,7 +9,6 @@ import org.junit.After import org.junit.AfterClass import org.eclipse.core.resources.IProject import org.eclipse.emf.ecore.EPackage -import ecorext.Ecorext import fr.inria.diverse.trace.commons.EMFUtil import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl @@ -33,7 +32,7 @@ class AddonGeneratorTest { var IProject currentProject def void genericTest(String name) throws IOException { - + /* val abstractSyntaxEcoreURI = URI.createURI(root + name + ".ecore") val executionEcorExtURI = URI.createURI(root + name + "ext.xmi") val eventsMetamodelURI = URI.createURI(root + name + "events.ecore") @@ -51,6 +50,7 @@ class AddonGeneratorTest { "awesomeProject" + new Random().nextInt(100)) gen.generateCompleteAddon currentProject = gen.project + */ } diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/META-INF/MANIFEST.MF index 39aa35c16..affb20856 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.xtend.lib, org.eclipse.emf.ecore;bundle-version="2.10.1", org.junit;bundle-version="4.11.0", fr.inria.diverse.trace.metamodel.generator;bundle-version="1.0.0", - fr.inria.diverse.ecorext;bundle-version="0.1.0", org.eclipse.core.runtime;bundle-version="3.9.100", fr.inria.diverse.trace.commons;bundle-version="1.0.0" diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/src/fr/inria/diverse/trace/metamodel/test/TraceMMGeneratorTest.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/src/fr/inria/diverse/trace/metamodel/test/TraceMMGeneratorTest.xtend index b656c54a3..489ef0937 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/src/fr/inria/diverse/trace/metamodel/test/TraceMMGeneratorTest.xtend +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/src/fr/inria/diverse/trace/metamodel/test/TraceMMGeneratorTest.xtend @@ -1,6 +1,5 @@ package fr.inria.diverse.trace.metamodel.test -import ecorext.Ecorext import fr.inria.diverse.trace.commons.EMFUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerator import java.io.File @@ -76,7 +75,7 @@ class TraceMMGeneratorTest { } def void genericTest(String name, String nsURI) { - + /* println("Testing with input: " + name) var EPackage ecore @@ -107,7 +106,7 @@ class TraceMMGeneratorTest { val results = Diagnostician.INSTANCE.validate(stuff.tracemmresult); val error = results.children.findFirst[r|r.severity == Diagnostic.ERROR] assertFalse("There is at least one error in the generated ecore model: " + error, error != null) - + */ } } diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF index 3354d383b..2e21600b4 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF @@ -17,7 +17,6 @@ Require-Bundle: com.google.guava, org.eclipse.jdt.core;bundle-version="3.10.0", org.eclipse.emf.ecore, org.eclipse.emf.ecore.xmi, - fr.inria.diverse.ecorext;bundle-version="0.1.0", org.apache.log4j, org.eclipse.xtend.core, com.google.inject;bundle-version="3.0.0", diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/META-INF/MANIFEST.MF index 71db67864..52bc4337f 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/META-INF/MANIFEST.MF @@ -15,6 +15,5 @@ Require-Bundle: com.google.guava, org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.emf.ecore, fr.inria.diverse.trace.commons;bundle-version="1.0.0", - fr.inria.diverse.ecorext;bundle-version="0.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/src/fr/inria/diverse/trace/plugin/generator/test/TestTracePluginGenerator.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/src/fr/inria/diverse/trace/plugin/generator/test/TestTracePluginGenerator.xtend index fd589790c..eacc0984c 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/src/fr/inria/diverse/trace/plugin/generator/test/TestTracePluginGenerator.xtend +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/src/fr/inria/diverse/trace/plugin/generator/test/TestTracePluginGenerator.xtend @@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.EPackage import fr.inria.diverse.trace.commons.EMFUtil -import ecorext.Ecorext /** * Taken from http://www.informit.com/articles/article.aspx?p=1315271&seqNum=8 @@ -35,7 +34,7 @@ class TestTracePluginGenerator { var IProject currentProject def void genericTest(String name) { - + /* val abstractSyntaxEcoreURI = URI.createURI(root + name + ".ecore") val executionEcorExtURI = URI.createURI(root + name + "ext.xmi") val eventsMetamodelURI = URI.createURI(root + name + "events.ecore") @@ -53,6 +52,7 @@ class TestTracePluginGenerator { "awesomeProject" + new Random().nextInt(100)) gen.generate currentProject = gen.project + */ } From 01ab1ef739cc9e175a1c5eac0fdf5429dc05df05 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 7 Apr 2017 09:09:29 +0200 Subject: [PATCH 140/267] opsemanticsview plugins: align plugin versions with maven --- .../META-INF/MANIFEST.MF | 2 +- .../fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF | 2 +- .../fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF index a9ec1d00e..c0fd4ce63 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: K3 Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen.k3;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: fr.inria.diverse.opsemanticsview.gen;bundle-version="1.0.0", fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF index 9de5e3b41..ede5e32ca 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Opsemanticsviewgen Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF index 53b63d433..165889683 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.model;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin From ef47a3cbd4e8b279255a4cb6af3a83d0c711acbd Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 7 Apr 2017 11:20:47 +0200 Subject: [PATCH 141/267] Move trace.plugin.generator content to trace.gemoc.generator + cleanups --- .../META-INF/MANIFEST.MF | 2 - .../GenericEngineTraceAddonGenerator.xtend | 2 +- .../GenericTracePluginGenerator.xtend | 46 ++++++++-------- .../TraceAddonGeneratorIntegration.xtend | 50 +++-------------- ...GenericTraceConstructorGeneratorJava.xtend | 2 +- .../codegen/StateManagerGeneratorJava.xtend | 35 +++++------- .../TraceConstructorGeneratorJava.xtend | 2 +- .../codegen/TraceExplorerGeneratorJava.xtend | 50 ++++++++--------- .../codegen/TraceExtractorGeneratorJava.xtend | 8 +-- .../codegen/TraceNotifierGeneratorJava.xtend | 10 ++-- .../util}/AbstractEMFProjectGenerator.xtend | 8 +-- .../generator/util}/ExtensionFilter.xtend | 30 +++++------ .../generator/util}/PluginProjectHelper.xtend | 5 +- .../util}/StandaloneEMFProjectGenerator.xtend | 4 +- .../.checkstyle | 13 ----- .../.classpath | 8 --- .../.gitignore | 3 -- .../.project | 40 -------------- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 --- .../META-INF/MANIFEST.MF | 30 ----------- .../about.html | 27 ---------- .../build.properties | 7 --- .../pom.xml | 53 ------------------- 24 files changed, 101 insertions(+), 343 deletions(-) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc}/generator/GenericTracePluginGenerator.xtend (85%) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc}/generator/codegen/GenericTraceConstructorGeneratorJava.xtend (99%) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc}/generator/codegen/StateManagerGeneratorJava.xtend (85%) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc}/generator/codegen/TraceConstructorGeneratorJava.xtend (99%) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc}/generator/codegen/TraceExplorerGeneratorJava.xtend (94%) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc}/generator/codegen/TraceExtractorGeneratorJava.xtend (99%) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc}/generator/codegen/TraceNotifierGeneratorJava.xtend (96%) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util}/AbstractEMFProjectGenerator.xtend (90%) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util}/ExtensionFilter.xtend (89%) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util}/PluginProjectHelper.xtend (97%) rename trace/generator/plugins/{fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean => fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util}/StandaloneEMFProjectGenerator.xtend (99%) delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.classpath delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.gitignore delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.project delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.settings/org.eclipse.core.resources.prefs delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.settings/org.eclipse.jdt.core.prefs delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/about.html delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/build.properties delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/pom.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF index 627356433..c34b95c78 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Require-Bundle: com.google.guava, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, org.eclipse.emf.ecore, - fr.inria.diverse.trace.plugin.generator;bundle-version="1.0.0", fr.inria.diverse.trace.commons;bundle-version="1.0.0", org.eclipse.jdt.core;bundle-version="3.10.0", org.eclipse.ui, @@ -24,6 +23,5 @@ Require-Bundle: com.google.guava, org.gemoc.xdsmlframework.api, fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", fr.inria.diverse.opsemanticsview.gen;bundle-version="1.0.0" -Export-Package: fr.inria.diverse.trace.gemoc.generator Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index a40e1bc3e..253a5492a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -15,7 +15,7 @@ import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.commons.ManifestUtil import fr.inria.diverse.trace.commons.PluginXMLHelper import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import fr.inria.diverse.trace.plugin.generator.GenericTracePluginGenerator +import fr.inria.diverse.trace.gemoc.generator.GenericTracePluginGenerator import java.util.HashSet import java.util.List import java.util.Set diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericTracePluginGenerator.xtend similarity index 85% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericTracePluginGenerator.xtend index 6b58f00b2..1352199ee 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/GenericTracePluginGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericTracePluginGenerator.xtend @@ -8,32 +8,30 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator +package fr.inria.diverse.trace.gemoc.generator -import opsemanticsview.OperationalSemanticsView import fr.inria.diverse.trace.commons.EclipseUtil import fr.inria.diverse.trace.commons.ManifestUtil +import fr.inria.diverse.trace.gemoc.generator.codegen.StateManagerGeneratorJava +import fr.inria.diverse.trace.gemoc.generator.codegen.TraceConstructorGeneratorJava +import fr.inria.diverse.trace.gemoc.generator.util.StandaloneEMFProjectGenerator import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerator -import fr.inria.diverse.trace.plugin.generator.clean.StandaloneEMFProjectGenerator -import fr.inria.diverse.trace.plugin.generator.codegen.StateManagerGeneratorJava -import fr.inria.diverse.trace.plugin.generator.codegen.TraceConstructorGeneratorJava -import java.util.HashSet import java.util.Set +import opsemanticsview.OperationalSemanticsView import org.eclipse.core.resources.IProject import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EPackage -import org.eclipse.emf.ecore.EStructuralFeature -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.jdt.core.IJavaProject import org.eclipse.jdt.core.IPackageFragment import org.eclipse.jdt.core.IPackageFragmentRoot import org.eclipse.jdt.core.JavaCore import org.eclipse.ui.PlatformUI import org.eclipse.xtend.lib.annotations.Accessors -import tracingannotations.TracingAnnotations +import fr.inria.diverse.trace.gemoc.generator.util.AbstractEMFProjectGenerator + +//import tracingannotations.TracingAnnotations /** * Glues the generators : trace metamodel, emf project and trace manager @@ -46,34 +44,34 @@ class GenericTracePluginGenerator { private val boolean gemoc // Transient - private var TracingAnnotations tracingAnnotations + //private var TracingAnnotations tracingAnnotations // Outputs - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var String languageName - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var String tracedLanguageName - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) val String packageQN - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var String traceManagerClassName - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var String traceConstructorClassName - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var String traceExplorerClassName - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var String stateManagerClassName - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var String traceExtractorClassName - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var String traceNotifierClassName - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var IPackageFragment packageFragment - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var IProject project - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var TraceMMGenerationTraceability traceability - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) var Set referencedGenPackages new(OperationalSemanticsView opsemanticsview, String pluginName, boolean gemoc) { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend index ffb5e8ee5..90b6ef60b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Inria - initial API and implementation *******************************************************************************/ @@ -58,20 +58,7 @@ class TraceAddonGeneratorIntegration { val ModelTypingSpace root = resource.getContents().get(0) as ModelTypingSpace val Language selection = root.elements.filter(Language).findFirst[name == selectedLanguage] -// // Get syntax -// val ResourceSet rs = new ResourceSetImpl -// val URI mmUri = URI.createURI(selection.syntax.ecoreUri) -// //val URI mmUri = URI.createURI("platform:/resource/"+ root.name + "." + selection.name.toLowerCase + "/model/" + selection.name + ".ecore") -// val Resource syntaxResource = EMFUtil.loadModelURI(mmUri, rs); -// val Set syntax = syntaxResource.getContents().filter(EPackage).toSet - - // Register all packages in registry - // TODO remove them afterwards? -// for (EPackage p : syntaxResource.allContents.filter(EPackage).toSet) -// EPackage.Registry.INSTANCE.put(p.getNsURI(), p); - - - // We find all extension points providing fr.inria.diverse.trace.gemoc.generator.integration + // We find all extension points providing fr.inria.diverse.trace.gemoc.generator.integration val configNew = Platform.getExtensionRegistry().getConfigurationElementsFor( "fr.inria.diverse.opsemanticsview.gen"); @@ -81,35 +68,13 @@ class TraceAddonGeneratorIntegration { ].filter(OperationalSemanticsViewGenerator).findFirst [ conf | conf.canHandle(selection, melangeFile.project) ] - - // If we find one, we generate + + // If we find one, we generate if (validViewGenerator != null) { val OperationalSemanticsView mmextension = validViewGenerator.generate(selection, melangeFile.project); generateAddon(selectedLanguage, pluginName, replace, monitor, mmextension) } // Otherwise, we error - - // TODO remove what is after -// -// // We find all extension points providing fr.inria.diverse.trace.gemoc.generator.integration -// val config = Platform.getExtensionRegistry().getConfigurationElementsFor( -// "fr.inria.diverse.trace.gemoc.generator.integration"); -// -// // Using them, we instantiate TraceAddonGeneratorIntegrationConfiguration objects and look for one that can work with the current selected language -// val TraceAddonGeneratorIntegrationConfiguration validIntegration = config.map [ e | -// e.createExecutableExtension("class") -// ].filter(TraceAddonGeneratorIntegrationConfiguration).findFirst [ conf | -// conf.canWorkWith(selection, melangeFile.project) -// ] -// -// // If we find one, we generate -// if (validIntegration != null) { -// validIntegration.compute(selection, selectedLanguage, melangeFile.project, syntax, rs); -// val Set executionMetamodel = validIntegration.executionMetamodel -// val OperationalSemanticsView mmextension = validIntegration.getExecutionExtension(); -// generateAddon(selectedLanguage, pluginName, executionMetamodel, replace, monitor, mmextension) -// -// } // Otherwise, we error else { throw new CoreException( new Status( @@ -125,8 +90,8 @@ class TraceAddonGeneratorIntegration { /** * Central operation of the class, that calls business operations */ - public static def void generateAddon(String mmName, String pluginName, - boolean replace, IProgressMonitor monitor, OperationalSemanticsView executionExtension) throws CoreException { + public static def void generateAddon(String mmName, String pluginName, boolean replace, IProgressMonitor monitor, + OperationalSemanticsView executionExtension) throws CoreException { // We look for an existing project with this name val IProject existingProject = ResourcesPlugin.getWorkspace().getRoot().getProject(pluginName); @@ -160,7 +125,8 @@ class TraceAddonGeneratorIntegration { // Then we call all our business operations // TODO handle languages defined with multiple ecores - val GenericEngineTraceAddonGenerator traceaddgen = new GenericEngineTraceAddonGenerator(executionExtension, pluginName); + val GenericEngineTraceAddonGenerator traceaddgen = new GenericEngineTraceAddonGenerator(executionExtension, + pluginName); traceaddgen.generateCompleteAddon(monitor); } catch (IOException e) { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/GenericTraceConstructorGeneratorJava.xtend similarity index 99% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/GenericTraceConstructorGeneratorJava.xtend index cacb6c367..570631870 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/GenericTraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/GenericTraceConstructorGeneratorJava.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.codegen +package fr.inria.diverse.trace.gemoc.generator.codegen import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend similarity index 85% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend index 03dcc914a..cb06c6a93 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/StateManagerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend @@ -8,12 +8,11 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.codegen +package fr.inria.diverse.trace.gemoc.generator.codegen import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import java.util.HashSet import java.util.Set import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import org.eclipse.emf.ecore.EClass @@ -21,7 +20,6 @@ import org.eclipse.emf.ecore.EClassifier import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature -import opsemanticsview.OperationalSemanticsView class StateManagerGeneratorJava { @@ -54,7 +52,7 @@ class StateManagerGeneratorJava { } private def String getFQN(EStructuralFeature eFeature) { - return EcoreCraftingUtil.getBaseFQN(eFeature.EContainingClass) + "." + eFeature.name + return EcoreCraftingUtil.getBaseFQN(eFeature.getEContainingClass) + "." + eFeature.name } private def String getJavaFQN(EClassifier c) { @@ -76,13 +74,13 @@ class StateManagerGeneratorJava { private def String stringGetterExeValue(String javaVarName, EStructuralFeature p, EClass typeToCastTo) { return ''' - «IF (p instanceof EReference && traceability.hasTracedClass(p.EType as EClass))» + «IF (p instanceof EReference && traceability.hasTracedClass(p.getEType as EClass))» ««« If many elements are in this fields, we have to cast the element with a collection «IF p.many» - (Collection) + (Collection) «ELSE» - («getJavaFQN(p.EType, true)») + («getJavaFQN(p.getEType, true)») «ENDIF» «getTracedToExeMethodName»(((«getJavaFQN(typeToCastTo)») «javaVarName»).«EcoreCraftingUtil.stringGetter(p)») «ELSE» @@ -90,15 +88,6 @@ class StateManagerGeneratorJava { «ENDIF»''' } - private def Set getConcreteSubtypesTraceClassOf(EClass tracedClass) { - val Set result = new HashSet() - result.addAll(this.traceMM.eAllContents.filter(EClass).filter [ c | - !c.abstract && c.EAllSuperTypes.contains(tracedClass) - ].toSet) - if (!tracedClass.abstract) - result.add(tracedClass) - return result - } private def String getTracedToExeMethodName() { getTracedToExeUsed = true @@ -181,7 +170,7 @@ class StateManagerGeneratorJava { @SuppressWarnings("unchecked") private void restoreStateExecute(«stateFQN» state) { for («valueFQN» value : state.getValues()) { - «FOR p : traceability.allMutableProperties.sortBy[FQN] SEPARATOR "else"» + «FOR p : traceability.allMutableProperties.sortBy[getFQN] SEPARATOR "else"» «val EReference pdimension = traceability.getDimensionRef(p)» «val EClass tracedObjectClass = pdimension.getEContainingClass» «val EClass valueClass = traceability.getValueClass(p)» @@ -194,21 +183,21 @@ class StateManagerGeneratorJava { originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value", p, valueClass)»); «ELSE» - final «getJavaFQN(p.EType)» toSet = «stringGetterExeValue("value", p, valueClass)»; - final «getJavaFQN(p.EType)» current = originalObject.«EcoreCraftingUtil.stringGetter(p)»; + final «getJavaFQN(p.getEType)» toSet = «stringGetterExeValue("value", p, valueClass)»; + final «getJavaFQN(p.getEType)» current = originalObject.«EcoreCraftingUtil.stringGetter(p)»; if (current != toSet) { originalObject.«EcoreCraftingUtil.stringSetter(p, "toSet", refGenPackages)»; } «ENDIF» «ELSEIF p.eContainer instanceof EClass» - «val containingClass = p.EContainingClass» + «val containingClass = p.getEContainingClass» «getJavaFQN(containingClass)» exeObject = («getJavaFQN(containingClass)») «getTracedToExeMethodName»(tracedObject); «IF p.many» exeObject.«EcoreCraftingUtil.stringGetter(p)».clear(); «IF p instanceof EReference» - exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) «getTracedToExeMethodName»(((«getJavaFQN(valueClass)») value).«EcoreCraftingUtil.stringGetter(p)»)); + exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) «getTracedToExeMethodName»(((«getJavaFQN(valueClass)») value).«EcoreCraftingUtil.stringGetter(p)»)); «ELSE» - exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) ((«getJavaFQN(valueClass)») value).«EcoreCraftingUtil.stringGetter(p)»); + exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) ((«getJavaFQN(valueClass)») value).«EcoreCraftingUtil.stringGetter(p)»); «ENDIF» «ELSE» exeObject.«EcoreCraftingUtil.stringSetter(p, stringGetterExeValue("value", p, valueClass), refGenPackages)»; @@ -237,4 +226,4 @@ class StateManagerGeneratorJava { ''' } -} \ No newline at end of file +} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend similarity index 99% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend index e33f5f6a2..8c00e97a5 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.codegen +package fr.inria.diverse.trace.gemoc.generator.codegen import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExplorerGeneratorJava.xtend similarity index 94% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExplorerGeneratorJava.xtend index 2fada61a3..dfbc64b0f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExplorerGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExplorerGeneratorJava.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.codegen +package fr.inria.diverse.trace.gemoc.generator.codegen import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil @@ -17,6 +17,7 @@ import fr.inria.diverse.trace.metamodel.generator.TraceMMStrings import java.util.Collection import java.util.HashSet import java.util.Set +import opsemanticsview.Rule import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EClassifier @@ -24,7 +25,6 @@ import org.eclipse.emf.ecore.EOperation import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EStructuralFeature -import opsemanticsview.Rule class TraceExplorerGeneratorJava { @@ -482,29 +482,29 @@ class TraceExplorerGeneratorJava { «val EReference pdimension = traceability.getDimensionRef(p)» «val EClass stateClass = traceability.getValueClass(p)» for («getJavaFQN(stateClass)» value : stateToGo.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createGlobalToState(stateClass))») { - final EObject parent = value.eContainer().eContainer(); - ««« Case in which we can use the "originalObject" reference and simply set its values - «IF ! traceability.newClasses.contains(p.eContainer)» - ««« We have to test at runtime be can't know at design time the type of the object containing the property - ««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. - «FOR concreteSubType : getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» - if (parent instanceof «getJavaFQN(concreteSubType)») { - «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» - «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; - «IF !origRefs.isEmpty» - «val EReference origRef = origRefs.get(0)» - «IF p.many» - «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; - originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); - originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value",p)»); - «ELSE» - «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p)»; - «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as EClass))»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; - if (current != toset) { - ((«getJavaFQN((p.eContainer as EClass))»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; - } - «ENDIF» - «ENDIF» +final EObject parent = value.eContainer().eContainer(); +««« Case in which we can use the "originalObject" reference and simply set its values +«IF ! traceability.newClasses.contains(p.eContainer)» +««« We have to test at runtime be can't know at design time the type of the object containing the property +««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. +«FOR concreteSubType : getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» +if (parent instanceof «getJavaFQN(concreteSubType)») { + «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» + «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; + «IF !origRefs.isEmpty» + «val EReference origRef = origRefs.get(0)» + «IF p.many» + «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; + originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); + originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value",p)»); + «ELSE» + «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p)»; + «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as EClass))»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; + if (current != toset) { + ((«getJavaFQN((p.eContainer as EClass))»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; + } + «ENDIF» + «ENDIF» } «ENDFOR» ««« Case in which we have to recreate/restore execution objects in the model diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExtractorGeneratorJava.xtend similarity index 99% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExtractorGeneratorJava.xtend index e55f2b920..ec1c0ac00 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceExtractorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExtractorGeneratorJava.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.codegen +package fr.inria.diverse.trace.gemoc.generator.codegen import fr.inria.diverse.trace.commons.CodeGenUtil @@ -70,7 +70,7 @@ class TraceExtractorGeneratorJava { } private def String getFQN(EStructuralFeature eFeature) { - return EcoreCraftingUtil.getBaseFQN(eFeature.EContainingClass) + "." + eFeature.name + return EcoreCraftingUtil.getBaseFQN(eFeature.getEContainingClass) + "." + eFeature.name } private def String getJavaFQN(EClassifier c) { @@ -99,7 +99,7 @@ class TraceExtractorGeneratorJava { private def Set getAllMutablePropertiesOf(EClass exeClass) { val Set res = new HashSet res.addAll(traceability.getMutablePropertiesOf(exeClass)) - res.addAll(exeClass.EAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); + res.addAll(exeClass.getEAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); return res } @@ -595,7 +595,7 @@ class TraceExtractorGeneratorJava { final List> result = new ArrayList<>(); «FOR mutClass : traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name]» «val traced = traceability.getTracedClass(mutClass)» - «val mutProps = getAllMutablePropertiesOf(mutClass).sortBy[FQN]» + «val mutProps = getAllMutablePropertiesOf(mutClass).sortBy[getFQN]» «IF !mutProps.empty» for («getJavaFQN(traced)» tracedObject : traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))») { «FOR p : mutProps» diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceNotifierGeneratorJava.xtend similarity index 96% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceNotifierGeneratorJava.xtend index abbc4639b..9cd419e22 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/codegen/TraceNotifierGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceNotifierGeneratorJava.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.codegen +package fr.inria.diverse.trace.gemoc.generator.codegen import fr.inria.diverse.trace.commons.CodeGenUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil @@ -50,7 +50,7 @@ class TraceNotifierGeneratorJava { } private def String getFQN(EStructuralFeature eFeature) { - return EcoreCraftingUtil.getBaseFQN(eFeature.EContainingClass) + "." + eFeature.name + return EcoreCraftingUtil.getBaseFQN(eFeature.getEContainingClass) + "." + eFeature.name } private def String getJavaFQN(EClassifier c) { @@ -73,7 +73,7 @@ class TraceNotifierGeneratorJava { private def Set getAllMutablePropertiesOf(EClass exeClass) { val Set res = new HashSet res.addAll(traceability.getMutablePropertiesOf(exeClass)) - res.addAll(exeClass.EAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); + res.addAll(exeClass.getEAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); return res } @@ -147,7 +147,7 @@ class TraceNotifierGeneratorJava { endedSteps.addAll(newState.getEndedSteps()); «FOR mutClass : traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name]» «val traced = traceability.getTracedClass(mutClass)» - «val mutProps = getAllMutablePropertiesOf(mutClass).sortBy[FQN]» + «val mutProps = getAllMutablePropertiesOf(mutClass).sortBy[getFQN]» «IF !mutProps.empty» } else if (o instanceof «getJavaFQN(traced)») { «FOR p : mutProps» @@ -197,4 +197,4 @@ class TraceNotifierGeneratorJava { ''' } -} \ No newline at end of file +} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/AbstractEMFProjectGenerator.xtend similarity index 90% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/AbstractEMFProjectGenerator.xtend index 134495200..ff586ad96 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/AbstractEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/AbstractEMFProjectGenerator.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator +package fr.inria.diverse.trace.gemoc.generator.util import java.util.HashSet import java.util.Set @@ -27,11 +27,11 @@ abstract class AbstractEMFProjectGenerator { protected val String projectName // Outputs - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) protected var IProject project - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) protected val Set referencedGenPackages = new HashSet - @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) protected val Set rootPackages = new HashSet // Transient diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/ExtensionFilter.xtend similarity index 89% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/ExtensionFilter.xtend index 60b12e7c8..0c09942a4 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/ExtensionFilter.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/ExtensionFilter.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator +package fr.inria.diverse.trace.gemoc.generator.util import fr.inria.diverse.trace.commons.EcoreCraftingUtil import java.util.HashSet @@ -37,7 +37,7 @@ class ExtensionFilter { val OperationalSemanticsView executionExtension // Output - @Accessors(PUBLIC_GETTER,PRIVATE_SETTER) + @Accessors(#[PUBLIC_GETTER, PRIVATE_SETTER]) var boolean didFilterSomething = false // Transient @@ -64,7 +64,7 @@ class ExtensionFilter { val Set chosenClassesFQNs = chosenClasses.map[c|EcoreCraftingUtil.getFQN(c, ".")].toSet val Set chosenPropertiesFQNs = chosenProperties.map [ p | - EcoreCraftingUtil.getFQN(p.EContainingClass, ".") + "." + p.name + EcoreCraftingUtil.getFQN(p.getEContainingClass, ".") + "." + p.name ].toSet for (element : executionExtension.dynamicClasses) { @@ -72,19 +72,19 @@ class ExtensionFilter { if (chosenClassesFQNs.contains(fqn)) { retainedClasses.add(element) retainedClasses.addAll((element)) - retainedProperties.addAll(element.EStructuralFeatures) + retainedProperties.addAll(element.getEStructuralFeatures) } } for (element : executionExtension.dynamicProperties) { - val fqn = EcoreCraftingUtil.getFQN(element.EContainingClass, ".") + "." + element.name + val fqn = EcoreCraftingUtil.getFQN(element.getEContainingClass, ".") + "." + element.name if (chosenPropertiesFQNs.contains(fqn)) { retainedProperties.add(element) - retainedClasses.add(element.EContainingClass) - retainedClasses.addAll((element.EContainingClass)) + retainedClasses.add(element.getEContainingClass) + retainedClasses.addAll((element.getEContainingClass)) if (element instanceof EReference) { - retainedClasses.add(element.EReferenceType) - retainedClasses.addAll((element.EReferenceType)) + retainedClasses.add(element.getEReferenceType) + retainedClasses.addAll((element.getEReferenceType)) } } } @@ -92,11 +92,11 @@ class ExtensionFilter { for (element : executionExtension.rules) { if (element.stepRule) { retainedRules.add(element) - for (paramClass : element.operation.EParameters.map[p|p.EType].filter(EClass)) { + for (paramClass : element.operation.getEParameters.map[p|p.getEType].filter(EClass)) { retainedClasses.add(paramClass) } - if (element.operation.EType instanceof EClass) { - retainedClasses.add(element.operation.EType as EClass) + if (element.operation.getEType instanceof EClass) { + retainedClasses.add(element.operation.getEType as EClass) } retainedClasses.add(element.containingClass) } @@ -105,9 +105,9 @@ class ExtensionFilter { // Hack: we replace indirect supertype relationships by direct ones for (c1 : retainedClasses) { for (c2 : retainedClasses.filter[c|c != c1]) { - if (c1.EAllSuperTypes.contains(c2)) { + if (c1.getEAllSuperTypes.contains(c2)) { if (!hasSuperTypePathContainedIn(c1, c2, retainedClasses)) { - c1.ESuperTypes.add(c2) + c1.getESuperTypes.add(c2) } } } @@ -196,7 +196,7 @@ class ExtensionFilter { if (origin == destination) return true - for (s : origin.ESuperTypes.filter[s|containedIn.contains(s)]) { + for (s : origin.getESuperTypes.filter[s|containedIn.contains(s)]) { val result = hasSuperTypePathContainedIn(s, destination, containedIn) if (result) return true diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/PluginProjectHelper.xtend similarity index 97% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/PluginProjectHelper.xtend index ea7d68751..3c2ca8e83 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/PluginProjectHelper.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/PluginProjectHelper.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.clean; +package fr.inria.diverse.trace.gemoc.generator.util; import java.io.ByteArrayInputStream import java.io.InputStream @@ -51,9 +51,6 @@ public class PluginProjectHelper { val IWorkspace workspace = ResourcesPlugin.getWorkspace(); project = workspace.getRoot().getProject(projectName); -// if (project.exists) { -// project.delete(true, true, new SubProgressMonitor(progressMonitor, 1)); -// } val IJavaProject javaProject = JavaCore.create(project); val IProjectDescription projectDescription = ResourcesPlugin.getWorkspace().newProjectDescription( projectName); diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend similarity index 99% rename from trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend rename to trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend index f73af415e..9c9fea158 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/src/fr/inria/diverse/trace/plugin/generator/clean/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend @@ -8,9 +8,9 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.plugin.generator.clean +package fr.inria.diverse.trace.gemoc.generator.util -import fr.inria.diverse.trace.plugin.generator.AbstractEMFProjectGenerator +import fr.inria.diverse.trace.gemoc.generator.util.AbstractEMFProjectGenerator import java.io.IOException import java.io.PrintWriter import java.io.StringWriter diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle deleted file mode 100644 index 42097404b..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.checkstyle +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.classpath b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.classpath deleted file mode 100644 index 87e8cd659..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.gitignore b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.gitignore deleted file mode 100644 index ed683fd9e..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/xtend-gen/* -/xtend-gen/ diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.project b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.project deleted file mode 100644 index 4e622ac06..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - fr.inria.diverse.trace.plugin.generator - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.settings/org.eclipse.core.resources.prefs b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.settings/org.eclipse.jdt.core.prefs b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dc..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF deleted file mode 100644 index 9c4e8ba37..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/META-INF/MANIFEST.MF +++ /dev/null @@ -1,30 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Generator -Bundle-SymbolicName: fr.inria.diverse.trace.plugin.generator -Bundle-Version: 2.3.0.qualifier -Require-Bundle: com.google.guava, - org.eclipse.xtext.xbase.lib, - org.eclipse.xtend.lib, - org.eclipse.xtend.lib.macro, - fr.inria.diverse.trace.metamodel.generator;bundle-version="1.0.0", - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.xmi, - org.eclipse.pde.ui;bundle-version="3.8.101", - org.eclipse.core.resources;bundle-version="3.9.1", - org.eclipse.core.runtime;bundle-version="3.10.0", - org.eclipse.ui, - org.eclipse.ui.ide, - org.eclipse.emf.importer.ecore;bundle-version="2.8.0", - org.eclipse.emf.converter;bundle-version="2.7.0", - org.eclipse.emf.importer, - fr.inria.diverse.trace.commons;bundle-version="1.0.0", - org.eclipse.jdt.core;bundle-version="3.10.0", - fr.inria.diverse.trace.annotations;bundle-version="0.1.0", - org.eclipse.emf.codegen.ecore.ui, - org.eclipse.core.expressions;bundle-version="3.4.600", - fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0" -Export-Package: fr.inria.diverse.trace.plugin.generator, - fr.inria.diverse.trace.plugin.generator.clean -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/about.html b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/about.html deleted file mode 100644 index 420ad0f93..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/about.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - -About - - -

    About This Content

    - -

    June 5, 2006

    -

    License

    - -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    - -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    - - - \ No newline at end of file diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/build.properties b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/build.properties deleted file mode 100644 index 0ca040a19..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - about.html -src.includes = about.html diff --git a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/pom.xml b/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/pom.xml deleted file mode 100644 index c97f3dfa0..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.plugin.generator/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - org.gemoc.multidimensional_trace_management - fr.inria.diverse.trace.plugin.generator - 2.3.0-SNAPSHOT - eclipse-plugin - - - org.gemoc.modeldebugging.trace.generator - org.gemoc.modeldebugging.trace.generator.root - 2.3.0-SNAPSHOT - ../.. - - - - - - org.eclipse.xtend - xtend-maven-plugin - ${xtend.version} - - - - compile - - - xtend-gen - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 2.5 - - - - xtend-gen - - - - - - - - - - From 958761f345d5b14df85b6dd9f9df75b9082c38b2 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 7 Apr 2017 12:05:47 +0200 Subject: [PATCH 142/267] Remove AbstractEMFProjectGenerator abstract class --- .../util/AbstractEMFProjectGenerator.xtend | 65 ------------------- .../util/StandaloneEMFProjectGenerator.xtend | 45 +++++++++++-- 2 files changed, 40 insertions(+), 70 deletions(-) delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/AbstractEMFProjectGenerator.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/AbstractEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/AbstractEMFProjectGenerator.xtend deleted file mode 100644 index ff586ad96..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/AbstractEMFProjectGenerator.xtend +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.util - -import java.util.HashSet -import java.util.Set -import org.eclipse.core.resources.IProject -import org.eclipse.core.runtime.IProgressMonitor -import org.eclipse.emf.codegen.ecore.genmodel.GenModel -import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import org.eclipse.emf.ecore.EPackage -import org.eclipse.ui.PlatformUI -import org.eclipse.xtend.lib.annotations.Accessors - -abstract class AbstractEMFProjectGenerator { - - // Inputs - protected val EPackage ecoreModel - protected val String projectName - - // Outputs - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - protected var IProject project - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - protected val Set referencedGenPackages = new HashSet - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - protected val Set rootPackages = new HashSet - - // Transient - protected var GenModel genModel - - new(String projectName, EPackage ecoreModel) { - this.projectName = projectName - this.ecoreModel = ecoreModel - } - - /** - * Creates a new EMF project with the ecore file and the genmodel in the "model" folder - * also mages project, referencedGenPackages and rootPackages available. - */ - def void generateBaseEMFProject(IProgressMonitor m) - - /** - * Helper method to generate code without a job. - */ - def void generateModelCode() { - PlatformUI.workbench.activeWorkbenchWindow.run(false, true, [ m | - generateModelCode(m) - ]) - } - - /** - * Generates the code using the genmodel (within a Job). - */ - def void generateModelCode(IProgressMonitor m) throws Exception - -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend index 9c9fea158..ae607b990 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend @@ -10,7 +10,6 @@ *******************************************************************************/ package fr.inria.diverse.trace.gemoc.generator.util -import fr.inria.diverse.trace.gemoc.generator.util.AbstractEMFProjectGenerator import java.io.IOException import java.io.PrintWriter import java.io.StringWriter @@ -24,6 +23,7 @@ import java.util.Set import java.util.jar.Manifest import org.eclipse.core.resources.IFile import org.eclipse.core.resources.IFolder +import org.eclipse.core.resources.IProject import org.eclipse.core.runtime.CoreException import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.emf.codegen.ecore.generator.Generator @@ -49,8 +49,34 @@ import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.emf.ecore.util.EcoreUtil +import org.eclipse.ui.PlatformUI +import org.eclipse.xtend.lib.annotations.Accessors -public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { +public class StandaloneEMFProjectGenerator { + + // Inputs + protected val EPackage ecoreModel + protected val String projectName + + // Outputs + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) + protected var IProject project + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) + protected val Set referencedGenPackages = new HashSet + @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) + protected val Set rootPackages = new HashSet + + // Transient + protected var GenModel genModel + + /** + * Helper method to generate code without a job. + */ + def void generateModelCode() { + PlatformUI.workbench.activeWorkbenchWindow.run(false, true, [ m | + generateModelCode(m) + ]) + } public static val String MODEL_GEN_FOLDER = "model" @@ -64,10 +90,15 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { protected Resource ecoreModelResource new(String projectName, EPackage p) { - super(projectName, p) + this.ecoreModel = p + this.projectName = projectName } - override generateBaseEMFProject(IProgressMonitor m) { + /** + * Creates a new EMF project with the ecore file and the genmodel in the "model" folder + * also mages project, referencedGenPackages and rootPackages available. + */ + def void generateBaseEMFProject(IProgressMonitor m) { this.progressMonitor = m; this.resourceSet = new ResourceSetImpl @@ -106,7 +137,11 @@ public class StandaloneEMFProjectGenerator extends AbstractEMFProjectGenerator { this.rootPackages.addAll(ecoreModelResource.contents.filter(EPackage).toSet) } - override generateModelCode(IProgressMonitor m) { + /** + * Generates the code using the genmodel (within a Job). + */ + def void generateModelCode(IProgressMonitor m) throws Exception { + generateCode(progressMonitor); } From a93cff73d2596bf2f926cb28aec3140c6947c2b0 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 7 Apr 2017 12:07:20 +0200 Subject: [PATCH 143/267] trace: move plugin generator content to addon generator + cleanups --- .../build.properties | 3 +- .../plugin.xml | 5 - .../GenericEngineTraceAddonGenerator.xtend | 162 ++- .../GenericTracePluginGenerator.xtend | 184 --- .../TraceAddonGeneratorIntegration.xtend | 2 +- ...GenericTraceConstructorGeneratorJava.xtend | 1000 ----------------- .../TraceConstructorGeneratorJava.xtend | 2 +- .../codegen/TraceExplorerGeneratorJava.xtend | 990 ---------------- .../codegen/TraceExtractorGeneratorJava.xtend | 994 ---------------- .../codegen/TraceNotifierGeneratorJava.xtend | 200 ---- 10 files changed, 129 insertions(+), 3413 deletions(-) delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/plugin.xml delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericTracePluginGenerator.xtend delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/GenericTraceConstructorGeneratorJava.xtend delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExplorerGeneratorJava.xtend delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExtractorGeneratorJava.xtend delete mode 100644 trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceNotifierGeneratorJava.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/build.properties b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/build.properties index 555b9ec3b..0ca040a19 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/build.properties +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/build.properties @@ -3,6 +3,5 @@ source.. = src/,\ output.. = bin/ bin.includes = META-INF/,\ .,\ - about.html,\ - plugin.xml + about.html src.includes = about.html diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/plugin.xml b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/plugin.xml deleted file mode 100644 index 5535690d3..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/plugin.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index 253a5492a..943f0b9d3 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -11,11 +11,15 @@ package fr.inria.diverse.trace.gemoc.generator import fr.inria.diverse.trace.commons.CodeGenUtil +import fr.inria.diverse.trace.commons.EclipseUtil import fr.inria.diverse.trace.commons.EcoreCraftingUtil import fr.inria.diverse.trace.commons.ManifestUtil import fr.inria.diverse.trace.commons.PluginXMLHelper +import fr.inria.diverse.trace.gemoc.generator.codegen.StateManagerGeneratorJava +import fr.inria.diverse.trace.gemoc.generator.codegen.TraceConstructorGeneratorJava +import fr.inria.diverse.trace.gemoc.generator.util.StandaloneEMFProjectGenerator import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import fr.inria.diverse.trace.gemoc.generator.GenericTracePluginGenerator +import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerator import java.util.HashSet import java.util.List import java.util.Set @@ -28,7 +32,11 @@ import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EClassifier import org.eclipse.emf.ecore.EOperation +import org.eclipse.emf.ecore.EPackage +import org.eclipse.jdt.core.IJavaProject import org.eclipse.jdt.core.IPackageFragment +import org.eclipse.jdt.core.IPackageFragmentRoot +import org.eclipse.jdt.core.JavaCore import org.eclipse.ui.PlatformUI import org.eclipse.xtend.lib.annotations.Accessors import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint @@ -49,10 +57,17 @@ class GenericEngineTraceAddonGenerator { private var String stepFactoryClassName private var TraceMMGenerationTraceability traceability private var Set genPackages + private var IPackageFragment packageFragment + private var String tracedLanguageName + private var EPackage tracemm + private var boolean partialTraceManagement = false + private var String languageName // Output @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) IProject project + + new(OperationalSemanticsView opsemanticsview, String pluginName) { this.opsemanticsview = opsemanticsview @@ -78,37 +93,92 @@ class GenericEngineTraceAddonGenerator { private def String getJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { return EcoreCraftingUtil.getJavaFQN(c,genPackages,enforcePrimitiveJavaClass) } - + + private static def Set findNestedGenpackages(GenPackage p) { + val result = p.nestedGenPackages.toSet + result.add(p) + for (n : p.nestedGenPackages) { + result.addAll(findNestedGenpackages(n)) + } + return result + } + + public def void generateCompleteAddon(IProgressMonitor m) { + generateTraceMetamodelAndPlugin(m) + prepareManifest(m) + generateTraceManagementCode(m) + addExtensionPoint() + } + + private def void generateTraceMetamodelAndPlugin(IProgressMonitor m) { + + tracedLanguageName = opsemanticsview.executionMetamodel.name + languageName = tracedLanguageName.replaceAll(" ", "") + "Trace" + +//TODO disabled for now, the whole approach must be adapted since Ecorext is not used anymore +// if (tracingAnnotations != null) { +// var Set classesToTrace = new HashSet +// var Set propertiesToTrace = new HashSet +// classesToTrace.addAll(tracingAnnotations.classestoTrace) +// propertiesToTrace.addAll(tracingAnnotations.propertiesToTrace) +// val filter = new ExtensionFilter(opsemanticsview, classesToTrace, propertiesToTrace) +// filter.execute() +// partialTraceManagement = filter.didFilterSomething +// } + + // Generate trace metamodel + val TraceMMGenerator tmmgenerator = new TraceMMGenerator(opsemanticsview, true) + tmmgenerator.computeAllMaterial + tmmgenerator.sortResult + tracemm = tmmgenerator.tracemmresult + + // Generate EMF project + val StandaloneEMFProjectGenerator emfGen = new StandaloneEMFProjectGenerator(pluginName, tracemm) + emfGen.generateBaseEMFProject(m) + val referencedGenPackagesRoots = emfGen.referencedGenPackages + this.genPackages = referencedGenPackagesRoots.map[findNestedGenpackages].flatten.toSet + + // At this point the wizard has created and reloaded a new resource with the trace metamodel + // We access this new metamodel/resource thanks to emfGen.rootPackages + // And we add add the missing gemoc getCaller implementations to the trace metamodel + tmmgenerator.addGetCallerEOperations(emfGen.rootPackages, genPackages) + emfGen.rootPackages.head.eResource.save(null) + + // Generate code + emfGen.generateModelCode(m) + this.project = emfGen.project + + // Finding the "src folder" in which to generate code + val IJavaProject javaProject = JavaCore.create(project) + val sourceFolders = EclipseUtil.findSrcFoldersOf(javaProject) - // Generate trace plugin - val GenericTracePluginGenerator GenericTracePluginGenerator = new GenericTracePluginGenerator(opsemanticsview, - pluginName, true) - GenericTracePluginGenerator.generate(m) - - // Retrieving some info from the plugin generation - packageQN = GenericTracePluginGenerator.packageQN - className = GenericTracePluginGenerator.languageName.replaceAll(" ", "").toFirstUpper + "EngineAddon" - traceConstructorClassName = GenericTracePluginGenerator.traceConstructorClassName - stateManagerClassName = GenericTracePluginGenerator.stateManagerClassName - stepFactoryClassName = GenericTracePluginGenerator.languageName.replaceAll(" ", "").toFirstUpper + "StepFactory" - traceability = GenericTracePluginGenerator.traceability - genPackages = GenericTracePluginGenerator.referencedGenPackages - - // Add dependency to plugin containing AbstractTraceAddon - ManifestUtil.addToPluginManifest(GenericTracePluginGenerator.project, m, "fr.inria.diverse.trace.gemoc") - ManifestUtil.addToPluginManifest(GenericTracePluginGenerator.project, m, "fr.inria.diverse.trace.gemoc.api") - ManifestUtil.addToPluginManifest(GenericTracePluginGenerator.project, m, "org.gemoc.xdsmlframework.api") - ManifestUtil.addToPluginManifest(GenericTracePluginGenerator.project, m, "fr.inria.diverse.trace.commons.model") - ManifestUtil.addToPluginManifest(GenericTracePluginGenerator.project, m, "org.gemoc.sequential_addons.multidimensional.timeline") - ManifestUtil.addToPluginManifest(GenericTracePluginGenerator.project, m, "fr.obeo.timeline") - ManifestUtil.addToPluginManifest(GenericTracePluginGenerator.project, m, "fr.inria.diverse.trace.commons") - ManifestUtil.addToPluginManifest(GenericTracePluginGenerator.project, m, "org.gemoc.xdsmlframework.api") - ManifestUtil.addToPluginManifest(GenericTracePluginGenerator.project, m, "fr.inria.diverse.trace.commons.model") + // Now we need lots of things that require a monitor, so we do that in a dedicated action + // We use JDT to create the package folders from a string "xxx.yyy.zzz" + val IPackageFragmentRoot srcFolderFragment = javaProject.getPackageFragmentRoot(sourceFolders.get(0)); + packageFragment = srcFolderFragment.createPackageFragment(packageQN, true, m) + + + this.traceability = tmmgenerator.traceability + } + + private def void generateTraceManagementCode(IProgressMonitor m) { - ManifestUtil.setRequiredExecutionEnvironmentToPluginManifest(GenericTracePluginGenerator.project, m, "JavaSE-1.8") - // Getting java fragment to create classes - val IPackageFragment fragment = GenericTracePluginGenerator.packageFragment + // Generate trace constructor + val TraceConstructorGeneratorJava tconstructorgen = new TraceConstructorGeneratorJava(languageName, + pluginName + ".tracemanager", tracemm, traceability, genPackages, + opsemanticsview.executionMetamodel, partialTraceManagement) + traceConstructorClassName = tconstructorgen.className + packageFragment.createCompilationUnit(traceConstructorClassName + ".java", tconstructorgen.generateCode, true, m) + + // Generate state manager + val StateManagerGeneratorJava statemanagergem = new StateManagerGeneratorJava(languageName, + pluginName + ".tracemanager", tracemm, traceability, genPackages) + stateManagerClassName = statemanagergem.className + packageFragment.createCompilationUnit(stateManagerClassName + ".java", statemanagergem.generateCode, true, m) + + // Getting java fragment to create classes + val IPackageFragment fragment = packageFragment // Generate trace engine addon class (same package as the trace manager) val String prettyCode = CodeGenUtil.formatJavaCode(generateAddonClassCode()) @@ -118,11 +188,31 @@ class GenericEngineTraceAddonGenerator { val String uglyFactoryCode = generateStepFactory val String prettyCodeStepFactory = CodeGenUtil.formatJavaCode(uglyFactoryCode) fragment.createCompilationUnit(stepFactoryClassName + ".java", prettyCodeStepFactory, true, m) - - - + + } + + private def prepareManifest(IProgressMonitor m) { + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.emf.transaction") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.emf.compare") + ManifestUtil.addToPluginManifest(project, m, "org.gemoc.executionframework.engine") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.xtext") + ManifestUtil.addToPluginManifest(project, m, "org.gemoc.commons.eclipse") + ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.gemoc") + ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.gemoc.api") + ManifestUtil.addToPluginManifest(project, m, "org.gemoc.xdsmlframework.api") + ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.commons.model") + ManifestUtil.addToPluginManifest(project, m, "org.gemoc.sequential_addons.multidimensional.timeline") + ManifestUtil.addToPluginManifest(project, m, "fr.obeo.timeline") + ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.commons") + ManifestUtil.addToPluginManifest(project, m, "org.gemoc.xdsmlframework.api") + ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.commons.model") + ManifestUtil.setRequiredExecutionEnvironmentToPluginManifest(project, m, "JavaSE-1.8") + } + + private def void addExtensionPoint() { + // Add extension point (taken from GemocLanguageDesignerBuilder) - this.project = GenericTracePluginGenerator.project + this.project = project val IFile pluginfile = project.getFile(PluginXMLHelper.PLUGIN_FILENAME); PluginXMLHelper.createEmptyTemplateFile(pluginfile, false); val PluginXMLHelper helper = new PluginXMLHelper(); @@ -140,11 +230,11 @@ class GenericEngineTraceAddonGenerator { ); updateDefinitionAttributeInExtensionPoint(extensionPoint, EngineAddonSpecificationExtensionPoint.GEMOC_ENGINE_ADDON_EXTENSION_POINT_NAME, - GenericTracePluginGenerator.tracedLanguageName + " MultiDimensional Trace" + tracedLanguageName + " MultiDimensional Trace" ); updateDefinitionAttributeInExtensionPoint(extensionPoint, EngineAddonSpecificationExtensionPoint.GEMOC_ENGINE_ADDON_EXTENSION_POINT_SHORTDESCRIPTION, - "MultiDimensional Trace support dedicated to "+GenericTracePluginGenerator.tracedLanguageName+" language" + "MultiDimensional Trace support dedicated to "+tracedLanguageName+" language" ); updateDefinitionAttributeInExtensionPoint(extensionPoint, EngineAddonSpecificationExtensionPoint.GEMOC_ENGINE_ADDON_EXTENSION_POINT_OPENVIEWIDS, "org.gemoc.sequential_addons.multidimensional.timeline.views.timeline.MultidimensionalTimeLineView" @@ -152,8 +242,8 @@ class GenericEngineTraceAddonGenerator { updateDefinitionAttributeInExtensionPoint(extensionPoint, EngineAddonSpecificationExtensionPoint.GEMOC_ENGINE_ADDON_EXTENSION_POINT_ADDONGROUPID, "Sequential.AddonGroup" ); - helper.saveDocument(pluginfile); + } private def static Element updateDefinitionAttributeInExtensionPoint(Element extensionPoint, String atributeName, diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericTracePluginGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericTracePluginGenerator.xtend deleted file mode 100644 index 1352199ee..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericTracePluginGenerator.xtend +++ /dev/null @@ -1,184 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator - -import fr.inria.diverse.trace.commons.EclipseUtil -import fr.inria.diverse.trace.commons.ManifestUtil -import fr.inria.diverse.trace.gemoc.generator.codegen.StateManagerGeneratorJava -import fr.inria.diverse.trace.gemoc.generator.codegen.TraceConstructorGeneratorJava -import fr.inria.diverse.trace.gemoc.generator.util.StandaloneEMFProjectGenerator -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerator -import java.util.Set -import opsemanticsview.OperationalSemanticsView -import org.eclipse.core.resources.IProject -import org.eclipse.core.runtime.IProgressMonitor -import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import org.eclipse.emf.ecore.EPackage -import org.eclipse.jdt.core.IJavaProject -import org.eclipse.jdt.core.IPackageFragment -import org.eclipse.jdt.core.IPackageFragmentRoot -import org.eclipse.jdt.core.JavaCore -import org.eclipse.ui.PlatformUI -import org.eclipse.xtend.lib.annotations.Accessors -import fr.inria.diverse.trace.gemoc.generator.util.AbstractEMFProjectGenerator - -//import tracingannotations.TracingAnnotations - -/** - * Glues the generators : trace metamodel, emf project and trace manager - */ -class GenericTracePluginGenerator { - - // Inputs - private val OperationalSemanticsView opsemanticsview // URI - private val String pluginName - private val boolean gemoc - - // Transient - //private var TracingAnnotations tracingAnnotations - - // Outputs - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var String languageName - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var String tracedLanguageName - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - val String packageQN - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var String traceManagerClassName - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var String traceConstructorClassName - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var String traceExplorerClassName - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var String stateManagerClassName - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var String traceExtractorClassName - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var String traceNotifierClassName - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var IPackageFragment packageFragment - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var IProject project - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var TraceMMGenerationTraceability traceability - @Accessors(#[PUBLIC_GETTER, PROTECTED_SETTER]) - var Set referencedGenPackages - - new(OperationalSemanticsView opsemanticsview, String pluginName, boolean gemoc) { - - this.opsemanticsview = opsemanticsview - this.pluginName = pluginName - this.packageQN = pluginName + ".tracemanager" - this.gemoc = gemoc - - // Given a file XXX.ecore, we try to find a model containing tracing annotations in XXX.tracingannotations -// try { -// val rs = new ResourceSetImpl -// val uri = abstractSyntax.eResource.URI.trimFileExtension.appendFileExtension("tracingannotations") -// val resource = rs.createResource(uri) -// resource.load(null) -// this.tracingAnnotations = resource.contents.head as TracingAnnotations -// } catch (Throwable e) { -// } - } - - def void generate() { - PlatformUI.workbench.activeWorkbenchWindow.run(false, true, [ m | - generate(m) - ]) - } - - private static def Set findNestedGenpackages(GenPackage p) { - val result = p.nestedGenPackages.toSet - result.add(p) - for (n : p.nestedGenPackages) { - result.addAll(findNestedGenpackages(n)) - } - return result - } - - def void generate(IProgressMonitor m) { - tracedLanguageName = opsemanticsview.executionMetamodel.name - languageName = tracedLanguageName.replaceAll(" ", "") + "Trace" - - var partialTraceManagement = false -//TODO disabled for now, the whole approach must be adapted since Ecorext is not used anymore -// if (tracingAnnotations != null) { -// var Set classesToTrace = new HashSet -// var Set propertiesToTrace = new HashSet -// classesToTrace.addAll(tracingAnnotations.classestoTrace) -// propertiesToTrace.addAll(tracingAnnotations.propertiesToTrace) -// val filter = new ExtensionFilter(opsemanticsview, classesToTrace, propertiesToTrace) -// filter.execute() -// partialTraceManagement = filter.didFilterSomething -// } - - // Generate trace metamodel - val TraceMMGenerator tmmgenerator = new TraceMMGenerator(opsemanticsview, gemoc) - tmmgenerator.computeAllMaterial - tmmgenerator.sortResult - val EPackage tracemm = tmmgenerator.tracemmresult - - // Generate EMF project - val AbstractEMFProjectGenerator emfGen = new StandaloneEMFProjectGenerator(pluginName, tracemm) - emfGen.generateBaseEMFProject(m) - val referencedGenPackagesRoots = emfGen.referencedGenPackages - referencedGenPackages = referencedGenPackagesRoots.map[findNestedGenpackages].flatten.toSet - - // At this point the wizard has created and reloaded a new resource with the trace metamodel - // We access this new metamodel/resource thanks to emfGen.rootPackages - // And we add add the missing gemoc getCaller implementations to the trace metamodel - if (gemoc) { - tmmgenerator.addGetCallerEOperations(emfGen.rootPackages, referencedGenPackages) - emfGen.rootPackages.head.eResource.save(null) - } - - // Generate code - emfGen.generateModelCode(m) - this.project = emfGen.project - - // Finding the "src folder" in which to generate code - val IJavaProject javaProject = JavaCore.create(project) - val sourceFolders = EclipseUtil.findSrcFoldersOf(javaProject) - - // Now we need lots of things that require a monitor, so we do that in a dedicated action - // We use JDT to create the package folders from a string "xxx.yyy.zzz" - val IPackageFragmentRoot srcFolderFragment = javaProject.getPackageFragmentRoot(sourceFolders.get(0)); - packageFragment = srcFolderFragment.createPackageFragment(packageQN, true, m) - - // Adding plugin dependency to our trace api - ManifestUtil.addToPluginManifest(project, m, "org.eclipse.emf.transaction") - ManifestUtil.addToPluginManifest(project, m, "org.eclipse.emf.compare") - ManifestUtil.addToPluginManifest(project, m, "org.gemoc.executionframework.engine") - ManifestUtil.addToPluginManifest(project, m, "org.eclipse.xtext") - - if (gemoc) { - ManifestUtil.addToPluginManifest(project, m, "org.gemoc.commons.eclipse") - } - - this.traceability = tmmgenerator.traceability - - // Generate trace constructor - val TraceConstructorGeneratorJava tconstructorgen = new TraceConstructorGeneratorJava(languageName, - pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages, gemoc, - opsemanticsview.executionMetamodel, partialTraceManagement) - traceConstructorClassName = tconstructorgen.className - packageFragment.createCompilationUnit(traceConstructorClassName + ".java", tconstructorgen.generateCode, true, m) - - // Generate state manager - val StateManagerGeneratorJava statemanagergem = new StateManagerGeneratorJava(languageName, - pluginName + ".tracemanager", tracemm, tmmgenerator.traceability, referencedGenPackages) - stateManagerClassName = statemanagergem.className - packageFragment.createCompilationUnit(stateManagerClassName + ".java", statemanagergem.generateCode, true, m) - } -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend index 90b6ef60b..e23c4796f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend @@ -34,7 +34,7 @@ import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper /** * Plenty of ways to call the generator in an eclipse context. - * Must be provided a TraceAddonGeneratorIntegrationConfiguration, specific to the type of xdsml (K3, XMOF, etc) + * Relies on a OperationalSemanticsViewGenerator found using an extension point. */ class TraceAddonGeneratorIntegration { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/GenericTraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/GenericTraceConstructorGeneratorJava.xtend deleted file mode 100644 index 570631870..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/GenericTraceConstructorGeneratorJava.xtend +++ /dev/null @@ -1,1000 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.codegen - -import fr.inria.diverse.trace.commons.CodeGenUtil -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage -import fr.inria.diverse.trace.commons.model.trace.TracePackage -import fr.inria.diverse.trace.commons.tracemetamodel.StepStrings -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import fr.inria.diverse.trace.metamodel.generator.TraceMMStrings -import java.util.ArrayList -import java.util.Collection -import java.util.HashMap -import java.util.HashSet -import java.util.List -import java.util.Map -import java.util.Set -import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import org.eclipse.emf.ecore.EAttribute -import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.EClassifier -import org.eclipse.emf.ecore.EOperation -import org.eclipse.emf.ecore.EPackage -import org.eclipse.emf.ecore.EReference -import org.eclipse.emf.ecore.EStructuralFeature -import org.eclipse.emf.ecore.EcorePackage -import opsemanticsview.Rule - -class GenericTraceConstructorGeneratorJava { - - // Inputs - private val String className - private val String packageQN - private val EPackage traceMM - private val EPackage abstractSyntax - private val TraceMMGenerationTraceability traceability - private val Set refGenPackages - private val boolean gemoc - private val boolean partialTraceManagement - - // Transient - private boolean getExeToTracedUsed = false - - - // Shortcuts - private val EClass stateClass - private val EClass stepClass - private val EClass tracedObjectClass - private val EStructuralFeature tracedObjectOriginalObject - private val EClass dimensionClass - private val EClass singleIntegerAttributeValueClass - private val EClass singleBooleanAttributeValueClass - private val EClass singleStringAttributeValueClass - private val EClass singleReferenceValueClass - private val EClass manyIntegerAttributeValueClass - private val EClass manyBooleanAttributeValueClass - private val EClass manyStringAttributeValueClass - private val EClass manyReferenceValueClass - - private val String stateFQN - private val String specificStepFQN - private val String tracedObjectFQN - private val String dimensionFQN - private val String singleIntegerAttributeValueFQN - private val String singleBooleanAttributeValueFQN - private val String singleStringAttributeValueFQN - private val String singleReferenceValueFQN - private val String manyIntegerAttributeValueFQN - private val String manyBooleanAttributeValueFQN - private val String manyStringAttributeValueFQN - private val String manyReferenceValueFQN - - public def String getClassName() { - return className - } - - new(String languageName, String packageQN, EPackage traceMM, TraceMMGenerationTraceability traceability, - Set refGenPackages, boolean gemoc, EPackage abstractSyntax, boolean partialTraceManagement) { - this.traceMM = GenerictracePackage.eINSTANCE - this.className = languageName.replaceAll(" ", "").toFirstUpper + "GenericConstructor" - this.packageQN = packageQN - this.traceability = traceability - this.refGenPackages = refGenPackages - this.gemoc = gemoc - this.abstractSyntax = abstractSyntax - this.stateClass = GenerictracePackage.eINSTANCE.genericState - this.stepClass = GenerictracePackage.eINSTANCE.genericStep - this.tracedObjectClass = GenerictracePackage.eINSTANCE.genericTracedObject - this.tracedObjectOriginalObject = GenerictracePackage.eINSTANCE.genericTracedObject_OriginalObject - this.dimensionClass = GenerictracePackage.eINSTANCE.genericDimension - this.singleIntegerAttributeValueClass = GenerictracePackage.eINSTANCE.integerAttributeValue - this.singleBooleanAttributeValueClass = GenerictracePackage.eINSTANCE.booleanAttributeValue - this.singleStringAttributeValueClass = GenerictracePackage.eINSTANCE.stringAttributeValue - this.singleReferenceValueClass = GenerictracePackage.eINSTANCE.singleReferenceValue - this.manyIntegerAttributeValueClass = GenerictracePackage.eINSTANCE.manyIntegerAttributeValue - this.manyBooleanAttributeValueClass = GenerictracePackage.eINSTANCE.manyBooleanAttributeValue - this.manyStringAttributeValueClass = GenerictracePackage.eINSTANCE.manyStringAttributeValue - this.manyReferenceValueClass = GenerictracePackage.eINSTANCE.manyReferenceValue - this.partialTraceManagement = partialTraceManagement - this.stateFQN = getJavaFQN(stateClass) - this.specificStepFQN = getJavaFQN(stepClass) - this.tracedObjectFQN = getJavaFQN(tracedObjectClass) - this.dimensionFQN = getJavaFQN(dimensionClass) - this.singleIntegerAttributeValueFQN = getJavaFQN(singleIntegerAttributeValueClass) - this.singleBooleanAttributeValueFQN = getJavaFQN(singleBooleanAttributeValueClass) - this.singleStringAttributeValueFQN = getJavaFQN(singleStringAttributeValueClass) - this.singleReferenceValueFQN = getJavaFQN(singleReferenceValueClass) - this.manyIntegerAttributeValueFQN = getJavaFQN(manyIntegerAttributeValueClass) - this.manyBooleanAttributeValueFQN = getJavaFQN(manyBooleanAttributeValueClass) - this.manyStringAttributeValueFQN = getJavaFQN(manyStringAttributeValueClass) - this.manyReferenceValueFQN = getJavaFQN(manyReferenceValueClass) - } - - private def String getActualFQN(EClass c, Rule r) { - val EOperation o = r.operation - return EcoreCraftingUtil.getBaseFQN(c) + "." + o.name - } - - def Set findAllConcreteSubTypes(EClass clazz) { - traceability.allMutableClasses.filter[c|!c.isAbstract && c.EAllSuperTypes.contains(clazz)].toSet - } - - def Set findAllDirectConcreteSubTypes(EClass clazz) { - traceability.allMutableClasses.filter[c|!c.isAbstract && c.ESuperTypes.contains(clazz)].toSet - } - - def Set findAllDirectSubTypes(EClass clazz) { - traceability.allMutableClasses.filter[c|c.ESuperTypes.contains(clazz)].toSet - } - - private def String getFQN(EStructuralFeature eFeature) { - return EcoreCraftingUtil.getBaseFQN(eFeature.EContainingClass) + "." + eFeature.name - } - - private static def boolean isNotSuperTypeOf(EClass c, Collection eclasses) { - for (eclass : eclasses) { - if (eclass.EAllSuperTypes.contains(c)) - return false - } - return true - } - - private def String getTracedJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { - if (c instanceof EClass) { - val tracedClass = traceability.getTracedClass(c) - if (tracedClass != null) - return getJavaFQN(traceability.getTracedClass(c),enforcePrimitiveJavaClass) - else - return getJavaFQN(c,enforcePrimitiveJavaClass) - } else { - return getJavaFQN(c,enforcePrimitiveJavaClass) - } - } - - private def String getJavaFQN(EClassifier c) { - return getJavaFQN(c,false) - } - - private def String getJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { - return EcoreCraftingUtil.getJavaFQN(c,refGenPackages,enforcePrimitiveJavaClass) - } - - - private def String stringSetter(EStructuralFeature f, String value) { - EcoreCraftingUtil.stringSetter(f,value,refGenPackages) - } - - private def String stringSetter(String f, String value) { - EcoreCraftingUtil.stringSetter(f,value) - } - - - private static def Set findTopSuperClasses(Iterable eclasses) { - val res = new HashSet - for (c : eclasses) { - val superTypes = c.ESuperTypes - if (superTypes.empty) { - res.add(c) - } else { - val candidates = findTopSuperClasses(superTypes) - res.addAll(candidates) - } - } - return res - } - - private static def List partialOrderSort (Iterable eclasses) { - val List result = new ArrayList - for (ci : eclasses) { - if (result.isEmpty) - result.add(ci) - else { - var boolean found = false - for (var int i = 0; i < result.size && !found; i++) { - val Set followings = result.subList(i, result.size).toSet - if (ci.isNotSuperTypeOf(followings)) { - result.add(i, ci) - found = true - } - } - - if (!found) - result.add(ci) - } - } - return result - - } - - public def String generateCode() { - val String code = generateTraceConstructorClass() - try { - return CodeGenUtil.formatJavaCode(code) - } catch (Throwable t) { - return code - } - } - - private Map counters = new HashMap - - private def String uniqueVar(String s) { - if (!counters.containsKey(s)) { - counters.put(s, 0) - } - return s + counters.get(s) - } - - private def void incVar(String s) { - if (!counters.containsKey(s)) { - counters.put(s, 0) - } - counters.put(s, counters.get(s) + 1) - } - - public static def String getBaseFQN(Rule r) { - val EOperation o = r.operation - val EClass c = r.containingClass - return EcoreCraftingUtil.getBaseFQN(c) + "." + o.name - } - - private def EClassifier getEventParamRuntimeType(EStructuralFeature f) { - var EClass res = null - if (f instanceof EAttribute) { - // TODO - } else if (f instanceof EReference) { - val potentialRealRuntimeClass = traceability.getRealMutableClass(f.EReferenceType) - if (potentialRealRuntimeClass != null) { - // TODO here in the general case we need to find the exe class - res = potentialRealRuntimeClass - } else { - // TODO same here - res = f.EReferenceType - } - } - return res - } - - private def String stringGetterTracedValue(String javaVarName, EStructuralFeature p) { - val pRealType = p.EType - if (p instanceof EReference && traceability.hasTracedClass(pRealType as EClass)) { - return ''' - ((«getJavaFQN(traceability.getTracedClass(pRealType as EClass))»)exeToTraced.get(«javaVarName».«EcoreCraftingUtil.stringGetter(p)»)) - ''' - } else { - return javaVarName + "." + EcoreCraftingUtil.stringGetter(p) - } - } - - private def Set getAllMutablePropertiesOf(EClass exeClass) { - val Set res = new HashSet - res.addAll(traceability.getMutablePropertiesOf(exeClass)) - res.addAll(exeClass.EAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); - return res - } - - - - private def String generateImports() { - return - ''' - «IF getExeToTracedUsed» - import java.util.ArrayList; - «ENDIF» - import java.util.Collection; - import java.util.Deque; - import java.util.HashSet; - import java.util.LinkedList; - import java.util.List; - import java.util.Map; - import java.util.Set; - - import org.eclipse.emf.common.util.TreeIterator; - import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.emf.ecore.resource.Resource; - - import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; - import fr.inria.diverse.trace.commons.model.trace.MSEModel; - import fr.inria.diverse.trace.commons.model.trace.SequentialStep; - import fr.inria.diverse.trace.commons.model.trace.TracedObject; - import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; - ''' - } - - private def String generateFields() { - return - ''' - private «getJavaFQN(traceability.traceMMExplorer.getSpecificTraceClass)» traceRoot; - private MSEModel mseModel; - private Resource executedModel; - private final Map> exeToTraced; - - private «stateFQN» lastState; - - private Resource traceResource; - private final Deque<«specificStepFQN»> context = new LinkedList<«specificStepFQN»>(); - ''' - } - - private def String generateConstructor() { - return - ''' - public «className» (Resource exeModel, Resource traceResource, Map> exeToTraced) { - this.traceResource = traceResource; - this.executedModel = exeModel; - this.exeToTraced = exeToTraced; - } - ''' - } - - - private def String getExeToTracedMethodName() { - getExeToTracedUsed = true - return "getExeToTraced" - } - - private def String stringFeatureID(EStructuralFeature p) { - val containingClass = - if (p.eContainer instanceof EClass) - p.eContainer as EClassifier - return EcoreCraftingUtil.stringFeatureID(p,containingClass,refGenPackages) - } - - private def String generateGetAllResourcesMethod() { - return - ''' - private Set getAllExecutedModelResources() { - Set allResources = new HashSet<>(); - allResources.add(executedModel); - «IF gemoc» - allResources.addAll(org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); - allResources.removeIf(r -> r== null); - «ENDIF» - return allResources; - } - ''' - } - - private def String generateAddInitialStateMethod() { - return ''' - - private void addInitialState() { - if (lastState == null) { - // Creation of the initial state - Set allResources = getAllExecutedModelResources(); - lastState = «EcoreCraftingUtil.stringCreate(stateClass)»; - for (Resource r : allResources) { - for (TreeIterator i = r.getAllContents(); i.hasNext();) { - EObject o = i.next(); - «FOR c : partialOrderSort(findTopSuperClasses(traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name].toSet)) SEPARATOR "else"» - - if (o instanceof «getJavaFQN(c)») { - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - addNewObjectToState(o_cast, lastState); - } - «ENDFOR» - } - } - this.traceRoot.getStates().add(lastState); - }} - ''' - } - - private def boolean shouldHaveAddNewObjectToStateMethod(EClass c){ - val subTypes = findAllDirectSubTypes(c) - - if (!c.abstract) - return true - if (subTypes.empty && c.abstract) - return false - else if (!subTypes.empty && c.abstract) { - val validSubTypes = subTypes.filter[s|shouldHaveAddNewObjectToStateMethod(s)] - if (!validSubTypes.empty) - return true - } - - return true - } - - private def String generateAddNewObjectToStateMethods() { - return -''' -«FOR c : traceability.allMutableClasses.sortBy[name]» -«««»«FOR c : partialOrderSort(getAllNonEmptyMutableClasses.filter[c|!c.isAbstract].sortBy[name].toList)» -«val subTypes = partialOrderSort(findAllDirectSubTypes(c))» -«IF shouldHaveAddNewObjectToStateMethod(c)» -«IF getAllMutablePropertiesOf(c).exists[p|p instanceof EReference && p.many]» -@SuppressWarnings("unchecked") -«ENDIF» -private boolean addNewObjectToState(«getJavaFQN(c)» o_cast, «stateFQN» newState) { -boolean added = false; -«val subTypesWithMethods = subTypes.filter[sub|shouldHaveAddNewObjectToStateMethod(sub)]» -«FOR subType : subTypesWithMethods SEPARATOR " else " » - if (o_cast instanceof «getJavaFQN(subType)») { - added = addNewObjectToState((«getJavaFQN(subType)»)o_cast, newState); - } -«ENDFOR» - -«IF ! c.abstract» - -if (!added && !exeToTraced.containsKey(o_cast)) { - «tracedObjectFQN» tracedObject = «EcoreCraftingUtil.stringCreate(tracedObjectClass)»; - tracedObject.«stringSetter(tracedObjectOriginalObject, "o_cast")»; - exeToTraced.put(o_cast, tracedObject); - traceRoot.getTracedObjects().add(tracedObject); - - «FOR p : getAllMutablePropertiesOf(c).sortBy[FQN]» - - // Creation of the dimension corresponding to the field «p.name» - «dimensionFQN» dimension = «EcoreCraftingUtil.stringCreate(dimensionClass)»; - tracedObject.getDimensions().add(dimension); - - «IF p.many» - - «IF p instanceof EReference» - - // Creation of the first value of the field «p.name» - «manyReferenceValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyReferenceValueClass)»; - - «IF traceability.allMutableClasses.contains(p.EType)» - for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - addNewObjectToState((«getJavaFQN(p.EType)»)aValue, newState); - } - «ENDIF» - - firstValue_«p.name».getReferenceValues().addAll((Collection) - «IF traceability.allMutableClasses.contains(p.EType)» - «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState) - «ELSE» - o_cast.«EcoreCraftingUtil.stringGetter(p)» - «ENDIF» - ); - «ELSE» ««« If attribute - // Creation of the first value of the field «p.name» - «IF p.EType == EcorePackage.Literals.EINT» - «manyIntegerAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyIntegerAttributeValueClass)»; - «ELSEIF p.EType == EcorePackage.Literals.EBOOLEAN» - «manyBooleanAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyBooleanAttributeValueClass)»; - «ELSEIF p.EType == EcorePackage.Literals.ESTRING» - «manyStringAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(manyStringAttributeValueClass)»; - «ENDIF» - firstValue_«p.name».getAttributeValues().addAll - ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); - - «ENDIF» ««« End IF EReference/EAttribute - - «ELSE» ««« If !many - - «IF p instanceof EReference» - - // Creation of the first value of the field «p.name» - «singleReferenceValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleReferenceValueClass)»; - - «val realMutableType = p.EType» - if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { - «IF traceability.allMutableClasses.contains(realMutableType)» - addNewObjectToState((«getJavaFQN(realMutableType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); - firstValue_«p.name».setReferenceValue(«stringGetterTracedValue("o_cast", p)»; - «ELSE» - firstValue_«p.name».setReferenceValue(o_cast.«EcoreCraftingUtil.stringGetter(p)»)»; - «ENDIF» ««« End IF traceability.isSomehowMutable(p.EType) - } else { - firstValue_«p.name».setReferenceValue(null); - } - - «ELSE» ««« If attribute - «IF p.EType == EcorePackage.Literals.EINT» - «singleIntegerAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleIntegerAttributeValueClass)»; - «ELSEIF p.EType == EcorePackage.Literals.EBOOLEAN» - «singleBooleanAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleBooleanAttributeValueClass)»; - «ELSEIF p.EType == EcorePackage.Literals.ESTRING» - «singleStringAttributeValueFQN» firstValue_«p.name» = «EcoreCraftingUtil.stringCreate(singleStringAttributeValueClass)»; - «ENDIF» - firstValue_«p.name».setValue(o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» ««« End IF EReference - «ENDIF» ««« End IF p.many - - dimension.getValues().add(firstValue_«p.name»); - newState.getValues().add(firstValue_«p.name»); - -«ENDFOR» ««« End FOR p : getAllMutableProperties -} // end if (!exeToTraced.containsKey -«ENDIF» ««« End IF ! c.abstract» -return added; -}// end addNewObjectToState -«ENDIF» -«ENDFOR» ««« end FOR c : traceability.allMutableClasses.sortBy[name] -''' - } - -private def String generateAddStateUsingListenerMethods() { - val newClassesNotEmpty = traceability.getNewClasses.filter[c|!c.EStructuralFeatures.empty].toSet - val newAbstractClassesNotEmpty = partialOrderSort(newClassesNotEmpty.filter[c|!c.isAbstract].toSet) - val newConcreteClassesNotEmpty = traceability.getNewClasses.filter[c| - val superTypes = new ArrayList(c.EAllSuperTypes) - superTypes.retainAll(newAbstractClassesNotEmpty) - return !c.isAbstract && (!c.EStructuralFeatures.empty || !superTypes.empty) - ].toList - val mutableClassesWithNonCollectionMutableFields = traceability.allMutableClasses.filter[c|!traceability.getMutablePropertiesOf(c).empty && traceability.getMutablePropertiesOf(c).exists[p|!p.many]] - val mutableClassesWithCollectionMutableFields = traceability.allMutableClasses.filter[c|!traceability.getMutablePropertiesOf(c).empty && traceability.getMutablePropertiesOf(c).exists[p|p.many]] - return - ''' - private boolean copiedState = false; - - private «stateFQN» copyState(«stateFQN» oldState) { - «stateFQN» newState = «EcoreCraftingUtil.stringCreate(stateClass)»; - newState.getValues().addAll(oldState.getValues()); - copiedState = true; - return newState; - } - - @SuppressWarnings("unchecked") - @Override - public void addState(List changes) { - if (lastState == null) { - addInitialState(); - }««« end if laststate null - if (!changes.isEmpty()) { - boolean stateChanged = false; - // We start by a (shallow) copy of the last state - // But we will have to rollback a little by replacing values that changed - «stateFQN» newState = copyState(lastState); - for (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) { - EObject o = modelChange.getChangedObject(); - «IF !newConcreteClassesNotEmpty.empty» - // We only look at constructable objects that have mutable fields - // Here we have nothing to rollback, just a new object to add - if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange) { - stateChanged = true; - ««« Loop over all classes that may be constructed and that have mutable fields - «FOR c : partialOrderSort(findTopSuperClasses(newConcreteClassesNotEmpty))» - if (o instanceof «getJavaFQN(c)») { - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - addNewObjectToState(o_cast, newState); - } ««« end if instanceof - «ENDFOR» - }««« end if NewObjectModelChange - - // We only look at constructable objects that have mutable fields - // Here we must rollback to remove the values of the removed object from the copied state - else if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.RemovedObjectModelChange) { - stateChanged = true; - ««« Loop over all classes that may type something constructed and that have mutable fields - «FOR c : partialOrderSort(newClassesNotEmpty)» - «val traced = traceability.getTracedClass(c)» - if (o instanceof «getJavaFQN(c)») { - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o_cast); - ««« Loop over the fields of this class, which are all mutable - «FOR p : c.EStructuralFeatures» - «val EReference pdimension = traceability.getDimensionRef(p)» -««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); - newState.getValues().remove(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1)); - «ENDFOR» - }««« end if instanceof - «ENDFOR» - }««« end if RemovedObjectModelChange - «ENDIF» - «IF !mutableClassesWithNonCollectionMutableFields.empty» - // Here we must look at non-collection mutable fields - // We must rollback the last values from the copied state, and add new values as well - // ie. mix of remove and new - «IF !newConcreteClassesNotEmpty.empty» else «ENDIF» if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) { - stateChanged = true; - - org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange; - «EStructuralFeature.canonicalName » p = modelChange_cast.getChangedField(); - «FOR c : partialOrderSort(mutableClassesWithNonCollectionMutableFields)» - «val nonCollectionMutableFields = traceability.getMutablePropertiesOf(c).filter[p|!p.many]» - - «val traced = traceability.getTracedClass(c)» - if (o instanceof «getJavaFQN(c)») { - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - - «FOR p : nonCollectionMutableFields SEPARATOR " else "» - - «val EClass valueClass = traceability.getValueClass(p)» - «val EReference pdimension = traceability.getDimensionRef(p)» - - if (p.getFeatureID() == «stringFeatureID(p)») { - - // Rollback: we remove the last value of this field from the new state - «getJavaFQN(traced)» traced = («getJavaFQN(traced)») exeToTraced.get(o); - «getJavaFQN(valueClass)» lastValue = traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1); -««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); - newState.getValues().remove(lastValue); - - // And we create a proper new value - ««« «IF traceability.allMutableClasses.contains(p.EType)» - ««« addNewObjectToState((«getJavaFQN(p.EType)»)o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); - ««« «ENDIF» - «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; - «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» - - «IF p instanceof EReference» - «getJavaFQN(valueProperty.EType)» value = null; - if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { - addNewObjectToState(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); - value = «stringGetterTracedValue("o_cast", p)»; - } - «ELSE» - «getJavaFQN(valueProperty.EType)» value = o_cast.«EcoreCraftingUtil.stringGetter(p)»; - «ENDIF» - - newValue.«stringSetter(valueProperty,"value")»; - - traced.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().add(newValue); -««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); - newState.getValues().add(newValue); - } - ««« end if feature id - «ENDFOR» - } - ««« end if instance of - «ENDFOR» - } - ««« end if NonCollectionFieldModelChange - «ENDIF» - «IF !mutableClassesWithCollectionMutableFields.empty» - // Here we look at collection mutable fields - // We must first manually find out if the collection changed... - // If it changed we must rollback the last values from the copied state, and add new values as well - «IF !newConcreteClassesNotEmpty.empty || !mutableClassesWithNonCollectionMutableFields.empty » else «ENDIF» if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange) { - org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange) modelChange; - «EStructuralFeature.canonicalName » p = modelChange_cast.getChangedField(); - «FOR c : partialOrderSort(mutableClassesWithCollectionMutableFields) » - «val collectionMutableFields = traceability.getMutablePropertiesOf(c).filter[p|p.many]» - «val traced = traceability.getTracedClass(c)» - if (o instanceof «getJavaFQN(c)») { - «getJavaFQN(c)» o_cast = («getJavaFQN(c)») o; - «getJavaFQN(traced)» tracedObject = («getJavaFQN(traced)») exeToTraced.get(o_cast); - «FOR p : collectionMutableFields SEPARATOR " else "» - «val EClass valueClass = traceability.getValueClass(p)» - «val EReference pdimension = traceability.getDimensionRef(p)» - if (p.getFeatureID() == «stringFeatureID(p)») { - // We compare the last collection in the value sequence, and the current one in the potentially changed object - List<«getJavaFQN(valueClass)»> valueSequence = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues(); - «getJavaFQN(valueClass)» previousValue = null; - if (!valueSequence.isEmpty()) { - previousValue = valueSequence.get(valueSequence.size() - 1); - } - ««« If instances of new class, we have to make sure that there are traced versions - «IF traceability.allMutableClasses.contains(p.EType)» - for(«getJavaFQN(p.EType)» aValue : o_cast.«EcoreCraftingUtil.stringGetter(p)») { - addNewObjectToState((«getJavaFQN(p.EType)»)aValue, newState); - }««« end for loop on values - «ENDIF» - boolean change = false; - if (previousValue != null) { - if (previousValue.«EcoreCraftingUtil.stringGetter(p)».size() == o_cast - .«EcoreCraftingUtil.stringGetter(p)».size()) { - ««« We this is an ordered collection, we have to compare in the correct order - «IF p.ordered» - java.util.Iterator<«getJavaFQN(p.EType,true)»> it = o_cast.«EcoreCraftingUtil.stringGetter(p)».iterator(); - for («getTracedJavaFQN(traceability.getValuePropertyOfMutableProperty(p).EType,true)» aPreviousValue : previousValue - .«EcoreCraftingUtil.stringGetter(p)») { - «getJavaFQN(p.EType)» aCurrentValue = it.next(); - «IF p instanceof EReference» - if (aPreviousValue != exeToTraced.get(aCurrentValue)) - «ELSE» - if (!aPreviousValue.equals(aCurrentValue)) - «ENDIF» - { - change = true; - break; - } - } - ««« Else we simply check that the content is the same - «ELSE» - change = !previousValue.«EcoreCraftingUtil.stringGetter(p)».containsAll(«getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)»), newState); - «ENDIF» - ««« end case ordered - }««« end if same size - else { - change = true; - }««« end else - } else { - change = true; - }««« end else - if (change) { - stateChanged = true; - // Rollback: we remove the last value of this field from the new state - «getJavaFQN(valueClass)» lastValue = tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().get(tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().size()-1); -««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».remove(lastValue); - newState.getValues().remove(lastValue); - // And we create a proper new value - «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; - «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» - «IF p.many» - «IF p instanceof EReference» - newValue.«EcoreCraftingUtil.stringGetter(valueProperty)».addAll - ((Collection) «getExeToTracedMethodName»(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState)); - «ELSE» - newValue.«EcoreCraftingUtil.stringGetter(valueProperty)».addAll - ((Collection) o_cast.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - «ELSE» - newValue.«stringSetter(valueProperty,stringGetterTracedValue("o_cast", p))»; - «ENDIF» - tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues().add(newValue); -««« newState.«EcoreCraftingUtil.stringGetter(pvalues)».add(newValue); - newState.getValues().add(newValue); - }««« end if change - }««« end if featureid - «ENDFOR» - } ««« end if instanceof - «ENDFOR» - }««« end if PotentialCollectionFieldModelChange - «ENDIF» - }««« end for all changes - if (stateChanged) { - final «specificStepFQN» currentStep = context.peekFirst(); - if (currentStep != null && currentStep instanceof «getJavaFQN(TracePackage.eINSTANCE.bigStep)») { - final «stateFQN» startingState = lastState; - final «stateFQN» endingState = newState; - addImplicitStep(currentStep, startingState, endingState); - } - lastState = newState; - traceRoot.getStates().add(lastState); -««« traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_TraceToStates)».add(lastState); - }««« end if (stateChanged) - else if (copiedState) { - «FOR p : traceability.allMutableProperties.sortBy[FQN]» -««« newState.«EcoreCraftingUtil.stringGetter(traceability.getStateClassToValueClass(p))».clear(); - newState.getValues().clear(); - «ENDFOR» - } - copiedState = false; - }««« end if (!changes.isEmpty()) - }««« end method - ''' - } - - - - private def String generateAddStepMethods() { - return - ''' - «val stepRules = traceability.mmext.rules» - «IF gemoc» - @SuppressWarnings("unchecked") - @Override - public void addStep(fr.inria.diverse.trace.commons.model.trace.Step step) { - «specificStepFQN» step_cast = null; - if (step != null && step instanceof «specificStepFQN») { - step_cast = («specificStepFQN») step; - if (mseModel == null) { - mseModel = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEModel(); - traceResource.getContents().add(mseModel); - } - mseModel.getOwnedMSEs().add(step_cast.getMseoccurrence().getMse()); - - // Creating generic (or almost generic) links - «stateFQN» state = traceRoot.getStates().get(traceRoot.getStates().size()-1); - step_cast.setStartingState(state); - if (!context.isEmpty() && context.getFirst() != null) { - ((SequentialStep<«specificStepFQN», «stateFQN»>) context.getFirst()).getSubSteps().add(step_cast); - } else { - ((SequentialStep<«specificStepFQN», «stateFQN»>) traceRoot.getRootStep()).getSubSteps().add(step_cast); - } - - // Adding step in its dedicated sequence/dimension - «IF !stepRules.empty» - «FOR stepRule : stepRules.sortBy[baseFQN] SEPARATOR "else"» - «val EClass stepClass = traceability.getStepClassFromStepRule(stepRule)» - «val String varName = stepClass.name.toFirstLower.replace(" ", "") + "Instance"» - if (step_cast instanceof «getJavaFQN(stepClass)») { - «getJavaFQN(stepClass)» «varName» = («getJavaFQN(stepClass)») step_cast; - traceRoot.«EcoreCraftingUtil.stringGetter(traceability.getStepSequence(stepClass))».add(«varName»); - } - «ENDFOR» - «ENDIF» - } - context.push(step_cast); - } - «ELSE» - @Override - public void addStep(String stepRule, Map params) { - addStep(stepRule, params, this.getTraceSize()-1); - } - - private void addStep(String stepRule, Map params, int stateIndex) { - «specificStepFQN» toPush = null; - if (stateIndex >= 0) { - «stateFQN» state = this.traceRoot.getStates().get(stateIndex); - «IF !stepRules.empty» - «FOR stepRule : stepRules.sortBy[baseFQN] SEPARATOR "else"» - «val stepCallerClass = stepRule.containingClass» - «val possibleCallerClasses = abstractSyntax.EClassifiers - .filter[c|c instanceof EClass] - .map[c|c as EClass] - .filter[c|c.equals(stepCallerClass)||c.EAllSuperTypes.contains(stepCallerClass)] - .toSet» - «val EClass stepClass = traceability.getStepClassFromStepRule(stepRule)» - «val String varName = stepClass.name.toFirstLower.replace(" ", "") + "Instance"» - «IF possibleCallerClasses.empty» - if (stepRule.equalsIgnoreCase("«getBaseFQN(stepRule)»")) { - «ELSE» - if ( - «FOR possibleCallerClass: possibleCallerClasses.sortBy[name] SEPARATOR " || "» - stepRule.equalsIgnoreCase("«getActualFQN(possibleCallerClass, stepRule)»") - «ENDFOR» - ) { - «ENDIF» - // First we create the step - «getJavaFQN(stepClass)» «varName» = «EcoreCraftingUtil.stringCreate(stepClass)»; - «varName».«stringSetter(TraceMMStrings.ref_StepToState_starting, "state")»; - - if (!context.isEmpty() && context.getFirst() != null){ - ((fr.inria.diverse.trace.commons.model.trace.SequentialStep) context.getFirst()).getSubSteps().add(«varName»); - } else { - traceRoot.getRootSteps().add(«varName»); - } - toPush = «varName»; - ««« TODO rely on information in Rule instead of the structural features? - «val properties = stepClass.EAllStructuralFeatures.filter[f| - !TracePackage.eINSTANCE.smallStep.EStructuralFeatures.contains(f) && - !TracePackage.eINSTANCE.bigStep.EStructuralFeatures.contains(f) && - !traceability.traceMMExplorer.getSpecificStepClass.EStructuralFeatures.contains(f) && - !f.name.equals(StepStrings.ref_BigStepToSub) - && !f.EContainingClass.name.equals("MSEOccurrence")]» - «IF !properties.empty» - if (params != null) { - for (String k : params.keySet()) { - switch(k) { - «FOR p : properties.sortBy[name]» - case "«p.name»": - Object «uniqueVar("v")» = params.get(k); - «val type = getEventParamRuntimeType(p)» - if («uniqueVar("v")» instanceof «getJavaFQN(type)») { - «IF type == p.EType» - «varName».«stringSetter(p, "(" + getJavaFQN(p.EType) + ")"+uniqueVar("v"))»; - «ELSE» - «varName».«stringSetter(p, "(" + getJavaFQN(p.EType) + ")exeToTraced.get("+uniqueVar("v"+")"))»; - «ENDIF» - } - break; - «incVar("v")» - «ENDFOR» - } - } - } - «ENDIF» - // Then we add it to its trace - this.traceRoot.«EcoreCraftingUtil.stringGetter(traceability.getStepSequence(stepClass))».add(«varName»); - } - «ENDFOR» - «ENDIF» - } - context.push(toPush); - } - «ENDIF» - - @SuppressWarnings("unchecked") - private void addImplicitStep(«specificStepFQN» currentStep, - «stateFQN» startingState, - «stateFQN» endingState) { - - «IF !stepRules.empty && !traceability.bigStepClasses.empty» - «specificStepFQN» implicitStep = null; - «FOR bigStepClass : traceability.bigStepClasses.sortBy[name] SEPARATOR "else"» - if (currentStep instanceof «getJavaFQN(bigStepClass)») { - implicitStep = «EcoreCraftingUtil.stringCreateImplicitStep(bigStepClass)»; - } - «ENDFOR» - if (implicitStep != null) { - implicitStep.setStartingState(startingState); - implicitStep.setEndingState(endingState); - ((SequentialStep<«specificStepFQN», «stateFQN»>) currentStep).getSubSteps().add(implicitStep); - - } - «ENDIF» - } - - @Override - public void endStep(fr.inria.diverse.trace.commons.model.trace.Step step) { - «specificStepFQN» popped = context.pop(); - if (popped != null) - popped.setEndingState(lastState); - } - ''' - } - - private def String generateInitAndSaveTraceMethods() { - return - ''' - @Override - public EObject initTrace(LaunchConfiguration launchConfiguration) { - // Create root - traceRoot = «EcoreCraftingUtil.stringCreate(traceability.traceMMExplorer.getSpecificTraceClass)»; - traceRoot.setLaunchconfiguration(launchConfiguration); - - // Create root sequential step - fr.inria.diverse.trace.commons.model.trace.SequentialStep<«specificStepFQN», «stateFQN»> rootStep = «EcoreCraftingUtil.stringCreate(traceability.traceMMExplorer.getSpecificRootStepClass)»; - traceRoot.setRootStep(rootStep); - - // Put in the resource - traceResource.getContents().add(traceRoot); - - return traceRoot; - } - - @Override - public void save() { - try { - traceResource.save(null); - } catch (java.io.IOException e) { - e.printStackTrace(); - } - } - - @Override - public void save(URI uri) { - try { - traceResource.setURI(uri); - traceResource.save(null); - } catch (java.io.IOException e) { - e.printStackTrace(); - } - } - ''' - } - - private def String generateExeToFromTracedGenericMethods() { - return - ''' - «IF getExeToTracedUsed» - private Collection «getExeToTracedMethodName»(Collection exeObjects, «getJavaFQN(stateClass)» newState) { - Collection result = new ArrayList(); - for(EObject exeObject : exeObjects) { - result.add(exeToTraced.get(exeObject)); - } - return result; - } - «ENDIF» - ''' - } - - private def String generateTraceConstructorClass() { - - val body = - ''' - public class «className» implements ITraceConstructor { - «generateFields» - «generateConstructor» - «generateAddInitialStateMethod» - «generateAddNewObjectToStateMethods» - «generateAddStateUsingListenerMethods» - «generateAddStepMethods» - «generateInitAndSaveTraceMethods» - «generateGetAllResourcesMethod» - «generateExeToFromTracedGenericMethods» - - @Override - public boolean isPartialTraceConstructor() { - return false; - } - } - ''' - - return - ''' - package «packageQN»; - - «generateImports» - - «body» - ''' - } - -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend index 8c00e97a5..b86bc1a3b 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -55,7 +55,7 @@ class TraceConstructorGeneratorJava { } new(String languageName, String packageQN, EPackage traceMM, TraceMMGenerationTraceability traceability, - Set refGenPackages, boolean gemoc, EPackage abstractSyntax, boolean partialTraceManagement) { + Set refGenPackages, EPackage abstractSyntax, boolean partialTraceManagement) { this.traceMM = traceMM this.className = languageName.replaceAll(" ", "").toFirstUpper + "Constructor" this.packageQN = packageQN diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExplorerGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExplorerGeneratorJava.xtend deleted file mode 100644 index dfbc64b0f..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExplorerGeneratorJava.xtend +++ /dev/null @@ -1,990 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.codegen - -import fr.inria.diverse.trace.commons.CodeGenUtil -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import fr.inria.diverse.trace.metamodel.generator.TraceMMStrings -import java.util.Collection -import java.util.HashSet -import java.util.Set -import opsemanticsview.Rule -import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.EClassifier -import org.eclipse.emf.ecore.EOperation -import org.eclipse.emf.ecore.EPackage -import org.eclipse.emf.ecore.EReference -import org.eclipse.emf.ecore.EStructuralFeature - -class TraceExplorerGeneratorJava { - - // Inputs - private val String className - private val String packageQN - private val EPackage traceMM - private val EPackage abstractSyntax - private val TraceMMGenerationTraceability traceability - private val Set refGenPackages - - private boolean getTracedToExeUsed = false - - // Shortcuts - private val EClass stateClass - private val EClass valueClass - private val EClass specificStepClass - - private val String stateFQN - private val String valueFQN - private val String specificStepFQN - private val String statesPackageFQN - - public def String getClassName() { - return className - } - - new(String languageName, String packageQN, EPackage traceMM, TraceMMGenerationTraceability traceability, - Set refGenPackages, boolean gemoc, EPackage abstractSyntax, boolean partialTraceManagement) { - this.traceMM = traceMM - this.className = languageName.replaceAll(" ", "").toFirstUpper + "Explorer" - this.packageQN = packageQN - this.traceability = traceability - this.refGenPackages = refGenPackages - this.abstractSyntax = abstractSyntax - stateClass = traceability.traceMMExplorer.getSpecificStateClass - valueClass = traceability.traceMMExplorer.getSpecificValueClass - statesPackageFQN = EcoreCraftingUtil.getBaseFQN(traceability.traceMMExplorer.statesPackage) + "." + traceability.traceMMExplorer.statesPackage.name.toFirstUpper + "Package" - specificStepClass = traceability.traceMMExplorer.specificStepClass - stateFQN = getJavaFQN(stateClass) - valueFQN = getJavaFQN(valueClass) - specificStepFQN = getJavaFQN(specificStepClass) - } - - private def String getFQN(EStructuralFeature eFeature) { - return EcoreCraftingUtil.getBaseFQN(eFeature.EContainingClass) + "." + eFeature.name - } - - private def String getJavaFQN(EClassifier c) { - return getJavaFQN(c,false) - } - - private def String getJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { - return EcoreCraftingUtil.getJavaFQN(c,refGenPackages,enforcePrimitiveJavaClass) - } - - public def String generateCode() { - val String code = generateTraceExplorerClass() - try { - return CodeGenUtil.formatJavaCode(code) - } catch (Throwable t) { - return code - } - } - - public static def String getBaseFQN(Rule r) { - val EOperation o = r.operation - val EClass c = r.containingClass - return EcoreCraftingUtil.getBaseFQN(c) + "." + o.name - } - - private def String stringGetterExeValue(String javaVarName, EStructuralFeature p) { - return ''' - «IF (p instanceof EReference && traceability.hasTracedClass(p.EType as EClass))» - - ««« If many elements are in this fields, we have to cast the element with a collection - «IF p.many» - (Collection) - «ELSE» - («getJavaFQN(p.EType, true)») - «ENDIF» - «getTracedToExeMethodName»(«javaVarName».«EcoreCraftingUtil.stringGetter(p)») - «ELSE» - «javaVarName».«EcoreCraftingUtil.stringGetter(p)» - «ENDIF»''' - } - - private def Set getConcreteSubtypesTraceClassOf(EClass tracedClass) { - val Set result = new HashSet() - result.addAll(traceMM.eAllContents.filter(EClass).filter [ c | - !c.abstract && c.EAllSuperTypes.contains(tracedClass) - ].toSet) - if (!tracedClass.abstract) - result.add(tracedClass) - return result - } - - private def Set getAllMutablePropertiesOf(EClass exeClass) { - val Set res = new HashSet - res.addAll(traceability.getMutablePropertiesOf(exeClass)) - res.addAll(exeClass.EAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); - return res - } - - private def String getTracedToExeMethodName() { - getTracedToExeUsed = true - return "getTracedToExe" - } - - private def String generateImports() { - return - ''' - import java.util.ArrayList; - «IF getTracedToExeUsed» - import java.util.Collection; - «ENDIF» - import java.util.Collections; - import java.util.HashMap; - import java.util.HashSet; - import java.util.List; - import java.util.Map; - import java.util.Set; - import java.util.function.Predicate; - import java.util.stream.Collectors; - - import org.eclipse.emf.ecore.EObject; - import org.eclipse.emf.ecore.resource.Resource; - import org.eclipse.emf.transaction.RecordingCommand; - import org.eclipse.emf.transaction.TransactionalEditingDomain; - import org.eclipse.emf.transaction.util.TransactionUtil; - import org.gemoc.executionframework.engine.core.CommandExecution; - - import fr.inria.diverse.trace.commons.model.trace.Dimension; - import fr.inria.diverse.trace.commons.model.trace.SequentialStep; - import fr.inria.diverse.trace.commons.model.trace.State; - import fr.inria.diverse.trace.commons.model.trace.Step; - import fr.inria.diverse.trace.commons.model.trace.Value; - import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; - import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; - ''' - } - - private def String generateFields() { - return - ''' - private «getJavaFQN(traceability.traceMMExplorer.specificTraceClass)» traceRoot; - private Resource modelResource; - private final Map tracedToExe; - - private int lastJumpIndex = -1; - private «stateFQN» currentState = null; - private final List callStack = new ArrayList<>(); - - private final List> valueTraces = new ArrayList<>(); - - private List<«stateFQN»> statesTrace; - - private «specificStepFQN» stepIntoResult; - private «specificStepFQN» stepOverResult; - private «specificStepFQN» stepReturnResult; - - private «specificStepFQN» stepBackIntoResult; - private «specificStepFQN» stepBackOverResult; - private «specificStepFQN» stepBackOutResult; - - private final Map<«specificStepFQN», Integer> stepToStartingIndex = new HashMap<>(); - private final Map<«specificStepFQN», Integer> stepToEndingIndex = new HashMap<>(); - - private final HashMap, «valueFQN»> backValueCache = new HashMap<>(); - - private final Map> listeners = new HashMap<>(); - ''' - } - - private def String generateConstructors() { - return - ''' - public «className»(Map tracedToExe) { - this.tracedToExe = tracedToExe; - } - - public «className»() { - this.tracedToExe = null; - } - ''' - } - - private def String generateValueUtilities() { - return - ''' - private List> getAllValueTraces() { - final List> result = new ArrayList<>(); - «FOR mutClass : traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name]» - «val traced = traceability.getTracedClass(mutClass)» - «val mutProps = getAllMutablePropertiesOf(mutClass).sortBy[FQN]» - «IF !mutProps.empty» - for («getJavaFQN(traced)» tracedObject : traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))») { - «FOR p : mutProps» - «val EReference pdimension = traceability.getDimensionRef(p)» - result.add(tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues()); - «ENDFOR» - } - «ENDIF» - «ENDFOR» - return result; - } - - private «valueFQN» getActiveValue(final List valueTrace, final «stateFQN» state) { - «valueFQN» result = null; - for («valueFQN» value : valueTrace) { - if (value.getStatesView().contains(state)) { - result = value; - break; - } - } - return result; - } - - private «valueFQN» getPreviousValue(final List valueTrace) { - int i = getCurrentStateIndex() - 1; - final «valueFQN» value = getActiveValue(valueTrace, statesTrace.get(i+1)); - «valueFQN» previousValue = null; - while (i > -1 && (previousValue == null || previousValue == value)) { - previousValue = getActiveValue(valueTrace, statesTrace.get(i)); - i--; - } - return previousValue; - } - - private «valueFQN» getNextValue(final List valueTrace) { - int i = getCurrentStateIndex() + 1; - final «valueFQN» value = getActiveValue(valueTrace, statesTrace.get(i-1)); - «valueFQN» nextValue = null; - final int traceLength = valueTrace.stream().map(v -> v.getStatesView().size()).reduce(0, (a,b) -> a+b); - while (i < traceLength && (nextValue == null || nextValue == value)) { - nextValue = getActiveValue(valueTrace, statesTrace.get(i)); - i++; - } - return nextValue; - } - ''' - } - - private def generateStepUtilities() { - return - ''' - private int getStartingIndex(«specificStepFQN» step) { - return stepToStartingIndex.computeIfAbsent(step, s -> { - return statesTrace.indexOf(s.getStartingState()); - }); - } - - private int getEndingIndex(«specificStepFQN» step) { - if (step.getEndingState() != null) { - return stepToEndingIndex.computeIfAbsent(step, s -> { - return statesTrace.indexOf(s.getEndingState()); - }); - } - return -1; - } - - @SuppressWarnings("unchecked") - private «specificStepFQN» findNextStep(final List<«specificStepFQN»> stepPath, - final «specificStepFQN» previousStep, final int start) { - final List<«specificStepFQN»> rootSteps = traceRoot.getRootStep() - .getSubSteps(); - «specificStepFQN» result = null; - int i = start; - int depth = stepPath.size(); - «specificStepFQN» previous = previousStep; - while (result == null && i < depth) { - final «specificStepFQN» currentStep = stepPath.get(depth - i - 1); - final List<«specificStepFQN»> currentSubSteps = new ArrayList<>(); - if (currentStep instanceof SequentialStep) { - currentSubSteps - .addAll(((SequentialStep<«specificStepFQN»>) currentStep) - .getSubSteps()); - } - if (currentSubSteps.isEmpty()) { - // No substep to step into, we thus have to explore the substeps - // of the parent step - previous = currentStep; - } else { - if (previous == null) { - // First time we step into - result = currentSubSteps.get(0); - } else { - final int idx = currentSubSteps.indexOf(previous) + 1; - if (idx < currentSubSteps.size()) { - // We step into the next step - result = currentSubSteps.get(idx); - } else { - previous = currentStep; - } - } - } - i++; - } - if (result == null) { - final int idx = rootSteps.indexOf(previous) + 1; - if (idx < rootSteps.size()) { - result = rootSteps.get(idx); - } - } - return result; - } - ''' - } - - private def generateStepQueryMethods() { - return - ''' - @SuppressWarnings("unchecked") - private «specificStepFQN» computeBackInto(List<«specificStepFQN»> stepPath) { - final List<«specificStepFQN»> rootSteps = traceRoot.getRootStep().getSubSteps(); - final int depth = stepPath.size(); - «specificStepFQN» result = null; - if (depth > 1) { - final «specificStepFQN» currentStep = stepPath.get(depth - 1); - final «specificStepFQN» parentStep = stepPath.get(depth - 2); - final SequentialStep<«specificStepFQN»> parentStep_cast = (SequentialStep<«specificStepFQN»>) parentStep; - final List parentSubSteps = parentStep_cast.getSubSteps(); - final int idx = parentSubSteps.indexOf(currentStep); - if (idx == 0) { - // If the current step is the first in its parents substeps, - // return parent step - result = parentStep; - } else if (idx > 0) { - // Otherwise, return the deepest substep in the previous sibling - // step - final «specificStepFQN» previousSiblingStep = parentSubSteps.get(idx - 1); - «specificStepFQN» tmpStep = previousSiblingStep; - final List<«specificStepFQN»> tmpSubSteps = new ArrayList<>(); - tmpSubSteps.clear(); - if (tmpStep instanceof SequentialStep) { - SequentialStep<«specificStepFQN»> tmpStep_cast = (SequentialStep<«specificStepFQN»>) tmpStep; - tmpSubSteps.addAll(tmpStep_cast.getSubSteps()); - } - while (!tmpSubSteps.isEmpty()) { - tmpStep = tmpSubSteps.get(tmpSubSteps.size() - 1); - tmpSubSteps.clear(); - if (tmpStep instanceof SequentialStep) { - SequentialStep<«specificStepFQN»> tmpStep_cast = (SequentialStep<«specificStepFQN»>) tmpStep; - tmpSubSteps.addAll(tmpStep_cast.getSubSteps()); - } - } - result = tmpStep; - } - } else if (depth == 1) { - final «specificStepFQN» currentStep = stepPath.get(0); - final int idx = rootSteps.indexOf(currentStep); - if (idx > 0) { - «specificStepFQN» tmpStep = rootSteps.get(idx - 1); - final List<«specificStepFQN»> tmpSubSteps = new ArrayList<>(); - tmpSubSteps.clear(); - if (tmpStep instanceof SequentialStep) { - SequentialStep<«specificStepFQN»> tmpStep_cast = (SequentialStep<«specificStepFQN»>) tmpStep; - tmpSubSteps.addAll(tmpStep_cast.getSubSteps()); - } - while (!tmpSubSteps.isEmpty()) { - tmpStep = tmpSubSteps.get(tmpSubSteps.size() - 1); - tmpSubSteps.clear(); - if (tmpStep instanceof SequentialStep) { - SequentialStep<«specificStepFQN»> tmpStep_cast = (SequentialStep<«specificStepFQN»>) tmpStep; - tmpSubSteps.addAll(tmpStep_cast.getSubSteps()); - } - } - result = tmpStep; - } - } - return result; - } - - @SuppressWarnings("unchecked") - private «specificStepFQN» computeBackOver(List<«specificStepFQN»> stepPath) { - final List<«specificStepFQN»> rootSteps = traceRoot.getRootStep().getSubSteps(); - final int depth = stepPath.size(); - «specificStepFQN» result = null; - if (depth > 1) { - final «specificStepFQN» currentStep = stepPath.get(depth - 1); - final «specificStepFQN» parentStep = stepPath.get(depth - 2); - final SequentialStep<«specificStepFQN»> parentStep_cast = (SequentialStep<«specificStepFQN»>) parentStep; - final List<«specificStepFQN»> parentSubSteps = parentStep_cast.getSubSteps(); - final int idx = parentSubSteps.indexOf(currentStep); - if (idx == 0) { - // If the current step is the first in its parents substeps, - // return parent step - result = parentStep; - } else { - // Otherwise, return the previous sibling step - result = parentSubSteps.get(idx - 1); - } - } else if (depth == 1) { - final «specificStepFQN» currentStep = stepPath.get(0); - final int idx = rootSteps.indexOf(currentStep); - if (idx > 0) { - result = rootSteps.get(idx - 1); - } - } - return result; - } - - private «specificStepFQN» computeBackOut(List<«specificStepFQN»> stepPath) { - if (stepPath.size() > 1) { - return stepPath.get(stepPath.size() - 2); - } - return null; - } - - private «specificStepFQN» computeStepInto(List<«specificStepFQN»> stepPath, List<«specificStepFQN»> rootSteps) { - return findNextStep(stepPath, null, 0); - } - - private «specificStepFQN» computeStepOver(List<«specificStepFQN»> stepPath, List<«specificStepFQN»> rootSteps) { - if (!stepPath.isEmpty()) { - return findNextStep(stepPath, stepPath.get(stepPath.size() - 1), 1); - } - return null; - } - - private «specificStepFQN» computeStepReturn(List<«specificStepFQN»> stepPath, List<«specificStepFQN»> rootSteps) { - if (stepPath.size() > 1) { - return findNextStep(stepPath, stepPath.get(stepPath.size() - 2), 2); - } - return null; - } - - private void computeExplorerState(List<«specificStepFQN»> stepPath) { - final List<«specificStepFQN»> rootSteps = getStepsForStates(0, statesTrace.size()); - - final List<«specificStepFQN»> stepPathUnmodifiable = Collections.unmodifiableList(stepPath); - - stepIntoResult = computeStepInto(stepPathUnmodifiable, rootSteps); - stepOverResult = computeStepOver(stepPathUnmodifiable, rootSteps); - stepReturnResult = computeStepReturn(stepPathUnmodifiable, rootSteps); - - stepBackIntoResult = computeBackInto(stepPathUnmodifiable); - stepBackOverResult = computeBackOver(stepPathUnmodifiable); - stepBackOutResult = computeBackOut(stepPathUnmodifiable); - - callStack.clear(); - callStack.addAll(stepPathUnmodifiable.stream().map(s -> (Step) s) - .collect(Collectors.toList())); - } - ''' - } - - private def String generateGoToMethods() { - return - ''' - private void goTo(EObject eObject) { - if (eObject instanceof «stateFQN») { - «getJavaFQN(traceability.traceMMExplorer.getSpecificStateClass)» stateToGo = («getJavaFQN(traceability.traceMMExplorer.getSpecificStateClass)») eObject; - «FOR p : traceability.allMutableProperties.sortBy[FQN]» - «val EReference pdimension = traceability.getDimensionRef(p)» - «val EClass stateClass = traceability.getValueClass(p)» - for («getJavaFQN(stateClass)» value : stateToGo.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createGlobalToState(stateClass))») { -final EObject parent = value.eContainer().eContainer(); -««« Case in which we can use the "originalObject" reference and simply set its values -«IF ! traceability.newClasses.contains(p.eContainer)» -««« We have to test at runtime be can't know at design time the type of the object containing the property -««« The reason is that we keep the same class hierarchy in the trace. Maybe we should remove that. -«FOR concreteSubType : getConcreteSubtypesTraceClassOf(pdimension.getEContainingClass).sortBy[name]» -if (parent instanceof «getJavaFQN(concreteSubType)») { - «val Collection origRefs = traceability.getRefs_originalObject(concreteSubType).sortBy[name]» - «getJavaFQN(concreteSubType)» parent_cast = («getJavaFQN(concreteSubType)») parent; - «IF !origRefs.isEmpty» - «val EReference origRef = origRefs.get(0)» - «IF p.many» - «EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)» originalObject = («EcoreCraftingUtil.getJavaFQN(traceability.getExeClass(pdimension.getEContainingClass),refGenPackages)») parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»; - originalObject.«EcoreCraftingUtil.stringGetter(p)».clear(); - originalObject.«EcoreCraftingUtil.stringGetter(p)».addAll(«stringGetterExeValue("value",p)»); - «ELSE» - «getJavaFQN(p.EType)» toset = «stringGetterExeValue("value", p)»; - «getJavaFQN(p.EType)» current = ((«getJavaFQN((p.eContainer as EClass))»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringGetter(p)»; - if (current != toset) { - ((«getJavaFQN((p.eContainer as EClass))»)parent_cast.«EcoreCraftingUtil.stringGetter(origRef)»).«EcoreCraftingUtil.stringSetter(p, "toset", refGenPackages)»; - } - «ENDIF» - «ENDIF» - } - «ENDFOR» - ««« Case in which we have to recreate/restore execution objects in the model - «ELSEIF p.eContainer instanceof EClass» - «getJavaFQN(p.EContainingClass)» exeObject = («getJavaFQN(p.EContainingClass)») «getTracedToExeMethodName»(parent); - «IF p.many» - exeObject.«EcoreCraftingUtil.stringGetter(p)».clear(); - «IF p instanceof EReference» -««« exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) «getTracedToExeMethodName»(value.«EcoreCraftingUtil.stringGetter(p)»)); - exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) «getTracedToExeMethodName»(value.«EcoreCraftingUtil.stringGetter(p)»)); - «ELSE» - exeObject.«EcoreCraftingUtil.stringGetter(p)».addAll((Collection) value.«EcoreCraftingUtil.stringGetter(p)»); - «ENDIF» - «ELSE» - exeObject.«EcoreCraftingUtil.stringSetter(p, stringGetterExeValue("value",p), refGenPackages)»; - «ENDIF» - «ENDIF» - } - «ENDFOR» - backValueCache.clear(); - } else if (eObject instanceof «valueFQN») { - goTo(((«valueFQN»)eObject).getStatesView().get(0)); - } - } - - private void goTo(int stateNumber) { - if (modelResource != null) { - try { - final TransactionalEditingDomain ed = TransactionUtil.getEditingDomain(modelResource); - if (ed != null) { - final RecordingCommand command = new RecordingCommand(ed, "") { - protected void doExecute() { - goTo(statesTrace.get(stateNumber)); - } - }; - CommandExecution.execute(ed, command); - } - } catch (Exception e) { - throw e; - } - } - } - ''' - } - - private def String generateExeToFromTracedGenericMethods() { - return - ''' - private Collection «getTracedToExeMethodName»( - Collection tracedObjects) { - Collection result = new ArrayList(); - for (EObject tracedObject : tracedObjects) { - result.add(«getTracedToExeMethodName»(tracedObject)); - } - return result; - } - - private EObject «getTracedToExeMethodName»(EObject tracedObject) { - return tracedToExe.get(tracedObject); - } - ''' - } - - private def String generateNavigationMethods() { - return - ''' - private void jumpBeforeStep(«specificStepFQN» step) { - if (step != null) { - final int i = getStartingIndex(step); - if (i == statesTrace.size() - 1) { - lastJumpIndex = -1; - currentState = statesTrace.get(statesTrace.size() - 1); - } else { - lastJumpIndex = i; - currentState = statesTrace.get(i); - } - if (tracedToExe != null) { - goTo(i); - } - updateCallStack(step); - } - } - ''' - } - - private def String generateLoadTraceUtilities() { - return - ''' - public void loadTrace(«getJavaFQN(traceability.traceMMExplorer.specificTraceClass)» root) { - traceRoot = root; - statesTrace = traceRoot.getStates(); - if (!statesTrace.isEmpty()) { - currentState = statesTrace.get(0); - } - valueTraces.addAll(getAllValueTraces()); - } - - public void loadTrace(Resource modelResource, «getJavaFQN(traceability.traceMMExplorer.specificTraceClass)» root) { - loadTrace(root); - this.modelResource = modelResource; - } - ''' - } - - private def String generateAPI() { - return - ''' - @Override - public boolean canBackValue(int traceIndex) { - if (traceIndex > -1 && traceIndex < valueTraces.size()) { - return backValueCache.computeIfAbsent(valueTraces.get(traceIndex), valueTrace -> getPreviousValue(valueTrace)) != null; - } - return false; - } - - @Override - public boolean canStepValue(int traceIndex) { - return true; - } - - @Override - public void backValue(int traceIndex) { - if (traceIndex > -1 && traceIndex < valueTraces.size()) { - final «valueFQN» previousValue = backValueCache.get(valueTraces.get(traceIndex)); - if (previousValue != null) { - jump(previousValue); - } - } - } - - @Override - public void stepValue(int traceIndex) { - if (traceIndex > -1 && traceIndex < valueTraces.size()) { - final «valueFQN» nextValue = getNextValue(valueTraces.get(traceIndex)); - if (nextValue != null) { - jump(nextValue); - } - } - } - - @SuppressWarnings("unchecked") - @Override - public void jump(int i) { - final List<«stateFQN»> states = statesTrace; - if (i < states.size()) { - final List<«specificStepFQN»> rootSteps = getStepsForStates(i, i); - final List<«specificStepFQN»> searchPath = new ArrayList<>(); - «specificStepFQN» firstStepOfState = null; - if (!rootSteps.isEmpty()) { - final Predicate<«specificStepFQN»> p = s -> { - final int stepStartingState = getStartingIndex(s); - final int stepEndingState = getEndingIndex(s); - return (stepEndingState == -1 || stepEndingState >= i) && stepStartingState <= i; - }; - «specificStepFQN» currentStep = rootSteps.get(0); - final List<«specificStepFQN»> siblingSteps = new ArrayList<>(rootSteps); - final List<«specificStepFQN»> currentSubSteps = new ArrayList<>(); - if (currentStep instanceof SequentialStep) { - final SequentialStep<«specificStepFQN»> currentStep_cast = (SequentialStep<«specificStepFQN»>) currentStep; - currentSubSteps.addAll(currentStep_cast.getSubSteps().stream().filter(p).collect(Collectors.toList())); - } - while (firstStepOfState == null) { - final int startingIndex = getStartingIndex(currentStep); - final int endingIndex = getEndingIndex(currentStep); - if (startingIndex < i && (endingIndex > i || endingIndex == -1)) { - if (currentSubSteps.isEmpty()) { - throw new IllegalStateException("Unreachable state"); - } else { - searchPath.add(0, currentStep); - siblingSteps.clear(); - siblingSteps.addAll(currentSubSteps); - currentStep = siblingSteps.get(0); - currentSubSteps.clear(); - if (currentStep instanceof SequentialStep) { - final SequentialStep<«specificStepFQN»> currentStep_cast = (SequentialStep<«specificStepFQN»>) currentStep; - currentSubSteps.addAll(currentStep_cast.getSubSteps().stream().filter(p).collect(Collectors.toList())); - } - } - } else if (endingIndex == i && startingIndex != i) { - if (currentSubSteps.isEmpty()) { - // We need to explore the next sibling step - «specificStepFQN» tmp = currentStep; - currentStep = null; - while (currentStep == null) { - final int idx = siblingSteps.indexOf(tmp) + 1; - if (idx < siblingSteps.size()) { - currentStep = siblingSteps.get(idx); - if (currentStep instanceof SequentialStep) { - final SequentialStep<«specificStepFQN»> currentStep_cast = (SequentialStep<«specificStepFQN»>) currentStep; - currentSubSteps.addAll(currentStep_cast.getSubSteps().stream().filter(p).collect(Collectors.toList())); - } - } else { - if (searchPath.isEmpty()) { - throw new IllegalStateException("Unreachable state"); - } else { - tmp = searchPath.remove(0); - siblingSteps.clear(); - if (searchPath.isEmpty()) { - siblingSteps.addAll(rootSteps); - } else { - final «specificStepFQN» s = searchPath.get(0); - if (s instanceof SequentialStep) { - final SequentialStep<«specificStepFQN»> s_cast = (SequentialStep<«specificStepFQN»>) s; - siblingSteps.addAll((s_cast).getSubSteps().stream().filter(p).collect(Collectors.toList())); - } - } - } - } - } - } else { - // We need to explore the substeps in case one of them starts on i - searchPath.add(0, currentStep); - siblingSteps.clear(); - siblingSteps.addAll(currentSubSteps); - currentStep = siblingSteps.get(0); - currentSubSteps.clear(); - if (currentStep instanceof SequentialStep) { - final SequentialStep<«specificStepFQN»> currentStep_cast = (SequentialStep<«specificStepFQN»>) currentStep; - currentSubSteps.addAll(currentStep_cast.getSubSteps().stream().filter(p).collect(Collectors.toList())); - } - } - } else if (startingIndex == i) { - firstStepOfState = currentStep; - } - } - } - jumpBeforeStep(firstStepOfState); - } - } - - @Override - public boolean canStepBackInto() { - return stepBackIntoResult != null; - } - - @Override - public boolean canStepBackOver() { - return stepBackOverResult != null; - } - - @Override - public boolean canStepBackOut() { - return stepBackOutResult != null; - } - - @Override - public int getCurrentStateIndex() { - if (lastJumpIndex != -1) { - return lastJumpIndex; - } - return statesTrace.size() - 1; - } - - @Override - public State getCurrentState() { - return currentState; - } - - @Override - public List getCallStack() { - return callStack; - } - - private List<«specificStepFQN»> getStepsForStates(int startingState, int endingState) { - Predicate<«specificStepFQN»> predicate = s -> { - final int stepStartingState = getStartingIndex(s); - final int stepEndingState = getEndingIndex(s); - return (stepEndingState == -1 || stepEndingState >= startingState) - && stepStartingState <= endingState; - }; - return traceRoot.getRootStep().getSubSteps().stream().filter(predicate) - .collect(Collectors.toList()); - } - - @Override - public void notifyListeners() { - for (Map.Entry> entry : listeners.entrySet()) { - entry.getValue().forEach(c -> c.execute()); - } - } - - @Override - public void registerCommand(ITraceViewListener listener, TraceViewCommand command) { - if (listener != null) { - Set commands = listeners.get(listener); - if (commands == null) { - commands = new HashSet<>(); - listeners.put(listener, commands); - } - commands.add(command); - } - } - - @Override - public void removeListener(ITraceViewListener listener) { - if (listener != null) { - listeners.remove(listener); - } - } - - @Override - public Step getCurrentForwardStep() { - if (!callStack.isEmpty()) { - return callStack.get(callStack.size() - 1); - } - return null; - } - - @Override - public Step getCurrentBackwardStep() { - return stepBackOverResult; - } - - @Override - public Step getCurrentBigStep() { - return stepBackOutResult; - } - - @Override - public void jump(EObject o) { - int idx = -1; - if (o instanceof «stateFQN») { - idx = statesTrace.indexOf(o); - } else if (o instanceof «valueFQN») { - idx = statesTrace.indexOf(((«valueFQN») o).getStatesView().get(0)); - } - if (idx != -1) { - jump(idx); - } - } - - @SuppressWarnings("unchecked") - @Override - public void loadLastState() { - final int idx = statesTrace.size() - 1; - final List<«specificStepFQN»> steps = getStepsForStates(idx, idx); - «specificStepFQN» lastStep = null; - while (!steps.isEmpty()) { - lastStep = steps.get(steps.size() - 1); - steps.clear(); - if (lastStep instanceof SequentialStep) { - steps.addAll(((SequentialStep<«specificStepFQN»>) lastStep) - .getSubSteps()); - } - } - final int endingIndex = getEndingIndex(lastStep); - if (endingIndex == -1 || endingIndex == idx) { - jumpBeforeStep(lastStep); - } - } - - @Override - public boolean stepInto() { - if (stepIntoResult != null) { - jumpBeforeStep(stepIntoResult); - return true; - } - return false; - } - - @Override - public boolean stepOver() { - if (stepOverResult != null) { - jumpBeforeStep(stepOverResult); - return true; - } - return false; - } - - @Override - public boolean stepReturn() { - if (stepReturnResult != null) { - jumpBeforeStep(stepReturnResult); - return true; - } - return false; - } - - @Override - public boolean stepBackInto() { - if (stepBackIntoResult != null) { - jumpBeforeStep(stepBackIntoResult); - return true; - } - return false; - } - - @Override - public boolean stepBackOver() { - if (stepBackOverResult != null) { - jumpBeforeStep(stepBackOverResult); - return true; - } - return false; - } - - @Override - public boolean stepBackOut() { - if (stepBackOutResult != null) { - jumpBeforeStep(stepBackOutResult); - return true; - } - return false; - } - - @Override - public boolean isInReplayMode() { - return stepIntoResult != null; - } - - @Override - public void updateCallStack(Step step) { - if (step instanceof «specificStepFQN») { - «specificStepFQN» step_cast = («specificStepFQN») step; - final List<«specificStepFQN»> newPath = new ArrayList<>(); - newPath.add(step_cast); - EObject container = step.eContainer(); - while (container != null && container instanceof «specificStepFQN») { - newPath.add(0, («specificStepFQN») container); - container = container.eContainer(); - } - computeExplorerState(newPath); - notifyListeners(); - } else { - throw new IllegalArgumentException("«className» expects specific steps and cannot handle this: "+step); - } - } - - @Override - public void statesAdded(List state) { - } - - @Override - public void valuesAdded(List value) { - } - - @Override - public void dimensionsAdded(List> dimensions) { - valueTraces.clear(); - valueTraces.addAll(getAllValueTraces()); - notifyListeners(); - } - - @Override - public void stepsStarted(List steps) { - } - - @Override - public void stepsEnded(List steps) { - } - ''' - } - - private def String generateTraceExplorerClass() { - - val body = - ''' - public class «className» implements ITraceExplorer { - «generateFields» - «generateConstructors» - «generateValueUtilities» - «generateStepUtilities» - «generateStepQueryMethods» - «generateGoToMethods» - «IF getTracedToExeUsed» - «generateExeToFromTracedGenericMethods» - «ENDIF» - «generateNavigationMethods» - «generateLoadTraceUtilities» - «generateAPI» - } - ''' - - return - ''' - package «packageQN»; - - «generateImports» - - «body» - ''' - } -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExtractorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExtractorGeneratorJava.xtend deleted file mode 100644 index ec1c0ac00..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceExtractorGeneratorJava.xtend +++ /dev/null @@ -1,994 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.codegen - - -import fr.inria.diverse.trace.commons.CodeGenUtil -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import fr.inria.diverse.trace.metamodel.generator.TraceMMStrings -import java.util.HashSet -import java.util.Set -import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.EClassifier -import org.eclipse.emf.ecore.EOperation -import org.eclipse.emf.ecore.EPackage -import org.eclipse.emf.ecore.EReference -import org.eclipse.emf.ecore.EStructuralFeature -import opsemanticsview.Rule - -class TraceExtractorGeneratorJava { - - // Inputs - private val String className - private val String packageQN - private val EPackage traceMM - private val EPackage abstractSyntax - private val TraceMMGenerationTraceability traceability - private val Set refGenPackages - - // Shortcuts - private val EClass stateClass - private val EClass valueClass - private val EClass specificStepClass - - private val String stateFQN - private val String valueFQN - private val String specificStepFQN - private val String specificTraceFQN - private val String statesPackageFQN - - public def String getClassName() { - return className - } - - new(String languageName, String packageQN, EPackage traceMM, TraceMMGenerationTraceability traceability, - Set refGenPackages, boolean gemoc, EPackage abstractSyntax, boolean partialTraceManagement) { - this.traceMM = traceMM - this.className = languageName.replaceAll(" ", "").toFirstUpper + "Extractor" - this.packageQN = packageQN - this.traceability = traceability - this.refGenPackages = refGenPackages - this.abstractSyntax = abstractSyntax - stateClass = traceability.traceMMExplorer.getSpecificStateClass - valueClass = traceability.traceMMExplorer.getSpecificValueClass - statesPackageFQN = EcoreCraftingUtil.getBaseFQN(traceability.traceMMExplorer.statesPackage) + "." + traceability.traceMMExplorer.statesPackage.name.toFirstUpper + "Package" - specificStepClass = traceability.traceMMExplorer.specificStepClass - stateFQN = getJavaFQN(stateClass) - valueFQN = getJavaFQN(valueClass) - specificStepFQN = getJavaFQN(specificStepClass) - specificTraceFQN = getJavaFQN(traceability.traceMMExplorer.specificTraceClass) - } - - private def String getFQN(EStructuralFeature eFeature) { - return EcoreCraftingUtil.getBaseFQN(eFeature.getEContainingClass) + "." + eFeature.name - } - - private def String getJavaFQN(EClassifier c) { - return getJavaFQN(c,false) - } - - private def String getJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { - return EcoreCraftingUtil.getJavaFQN(c,refGenPackages,enforcePrimitiveJavaClass) - } - - public def String generateCode() { - val String code = generateTraceExtractorClass() - try { - return CodeGenUtil.formatJavaCode(code) - } catch (Throwable t) { - return code - } - } - - public static def String getBaseFQN(Rule r) { - val EOperation o = r.operation - val EClass c = r.containingClass - return EcoreCraftingUtil.getBaseFQN(c) + "." + o.name - } - - private def Set getAllMutablePropertiesOf(EClass exeClass) { - val Set res = new HashSet - res.addAll(traceability.getMutablePropertiesOf(exeClass)) - res.addAll(exeClass.getEAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); - return res - } - - private def String generateImports() { - return - ''' - import java.util.ArrayList; - import java.util.Collection; - import java.util.Collections; - import java.util.HashMap; - import java.util.HashSet; - import java.util.List; - import java.util.Map; - import java.util.Optional; - import java.util.Set; - import java.util.function.Function; - import java.util.function.Predicate; - import java.util.regex.Pattern; - import java.util.stream.Collectors; - - import org.eclipse.emf.common.util.Monitor; - import org.eclipse.emf.compare.Comparison; - import org.eclipse.emf.compare.EMFCompare; - import org.eclipse.emf.compare.Match; - import org.eclipse.emf.compare.diff.DefaultDiffEngine; - import org.eclipse.emf.compare.diff.DiffBuilder; - import org.eclipse.emf.compare.diff.FeatureFilter; - import org.eclipse.emf.compare.diff.IDiffEngine; - import org.eclipse.emf.compare.diff.IDiffProcessor; - import org.eclipse.emf.compare.internal.spec.MatchSpec; - import org.eclipse.emf.compare.postprocessor.BasicPostProcessorDescriptorImpl; - import org.eclipse.emf.compare.postprocessor.IPostProcessor; - import org.eclipse.emf.compare.postprocessor.IPostProcessor.Descriptor.Registry; - import org.eclipse.emf.compare.postprocessor.PostProcessorDescriptorRegistryImpl; - import org.eclipse.emf.compare.scope.DefaultComparisonScope; - import org.eclipse.emf.compare.scope.IComparisonScope; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.emf.ecore.EReference; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.ecore.util.EcoreEList; - import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; - import org.eclipse.xtext.naming.QualifiedName; - - import fr.inria.diverse.trace.commons.model.trace.Dimension; - import fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration; - import fr.inria.diverse.trace.commons.model.trace.SequentialStep; - import fr.inria.diverse.trace.commons.model.trace.State; - import fr.inria.diverse.trace.commons.model.trace.Step; - import fr.inria.diverse.trace.commons.model.trace.Trace; - import fr.inria.diverse.trace.commons.model.trace.Value; - import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; - import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; - ''' - } - - private def String generateFields() { - return - ''' - private «getJavaFQN(traceability.traceMMExplorer.specificTraceClass)» traceRoot; - - final private List> valueTraces = Collections.synchronizedList(new ArrayList<>()); - - private List<«stateFQN»> statesTrace; - - final private Map<«specificStepFQN», Integer> stepToStartingIndex = new HashMap<>(); - final private Map<«specificStepFQN», Integer> stepToEndingIndex = new HashMap<>(); - - final private DefaultDeclarativeQualifiedNameProvider nameProvider = new DefaultDeclarativeQualifiedNameProvider(); - - final private Map ignoredValueTraces = new HashMap<>(); - - private final Map, List> stateEquivalenceClasses = Collections.synchronizedMap(new HashMap<>()); - private final Map, List> cachedMaskedStateEquivalenceClasses = Collections.synchronizedMap(new HashMap<>()); - - private final List<«valueFQN»> observedValues = new ArrayList<>(); - ''' - } - - private def String generateConstructors() { - return - ''' - public «className»() { - observedValues.add(null); - configureDiffEngine(); - } - ''' - } - - private def String generateStateUtilities() { - return - ''' - private final IPostProcessor customPostProcessor = new IPostProcessor() { - - private final Function getIdFunction = e -> e.eClass().getName(); - - @Override - public void postMatch(Comparison comparison, Monitor monitor) { - final List matches = new ArrayList<>(comparison.getMatches()); - final List treatedMatches = new ArrayList<>(); - matches.forEach(m1 -> { - matches.forEach(m2 -> { - if (m1 != m2 && !treatedMatches.contains(m2)) { - final EObject left; - final EObject right; - if (m1.getLeft() != null && m1.getRight() == null && m2.getLeft() == null - && m2.getRight() != null) { - left = m1.getLeft(); - right = m2.getRight(); - } else if (m2.getLeft() != null && m2.getRight() == null && m1.getLeft() == null - && m1.getRight() != null) { - left = m2.getLeft(); - right = m1.getRight(); - } else { - return; - } - final String leftId = getIdFunction.apply(left); - final String rightId = getIdFunction.apply(right); - if (leftId.equals(rightId)) { - comparison.getMatches().remove(m1); - comparison.getMatches().remove(m2); - final Match match = new MatchSpec(); - match.setLeft(left); - match.setRight(right); - comparison.getMatches().add(match); - } - } - }); - treatedMatches.add(m1); - }); - } - - @Override - public void postDiff(Comparison comparison, Monitor monitor) { - } - - @Override - public void postRequirements(Comparison comparison, Monitor monitor) { - } - - @Override - public void postEquivalences(Comparison comparison, Monitor monitor) { - } - - @Override - public void postConflicts(Comparison comparison, Monitor monitor) { - } - - @Override - public void postComparison(Comparison comparison, Monitor monitor) { - } - }; - - private boolean compareInitialized = false; - - private IPostProcessor.Descriptor descriptor = null; - - private Registry registry = null; - - private EMFCompare compare; - - private boolean compareEObjects(EObject e1, EObject e2) { - if (e1 == e2) { - return true; - } - - if (e1 == null || e2 == null) { - return false; - } - - if (!compareInitialized) { - descriptor = new BasicPostProcessorDescriptorImpl(customPostProcessor, Pattern.compile(".*"), null); - registry = new PostProcessorDescriptorRegistryImpl(); - registry.put(customPostProcessor.getClass().getName(), descriptor); - compare = EMFCompare.builder().setPostProcessorRegistry(registry).setDiffEngine(diffEngine).build(); - compareInitialized = true; - } - - final IComparisonScope scope = new DefaultComparisonScope(e1, e2, null); - final Comparison comparison = compare.compare(scope); - return comparison.getDifferences().isEmpty(); - } - - private List computeStateComparisonList(List<«valueFQN»> values) { - final List valueIndexes = new ArrayList<>(); - for (int i = 0; i < values.size(); i++) { - final «valueFQN» value = values.get(i); - int idx = -1; - for (int j = 0; j < observedValues.size(); j++) { - final EObject v1 = observedValues.get(j); - final EObject v2 = value; - if (compareEObjects(v1, v2)) { - idx = j; - break; - } - } - if (idx != -1) { - valueIndexes.add(idx); - } else { - valueIndexes.add(observedValues.size()); - observedValues.add(value); - } - } - return valueIndexes; - } - - private void updateEquivalenceClasses(«stateFQN» state) { - final List<«valueFQN»> values = getAllStateValues(state, true); - final List valueIndexes = computeStateComparisonList(values); - List equivalenceClass = stateEquivalenceClasses.get(valueIndexes); - if (equivalenceClass == null) { - equivalenceClass = new ArrayList<>(); - stateEquivalenceClasses.put(valueIndexes, equivalenceClass); - } - equivalenceClass.add(state); - // If the cached masked equivalence classes have not been flushed, updated them. - final List dimensionsToMask = computeDimensionMask(); - if (!(dimensionsToMask.isEmpty() || cachedMaskedStateEquivalenceClasses.isEmpty())) { - final List maskedIndexList = applyMask(valueIndexes, dimensionsToMask); - equivalenceClass = cachedMaskedStateEquivalenceClasses.get(maskedIndexList); - if (equivalenceClass == null) { - equivalenceClass = new ArrayList<>(); - cachedMaskedStateEquivalenceClasses.put(maskedIndexList, equivalenceClass); - } - equivalenceClass.add(state); - } - } - - private void updateEquivalenceClasses(List<«stateFQN»> states) { - states.stream().distinct().forEach(s -> updateEquivalenceClasses(s)); - } - - /* - * Return the list of indexes of value traces that are ignored. - */ - private List computeDimensionMask() { - final List result = new ArrayList<>(); - for (int i = 0; i < valueTraces.size(); i++) { - if (isValueTraceIgnored(i)) { - result.add(i); - } - } - return result; - } - - private List applyMask(List source, List mask) { - final List result = new ArrayList<>(source); - int j = 0; - for (Integer i : mask) { - result.remove(i - j); - j++; - } - return result; - } - - private List> getStateEquivalenceClasses() { - final List dimensionsToMask = computeDimensionMask(); - if (dimensionsToMask.isEmpty()) { - return new ArrayList<>(stateEquivalenceClasses.values()); - } - if (cachedMaskedStateEquivalenceClasses.isEmpty()) { - stateEquivalenceClasses.forEach((indexList, stateList) -> { - final List maskedIndexList = applyMask(indexList, dimensionsToMask); - List equivalenceClass = cachedMaskedStateEquivalenceClasses.get(maskedIndexList); - if (equivalenceClass == null) { - equivalenceClass = new ArrayList<>(); - cachedMaskedStateEquivalenceClasses.put(maskedIndexList, equivalenceClass); - } - equivalenceClass.addAll(stateList); - }); - } - return new ArrayList<>(cachedMaskedStateEquivalenceClasses.values()); - } - - @Override - public List> computeStateEquivalenceClasses() { - return getStateEquivalenceClasses().stream() - .map(l -> new ArrayList<>(l)) - .collect(Collectors.toList()); - } - - @Override - public List> computeStateEquivalenceClasses(List states) { - return getStateEquivalenceClasses().stream() - .map(l -> l.stream() - .filter(s -> states.contains(s)) - .collect(Collectors.toList())) - .collect(Collectors.toList()); - } - - @Override - public boolean compareStates(EObject eObject1, EObject eObject2, boolean respectIgnored) { - final «stateFQN» state1; - final «stateFQN» state2; - - if (eObject1 instanceof «stateFQN») { - state1 = («stateFQN») eObject1; - } else { - return false; - } - - if (eObject2 instanceof «stateFQN») { - state2 = («stateFQN») eObject2; - } else { - return false; - } - - final List<«valueFQN»> values1 = getAllStateValues(state1); - final List<«valueFQN»> values2 = getAllStateValues(state2); - - if (values1.size() != values2.size()) { - return false; - } - - boolean result = true; - for (int i = 0; i < values1.size(); i++) { - if (!respectIgnored || !isValueTraceIgnored(i)) { - final «valueFQN» value1 = values1.get(i); - final «valueFQN» value2 = values2.get(i); - if (value1 != value2) { - result = result && compareEObjects(value1, value2); - if (!result) { - break; - } - } - } - } - - return result; - } - - public boolean compareSteps(EObject eObject1, EObject eObject2) { - final «specificStepFQN» step1; - final «specificStepFQN» step2; - - if (eObject1 instanceof «specificStepFQN») { - step1 = («specificStepFQN») eObject1; - } else { - return false; - } - - if (eObject2 instanceof «specificStepFQN») { - step2 = («specificStepFQN») eObject2; - } else { - return false; - } - - if (step1.eClass() == step2.eClass()) { - return true; - } - - return false; - } - - public boolean compareStatesWithSteps(EObject eObject1, EObject eObject2, boolean respectIgnored) { - final «stateFQN» state1; - final «stateFQN» state2; - - if (eObject1 instanceof «stateFQN») { - state1 = («stateFQN») eObject1; - } else { - return false; - } - - if (eObject2 instanceof «stateFQN») { - state2 = («stateFQN») eObject2; - } else { - return false; - } - - if (compareStates(state1, state2, respectIgnored)) { - final List<«specificStepFQN»> endedSteps1 = state1.getEndedSteps(); - final List<«specificStepFQN»> startedSteps1 = state1.getStartedSteps(); - final List<«specificStepFQN»> endedSteps2 = state2.getEndedSteps(); - final List<«specificStepFQN»> startedSteps2 = state2.getStartedSteps(); - if (endedSteps1.size() == endedSteps2.size() && - startedSteps1.size() == startedSteps2.size()) { - boolean result = true; - for (int i = 0; i < endedSteps1.size(); i++) { - final «specificStepFQN» endedStep1 = endedSteps1.get(i); - final «specificStepFQN» endedStep2 = endedSteps2.get(i); - if (!compareSteps(endedStep1, endedStep2)) { - result = false; - break; - } - } - if (!result) { - return false; - } - for (int i = 0; i < startedSteps1.size(); i++) { - final «specificStepFQN» startedStep1 = startedSteps1.get(i); - final «specificStepFQN» startedStep2 = startedSteps2.get(i); - if (!compareSteps(startedStep1, startedStep2)) { - result = false; - break; - } - } - return result; - } else { - return false; - } - } else { - return false; - } - } - - public boolean compareTraces(EObject eObject1, EObject eObject2, boolean respectIgnored) { - final «specificTraceFQN» trace1; - final «specificTraceFQN» trace2; - - if (eObject1 instanceof «specificTraceFQN») { - trace1 = («specificTraceFQN») eObject1; - } else { - return false; - } - - if (eObject2 instanceof «specificTraceFQN») { - trace2 = («specificTraceFQN») eObject2; - } else { - return false; - } - - final List<«stateFQN»> states1 = trace1.getStates(); - final List<«stateFQN»> states2 = trace2.getStates(); - - if (states1.size() != states2.size()) { - return false; - } - - boolean result = true; - - for (int i = 0; i < states1.size(); i++) { - final «stateFQN» state1 = states1.get(i); - final «stateFQN» state2 = states2.get(i); - if (!compareStatesWithSteps(state1, state2, respectIgnored)) { - result = false; - break; - } - } - - return result; - } - - private List<«valueFQN»> getAllStateValues(«stateFQN» state) { - return getAllStateValues(state, false); - } - - private List<«valueFQN»> getAllStateValues(«stateFQN» state, - boolean includeHiddenValues) { - final List<«valueFQN»> result = new ArrayList<>(); - for (int i = 0; i < valueTraces.size(); i++) { - if (includeHiddenValues || !isValueTraceIgnored(i)) { - final List trace = valueTraces.get(i); - boolean notFound = true; - for («valueFQN» value : trace) { - if (value.getStatesView().contains(state)) { - result.add(value); - notFound = false; - break; - } - } - if (notFound) { - result.add(null); - } - } - } - return result; - } - ''' - } - - private def String generateValueUtilities() { - return - ''' - private IDiffEngine diffEngine = null; - - private void configureDiffEngine() { - IDiffProcessor diffProcessor = new DiffBuilder(); - diffEngine = new DefaultDiffEngine(diffProcessor) { - @Override - protected FeatureFilter createFeatureFilter() { - return new FeatureFilter() { - @Override - protected boolean isIgnoredReference(Match match, EReference reference) { - final String name = reference.getName(); - return name.equals("parent") || name.equals("states") || name.equals("statesNoOpposite"); - } - }; - } - }; - } - - private List> getAllValueTraces() { - final List> result = new ArrayList<>(); - «FOR mutClass : traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name]» - «val traced = traceability.getTracedClass(mutClass)» - «val mutProps = getAllMutablePropertiesOf(mutClass).sortBy[getFQN]» - «IF !mutProps.empty» - for («getJavaFQN(traced)» tracedObject : traceRoot.«EcoreCraftingUtil.stringGetter(TraceMMStrings.ref_createTraceClassToTracedClass(traced))») { - «FOR p : mutProps» - «val EReference pdimension = traceability.getDimensionRef(p)» - result.add(tracedObject.«EcoreCraftingUtil.stringGetter(pdimension)».getValues()); - «ENDFOR» - } - «ENDIF» - «ENDFOR» - return result; - } - - private «valueFQN» getValueAt(int traceIndex, int stateIndex) { - «valueFQN» result = null; - if (traceIndex >= 0 && traceIndex < valueTraces.size()) { - final List valueTrace = valueTraces.get(traceIndex); - final «stateFQN» state = statesTrace.get(stateIndex); - for («valueFQN» value : valueTrace) { - if (value.getStatesView().contains(state)) { - result = value; - break; - } - } - } - return result; - } - ''' - } - - private def generateStepUtilities() { - return - ''' - private int getStartingIndex(«specificStepFQN» step) { - return stepToStartingIndex.computeIfAbsent(step, s -> { - return statesTrace.indexOf(s.getStartingState()); - }); - } - - private int getEndingIndex(«specificStepFQN» step) { - if (step.getEndingState() != null) { - return stepToEndingIndex.computeIfAbsent(step, s -> { - return statesTrace.indexOf(s.getEndingState()); - }); - } - return -1; - } - ''' - } - - private def String generateLoadTraceUtilities() { - return - ''' - public void loadTrace(«getJavaFQN(traceability.traceMMExplorer.specificTraceClass)» root) { - traceRoot = root; - statesTrace = traceRoot.getStates(); - valueTraces.addAll(getAllValueTraces()); - updateEquivalenceClasses(statesTrace); - } - ''' - } - - private def String generateAPI() { - return - ''' - private boolean isStateBreakable(«stateFQN» state) { - «IF !traceability.bigStepClasses.empty» - final boolean b = state.getStartedSteps().size() == 1; - if (b) { - «specificStepFQN» s = state.getStartedSteps().get(0); - return - !(«FOR bigStepClass : traceability.bigStepClasses.sortBy[name] SEPARATOR "||"» - s instanceof «getJavaFQN(bigStepClass)»_ImplicitStep - «ENDFOR»); - } - «ENDIF» - return true; - } - - @Override - public int getNumberOfTraces() { - return valueTraces.size(); - } - - @Override - public int getStatesTraceLength() { - return statesTrace.size(); - } - - @Override - public State getState(int stateIndex) { - return statesTrace.get(stateIndex); - } - - @Override - public State getStateIndex(State state) { - return statesTrace.indexOf(state); - } - - @Override - public int getValueFirstStateIndex(Value value) { - return getStateIndex(value.getStatesView().get(0)); - } - - @Override - public int getValueLastStateIndex(Value value) { - final List states = value.getStatesView() - return getStateIndex(states.get(states.size() - 1)); - } - - @Override - public int getValuesTraceLength(int traceIndex) { - if (traceIndex > -1 && traceIndex < valueTraces.size()) { - List trace = valueTraces.get(traceIndex); - return trace.size(); - } - return -1; - } - - private String getValueName(EObject value) { - final EObject container = value.eContainer(); - final List attributes = container.eClass().getEAllReferences().stream() - .filter(r -> r.getName().endsWith("Sequence")) - .map(r -> r.getName().substring(0, r.getName().length() - 8)).collect(Collectors.toList()); - if (attributes.isEmpty()) { - return ""; - } else { - return attributes.stream() - .filter(s -> value.getClass().getName().contains("_" + s + "_")) - .findFirst().orElse(""); - } - } - - private Object getOriginalObject(EObject eObject) { - return eObject.eClass().getEAllReferences().stream() - .filter(r -> r.getName().startsWith("originalObject")) - .findFirst().map(r -> eObject.eGet(r)).orElse(null); - } - - private String getObjectDescription(Object object) { - if (object == null) { - return "null"; - } - if (object instanceof EObject) { - final Object originalObject = getOriginalObject((EObject) object); - if (originalObject != null) { - if (originalObject instanceof EObject) { - final QualifiedName qname = nameProvider.getFullyQualifiedName((EObject) originalObject); - if (qname != null) { - return qname.getLastSegment(); - } - } - return originalObject.toString(); - } - QualifiedName qname = nameProvider.getFullyQualifiedName((EObject) object); - if (qname != null) { - return qname.getLastSegment(); - } - } - if (object instanceof Collection) { - @SuppressWarnings("unchecked") - final Collection o_cast = (Collection) object; - if (!o_cast.isEmpty()) { - List strings = o_cast.stream() - .map(o -> getObjectDescription(o)) - .collect(Collectors.toList()); - return strings.toString(); - } - } - return object.toString(); - } - - @Override - public String getValueLabel(int traceIndex) { - String attributeName = ""; - if (traceIndex > -1 && traceIndex < valueTraces.size()) { - final List valueTrace = valueTraces.get(traceIndex); - if (valueTrace.isEmpty()) { - return ""; - } - if (valueTrace instanceof EcoreEList) { - final EcoreEList eList = (EcoreEList) valueTrace; - final EObject owner = eList.getEObject(); - final List attributes = owner.eClass().getEAllReferences().stream() - .filter(r -> r.getName().endsWith("Sequence")) - .map(r -> r.getName().substring(0, r.getName().length() - 8)).collect(Collectors.toList()); - final Object originalObject = getOriginalObject(owner); - if (!attributes.isEmpty()) { - String n = eList.data().getClass().getComponentType().getName(); - attributeName = attributes.stream().filter(s -> n.contains("_" + s + "_")).findFirst().orElse(""); - } - if (originalObject != null) { - if (originalObject instanceof EObject) { - final EObject eObject = (EObject) originalObject; - if (eObject.eIsProxy()) { - final String proxyToString = eObject.toString(); - final int idx = proxyToString.indexOf("eProxyURI: ") + 11; - final String s = proxyToString.substring(idx, proxyToString.length() - 1); - return attributeName + " (" + s + ")"; - } - final QualifiedName qname = nameProvider.getFullyQualifiedName(eObject); - if (qname != null) { - return attributeName + " (" + qname.toString() + " :" + eObject.eClass().getName() + ")"; - } - } - return attributeName + " (" + originalObject.toString() + ")"; - } - } - } - return attributeName; - } - - @Override - public String getStateDescription(int stateIndex) { - String result = ""; - for (int i = 0; i < valueTraces.size(); i++) { - if (!isValueTraceIgnored(i)) { - String description = getValueDescription(i, stateIndex); - result += (description == null ? "" : (result.length() == 0 ? "" : "\n") + description); - } - } - return result; - } - - @Override - public String getValueDescription(int traceIndex, int stateIndex) { - final EObject value = getValueAt(traceIndex, stateIndex); - if (value == null) { - return null; - } - String description = getValueLabel(traceIndex) + " : "; - final String attributeName = getValueName(value); - if (attributeName.length() > 0) { - final Optional attribute = value.eClass() - .getEAllStructuralFeatures().stream() - .filter(r -> r.getName().equals(attributeName)).findFirst(); - if (attribute.isPresent()) { - final Object o = value.eGet(attribute.get()); - return description + getObjectDescription(o); - } - } - return description + value; - } - - @Override - public LaunchConfiguration getLaunchConfiguration() { - return traceRoot.getLaunchconfiguration(); - } - - @Override - public void ignoreValueTrace(int trace, boolean ignore) { - if (trace > -1 && trace < valueTraces.size()) { - ignoredValueTraces.put(trace, ignore); - cachedMaskedStateEquivalenceClasses.clear(); - notifyListeners(); - } - } - - @Override - public boolean isValueTraceIgnored(int trace) { - Boolean result = null; - if (trace > -1 && trace < valueTraces.size()) { - result = ignoredValueTraces.get(trace); - } - return result != null && result; - } - - @Override - public void statesAdded(List states) { - updateEquivalenceClasses(states.stream() - .map(e -> («stateFQN») e).collect(Collectors.toList())); - notifyListeners(); - } - - private Map>> valuesTracesMap = new HashMap<>(); - - private Map> listeners = new HashMap<>(); - - @Override - public void valuesAdded(List values) { -««« for (EObject value : values) { -««« final EReference r = value.eContainmentFeature(); -««« final EObject c = value.eContainer(); -««« List l = null; -««« Map> m = valuesTracesMap.get(c); -««« if (m == null) { -««« m = new HashMap<>(); -««« l = Collections.synchronizedList(new ArrayList<>()); -««« m.put(r, l); -««« valuesTracesMap.put(c, m); -««« } else { -««« l = m.get(r); -««« if (l == null) { -««« l = Collections.synchronizedList(new ArrayList<>()); -««« m.put(r, l); -««« } -««« } -««« l.add(value); -««« } - // Nothing to do here. - } - - @Override - public void dimensionsAdded(List> dimensions) { - if (!dimensions.isEmpty()) { - valueTraces.clear(); - cachedMaskedStateEquivalenceClasses.clear(); - valueTraces.addAll(getAllValueTraces()); - final List insertedTracesIndexes = new ArrayList<>(); - for (Dimension valueTrace : dimensions) { - final int i = valueTraces.indexOf(valueTrace); - insertedTracesIndexes.add(i); - } - Collections.sort(insertedTracesIndexes); - final List> keys = new ArrayList<>(stateEquivalenceClasses.keySet()); - for (List key : keys) { - List states = stateEquivalenceClasses.remove(key); - for (Integer i : insertedTracesIndexes) { - key.add(i, -1); - } - stateEquivalenceClasses.put(key, states); - } - List ignoredTracesIndexes = new ArrayList<>(ignoredValueTraces.keySet()); - Collections.sort(ignoredTracesIndexes); - while (!ignoredTracesIndexes.isEmpty()) { - int i = ignoredTracesIndexes.remove(0); - if (insertedTracesIndexes.get(0) <= i) { - for (int j = ignoredTracesIndexes.size() - 1; j >= 0; j--) { - final Integer idx = ignoredTracesIndexes.get(j); - ignoredValueTraces.put(idx+1, ignoredValueTraces.remove(idx)); - } - ignoredTracesIndexes = ignoredTracesIndexes.stream().map(idx -> idx+1).collect(Collectors.toList()); - ignoredValueTraces.put(i+1, ignoredValueTraces.remove(i)); - insertedTracesIndexes.remove(0); - } - } - } - } - - @Override - public void notifyListeners() { - for (Map.Entry> entry : listeners.entrySet()) { - entry.getValue().forEach(c -> c.execute()); - } - } - - @Override - public void registerCommand(ITraceViewListener listener, TraceViewCommand command) { - if (listener != null) { - Set commands = listeners.get(listener); - if (commands == null) { - commands = new HashSet<>(); - listeners.put(listener, commands); - } - commands.add(command); - } - } - - @Override - public void removeListener(ITraceViewListener listener) { - if (listener != null) { - listeners.remove(listener); - } - } - - @Override - public void stepsStarted(List steps) { - // Nothing to do here. - } - - @Override - public void stepsEnded(List steps) { - // Nothing to do here. - } - ''' - } - - private def String generateTraceExtractorClass() { - return - ''' - package «packageQN»; - - «generateImports» - - public class «className» implements ITraceExtractor { - - «generateFields» - «generateConstructors» - «generateValueUtilities» - «generateStateUtilities» - «generateStepUtilities» - «generateLoadTraceUtilities» - «generateAPI» - } - ''' - } -} diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceNotifierGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceNotifierGeneratorJava.xtend deleted file mode 100644 index 9cd419e22..000000000 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceNotifierGeneratorJava.xtend +++ /dev/null @@ -1,200 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.codegen - -import fr.inria.diverse.trace.commons.CodeGenUtil -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import java.util.HashSet -import java.util.Set -import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.EClassifier -import org.eclipse.emf.ecore.EReference -import org.eclipse.emf.ecore.EStructuralFeature - -class TraceNotifierGeneratorJava { - - // Inputs - private val String className - private val String packageQN - private val TraceMMGenerationTraceability traceability - private val Set refGenPackages - - // Shortcuts - private val String stateFQN - private val String valueFQN - private val String specificStepFQN - - public def String getClassName() { - return className - } - - new(String languageName, String packageQN, TraceMMGenerationTraceability traceability, Set refGenPackages) { - this.className = languageName.replaceAll(" ", "").toFirstUpper + "Notifier" - this.packageQN = packageQN - this.traceability = traceability - this.refGenPackages = refGenPackages - - stateFQN = getJavaFQN(traceability.traceMMExplorer.getSpecificStateClass) - valueFQN = getJavaFQN(traceability.traceMMExplorer.getSpecificValueClass) - specificStepFQN = getJavaFQN(traceability.traceMMExplorer.specificStepClass) - } - - private def String getFQN(EStructuralFeature eFeature) { - return EcoreCraftingUtil.getBaseFQN(eFeature.getEContainingClass) + "." + eFeature.name - } - - private def String getJavaFQN(EClassifier c) { - return getJavaFQN(c,false) - } - - private def String getJavaFQN(EClassifier c, boolean enforcePrimitiveJavaClass) { - return EcoreCraftingUtil.getJavaFQN(c,refGenPackages,enforcePrimitiveJavaClass) - } - - public def String generateCode() { - val String code = generateTraceNotifierClass() - try { - return CodeGenUtil.formatJavaCode(code) - } catch (Throwable t) { - return code - } - } - - private def Set getAllMutablePropertiesOf(EClass exeClass) { - val Set res = new HashSet - res.addAll(traceability.getMutablePropertiesOf(exeClass)) - res.addAll(exeClass.getEAllSuperTypes.map[s|traceability.getMutablePropertiesOf(s)].flatten.toSet); - return res - } - - private def String generateImports() { - return - ''' - import java.util.ArrayList; - import java.util.List; - - import org.eclipse.emf.ecore.EObject; - import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; - import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; - import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange; - - import fr.inria.diverse.trace.commons.model.trace.Dimension; - import fr.inria.diverse.trace.commons.model.trace.State; - import fr.inria.diverse.trace.commons.model.trace.Step; - import fr.inria.diverse.trace.commons.model.trace.Value; - import fr.inria.diverse.trace.gemoc.api.ITraceListener; - import fr.inria.diverse.trace.gemoc.api.ITraceNotifier; - ''' - } - - private def String generateFields() { - return - ''' - private BatchModelChangeListener traceListener; - - private final List listeners = new ArrayList<>(); - ''' - } - - private def String generateConstructors() { - return - ''' - public «className»(BatchModelChangeListener traceListener) { - this.traceListener = traceListener; - } - ''' - } - - private def String generateMethods() { - return - ''' - @Override - public void notifyListeners() { - for (ITraceListener listener : listeners) { - notifyListener(listener); - } - } - - @Override - public void notifyListener(ITraceListener listener) { - final List changes = traceListener.getChanges(listener); - if (!changes.isEmpty()) { - final List startedSteps = new ArrayList<>(); - final List endedSteps = new ArrayList<>(); - final List newStates = new ArrayList<>(); - final List newValues = new ArrayList<>(); - final List> newDimensions = new ArrayList<>(); - changes.forEach(c -> { - if (c instanceof NewObjectModelChange) { - final EObject o = c.getChangedObject(); - if (o instanceof «valueFQN») { - newValues.add((«valueFQN») o); - } else if (o instanceof «specificStepFQN») { - startedSteps.add((«specificStepFQN») o); - } else if (o instanceof «stateFQN») { - final «stateFQN» newState = («stateFQN») o; - newStates.add(newState); - endedSteps.addAll(newState.getEndedSteps()); - «FOR mutClass : traceability.allMutableClasses.filter[c|!c.isAbstract].sortBy[name]» - «val traced = traceability.getTracedClass(mutClass)» - «val mutProps = getAllMutablePropertiesOf(mutClass).sortBy[getFQN]» - «IF !mutProps.empty» - } else if (o instanceof «getJavaFQN(traced)») { - «FOR p : mutProps» - «val EReference pdimension = traceability.getDimensionRef(p)» - newDimensions.add(((«getJavaFQN(traced)») o).«EcoreCraftingUtil.stringGetter(pdimension)»); - «ENDFOR» - «ENDIF» - «ENDFOR» - } - } - }); - listener.valuesAdded(newValues); - listener.dimensionsAdded(newDimensions); - listener.statesAdded(newStates); - listener.stepsStarted(startedSteps); - listener.stepsEnded(endedSteps); - } - } - - @Override - public void addListener(ITraceListener listener) { - listeners.add(listener); - traceListener.registerObserver(listener); - } - - @Override - public void removeListener(ITraceListener listener) { - listeners.remove(listener); - traceListener.removeObserver(listener); - } - ''' - } - - private def String generateTraceNotifierClass() { - return - ''' - package «packageQN»; - - «generateImports» - - public class «className» implements ITraceNotifier { - - «generateFields» - «generateConstructors» - «generateMethods» - } - ''' - } - -} From 1b30cb217879606862d37642e8ddac839f0d3d82 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 7 Apr 2017 12:10:06 +0200 Subject: [PATCH 144/267] Remove references to trace.plugin.generator --- trace/generator/README.md | 4 +--- trace/generator/pom.xml | 1 - .../feature.xml | 7 ------- .../META-INF/MANIFEST.MF | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/trace/generator/README.md b/trace/generator/README.md index 84ec26436..5dd46182e 100644 --- a/trace/generator/README.md +++ b/trace/generator/README.md @@ -19,9 +19,7 @@ The generation process is divided in three steps: 2. A generic generator is called to process the intermediate representation and to produce an Ecore multidimensional domain-specific trace metamodel. The generator can be found in the plugin `fr.inria.diverse.trace.metamodel.generator`. -3. A plugin generator is called to process the intermediate representation, the generated trace metamodel and some traceability links in order to produce a trace management plugin that contains the trace metamodel and a trace manager (in Java). The *trace manager* provides services to construct a trace, and to restore the executed model into a former state. The plugin generator can be found in `fr.inria.diverse.trace.plugin.generator`. - -4. A GEMOC engine addon generator is called, in order to create a Java class to integrate the trace plugin into a GEMOC engine addon. Contrary to the previous steps, this last step is specific and dependent to the GEMOC Studio plugins. The addon generator can be found in `fr.inria.diverse.trace.gemoc.generator`. +3. A GEMOC engine addon generator is called, to process the intermediate representation, the generated trace metamodel and some traceability links in order to produce a trace management plugin that contains the trace metamodel and a trace manager (in Java). The *state manager* provides services to construct a trace, and to restore the executed model into a former state in order to create a Java class to integrate the trace plugin into a GEMOC engine addon. Contrary to the previous steps, this last step is specific and dependent to the GEMOC Studio plugins. The generator can be found in `fr.inria.diverse.trace.gemoc.generator`. ## Publication diff --git a/trace/generator/pom.xml b/trace/generator/pom.xml index b8845fdfa..3df1be0af 100644 --- a/trace/generator/pom.xml +++ b/trace/generator/pom.xml @@ -21,7 +21,6 @@ plugins/fr.inria.diverse.trace.gemoc.generator plugins/fr.inria.diverse.trace.gemoc.ui plugins/fr.inria.diverse.trace.metamodel.generator - plugins/fr.inria.diverse.trace.plugin.generator plugins/fr.inria.diverse.trace.annotations diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml index aae12324b..883309058 100644 --- a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml +++ b/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml @@ -23,13 +23,6 @@ version="0.0.0" unpack="false"/> - - Date: Fri, 7 Apr 2017 12:50:26 +0200 Subject: [PATCH 145/267] Add missing export packages in trace.gemoc.generator --- .../META-INF/MANIFEST.MF | 3 +++ 1 file changed, 3 insertions(+) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF index c34b95c78..ca4f9ac02 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF @@ -25,3 +25,6 @@ Require-Bundle: com.google.guava, fr.inria.diverse.opsemanticsview.gen;bundle-version="1.0.0" Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: fr.inria.diverse.trace.gemoc.generator, + fr.inria.diverse.trace.gemoc.generator.codegen, + fr.inria.diverse.trace.gemoc.generator.util From 82a895b90d93033b5a1140ee7270063699567c62 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 7 Apr 2017 13:24:57 +0200 Subject: [PATCH 146/267] TraceAddonGeneratorIntegration: fix comments and messages --- .../gemoc/generator/TraceAddonGeneratorIntegration.xtend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend index e23c4796f..18cf3d7f1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend @@ -58,11 +58,11 @@ class TraceAddonGeneratorIntegration { val ModelTypingSpace root = resource.getContents().get(0) as ModelTypingSpace val Language selection = root.elements.filter(Language).findFirst[name == selectedLanguage] - // We find all extension points providing fr.inria.diverse.trace.gemoc.generator.integration + // We find all extension points val configNew = Platform.getExtensionRegistry().getConfigurationElementsFor( "fr.inria.diverse.opsemanticsview.gen"); - // Using them, we instantiate TraceAddonGeneratorIntegrationConfiguration objects and look for one that can work with the current selected language + // Using them, we instantiate objects and look for one that can work with the current selected language val OperationalSemanticsViewGenerator validViewGenerator = configNew.map [ e | e.createExecutableExtension("class") ].filter(OperationalSemanticsViewGenerator).findFirst [ conf | @@ -81,7 +81,7 @@ class TraceAddonGeneratorIntegration { Status. ERROR, "fr.inria.diverse.trace.gemoc.generator", - "Impossible to create a trace addon: couldn't find a trace addon integration extension that can manage the chosen melange language." + "Impossible to create a trace addon: couldn't find an opsemanticsview generator that can manage the chosen melange language." )); } From 9e25210783a63b57554901c443bb07eae3504915 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 7 Apr 2017 13:25:14 +0200 Subject: [PATCH 147/267] GenericEngineTraceAddonGenerator: add missing variables inits --- .../GenericEngineTraceAddonGenerator.xtend | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index 943f0b9d3..aa9550fa0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -49,19 +49,21 @@ class GenericEngineTraceAddonGenerator { private val OperationalSemanticsView opsemanticsview // URI private val String pluginName - // Transient - private var String packageQN - private var String className + // Transient vals (derived just from inputs) + private val String packageQN + private val String className + private val String languageName + private val String tracedLanguageName + private val String stepFactoryClassName + + // Transient vars private var String traceConstructorClassName private var String stateManagerClassName - private var String stepFactoryClassName private var TraceMMGenerationTraceability traceability private var Set genPackages private var IPackageFragment packageFragment - private var String tracedLanguageName private var EPackage tracemm private var boolean partialTraceManagement = false - private var String languageName // Output @Accessors(PUBLIC_GETTER, PROTECTED_SETTER) @@ -72,6 +74,11 @@ class GenericEngineTraceAddonGenerator { new(OperationalSemanticsView opsemanticsview, String pluginName) { this.opsemanticsview = opsemanticsview this.pluginName = pluginName + this.packageQN = pluginName + ".tracemanager" + this.tracedLanguageName = opsemanticsview.executionMetamodel.name + this.languageName = tracedLanguageName.replaceAll(" ", "") + "Trace" + this.className = languageName.replaceAll(" ", "").toFirstUpper + "EngineAddon" + this.stepFactoryClassName = languageName.replaceAll(" ", "").toFirstUpper + "StepFactory" } public def void generateCompleteAddon() { @@ -113,9 +120,6 @@ class GenericEngineTraceAddonGenerator { private def void generateTraceMetamodelAndPlugin(IProgressMonitor m) { - tracedLanguageName = opsemanticsview.executionMetamodel.name - languageName = tracedLanguageName.replaceAll(" ", "") + "Trace" - //TODO disabled for now, the whole approach must be adapted since Ecorext is not used anymore // if (tracingAnnotations != null) { // var Set classesToTrace = new HashSet From 78487485d7ffde10aabab2f9608480dd8937b666 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 7 Apr 2017 17:28:06 +0200 Subject: [PATCH 148/267] removed extra T at the end of SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e6a1b3b9..c2d6ea3e2 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ com.oracle javafxswt - 2.3.0-SNAPSHOTT + 2.3.0-SNAPSHOT ${java.home}/lib/jfxswt.jar system From 43b7644b8294519447f1d9979f411c8eb4615e45 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 7 Apr 2017 18:01:40 +0200 Subject: [PATCH 149/267] fix scmURL to point to the correct git repository --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2d6ea3e2..b4b15da68 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 0.26.0 2.10.0 UTF8 - scm:git:https://github.com/gemoc/modelanimation.git + scm:git:https://github.com/SiriusLab/ModelDebugging.git From 561e4996521a3191289aaa0302ad9805000a7d77 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 7 Apr 2017 18:03:39 +0200 Subject: [PATCH 150/267] enable source generation of the simulationanimation stuff ie. the fr.obeo.dsl.debug* for bug #16 --- simulationmodelanimation/pom.xml | 339 ++++++++++++++++++------------- 1 file changed, 203 insertions(+), 136 deletions(-) diff --git a/simulationmodelanimation/pom.xml b/simulationmodelanimation/pom.xml index 1f7dff7e1..e4cd7b35e 100644 --- a/simulationmodelanimation/pom.xml +++ b/simulationmodelanimation/pom.xml @@ -1,149 +1,216 @@ - + + 4.0.0 -Contributors: - Obeo - initial API and implementation ---> - - 4.0.0 + + 3.0 + - - 3.0 - + DSLDebugger + fr.obeo.dsl.debug.parent + 2.3.0-SNAPSHOT + pom - DSLDebugger - fr.obeo.dsl.debug.parent - 2.3.0-SNAPSHOT - pom - - DSL Debugger Parent - - - Eclipse Public License v1.0 - + DSL Debugger Parent + + + Eclipse Public License v1.0 + All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.htm - - + + - - 0.26.0 - + + 0.26.0 + scm:git:https://github.com/SiriusLab/ModelDebugging.git + - - - plugins/fr.obeo.dsl.debug - plugins/fr.obeo.dsl.debug.edit - plugins/fr.obeo.dsl.debug.ide - plugins/fr.obeo.dsl.debug.ide.sirius.ui - plugins/fr.obeo.dsl.debug.ide.ui + + + plugins/fr.obeo.dsl.debug + plugins/fr.obeo.dsl.debug.edit + plugins/fr.obeo.dsl.debug.ide + plugins/fr.obeo.dsl.debug.ide.sirius.ui + plugins/fr.obeo.dsl.debug.ide.ui - - tests/fr.obeo.dsl.debug.tests - + + tests/fr.obeo.dsl.debug.tests + - - releng/fr.obeo.dsl.debug.feature - releng/fr.obeo.dsl.debug.ui.feature - releng/fr.obeo.dsl.debug.sirius.ui.feature - + + releng/fr.obeo.dsl.debug.feature + releng/fr.obeo.dsl.debug.ui.feature + releng/fr.obeo.dsl.debug.sirius.ui.feature + - - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - p2 - - - linux - gtk - x86 - - - win32 - win32 - x86 - - - win32 - win32 - x86_64 - - - linux - gtk - x86_64 - - - macosx - cocoa - x86_64 - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - - ../../releng/fr.obeo.dsl.debug.target/dsldebug-neon - - - - - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho-version} - true - - - + + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + p2 + + + linux + gtk + x86 + + + win32 + win32 + x86 + + + win32 + win32 + x86_64 + + + linux + gtk + x86_64 + + + macosx + cocoa + x86_64 + + + + + ${project.groupId} + ${project.artifactId} + ${project.version} + + ../../releng/fr.obeo.dsl.debug.target/dsldebug-neon + + + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho-version} + true + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + UTF-8 + 1.8 + 1.8 + + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + + plugin-source + + plugin-source + + + + + + + org.eclipse.tycho.extras + tycho-source-feature-plugin + ${tycho-version} + + + source-feature + package + + source-feature + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho-version} + + + attach-p2-metadata + package + + p2-metadata + + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + + org.eclipse.tycho.extras + tycho-sourceref-jgit + ${tycho-version} + + + + + true + + + + + - - - - quality - - false - - - - jacoco - reuseReports - - ../../target/jacoco.exec - - - - - org.jacoco - jacoco-maven-plugin - 0.5.6.201201232323 - - - - prepare-agent - - - true - ${sonar.jacoco.reportPath} - - - - - - - - + + + + quality + + false + + + + jacoco + reuseReports + + ../../target/jacoco.exec + + + + + org.jacoco + jacoco-maven-plugin + 0.5.6.201201232323 + + + + prepare-agent + + + true + ${sonar.jacoco.reportPath} + + + + + + + + From 69db2e3afc2e8079e132ca780db25ff441570a8e Mon Sep 17 00:00:00 2001 From: dvojtise Date: Mon, 10 Apr 2017 09:35:03 +0200 Subject: [PATCH 151/267] added some license --- pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pom.xml b/pom.xml index b4b15da68..fe811a924 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,25 @@ 4.0.0 + + 3.0 + + org.gemoc org.gemoc.siriusanimation.root 2.3.0-SNAPSHOT + + + + Eclipse Public License v1.0 + + All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.htm + + + + pom + From dee259aec7a9c65756b010dc0ccd08da7792e960 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Mon, 10 Apr 2017 09:59:06 +0200 Subject: [PATCH 152/267] export all packages of javaxdsml.ide.ui --- .../META-INF/MANIFEST.MF | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF index f7e068166..01f60988c 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF @@ -31,6 +31,11 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Export-Package: org.gemoc.execution.sequential.javaxdsml.ide.ui, + org.gemoc.execution.sequential.javaxdsml.ide.ui.builder, + org.gemoc.execution.sequential.javaxdsml.ide.ui.commands, org.gemoc.execution.sequential.javaxdsml.ide.ui.dialogs, + org.gemoc.execution.sequential.javaxdsml.ide.ui.editor, + org.gemoc.execution.sequential.javaxdsml.ide.ui.menu, + org.gemoc.execution.sequential.javaxdsml.ide.ui.templates, org.gemoc.execution.sequential.javaxdsml.ide.ui.wizards From d8c624404821a496fdf785b1e5b744e19b9b215a Mon Sep 17 00:00:00 2001 From: dvojtise Date: Mon, 10 Apr 2017 10:10:31 +0200 Subject: [PATCH 153/267] add dsl.debug.* sources to the update site --- .../category.xml | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/releng/org.gemoc.siriusanimation.repository/category.xml b/releng/org.gemoc.siriusanimation.repository/category.xml index bb9310113..a60ca6c51 100644 --- a/releng/org.gemoc.siriusanimation.repository/category.xml +++ b/releng/org.gemoc.siriusanimation.repository/category.xml @@ -18,17 +18,6 @@ - - - Category with all features. - - - - - Category with all sources. - - - @@ -47,8 +36,6 @@ - - @@ -67,16 +54,35 @@ - - - + + + + - + + + + - + - + + + + + + Category with all features. + + + + + Category with all sources. + + + + + From 53b50bae2a380347136e2c1fcc53876ed71f5768 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Mon, 10 Apr 2017 11:08:23 +0200 Subject: [PATCH 154/267] [BatchModelChangeListener] Hide changes when object added then removed --- .../BatchModelChangeListener.xtend | 48 +++++++++++-------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend index c149f0e2d..4e0e21bb1 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Inria - initial API and implementation *******************************************************************************/ @@ -113,12 +113,14 @@ public class BatchModelChangeListener { val newObjects = new HashSet val removedObjects = new HashSet + val eventuallyRemoved = new HashSet // First we find new objects added or removed at the root of the resource for (resource : resourcesNotifications.keySet) { val resourceNotifications = resourcesNotifications.get(resource) for (Notification notif : resourceNotifications) { - BatchModelChangeListener.manageCollectionContainmentNotification(removedObjects, newObjects, notif) + BatchModelChangeListener.manageCollectionContainmentNotification(eventuallyRemoved, removedObjects, + newObjects, notif) } } @@ -144,9 +146,10 @@ public class BatchModelChangeListener { // Register potentially new or removed object if ((feature as EReference).containment) { if (previousValue != null && previousValue instanceof EObject) - addToRemovedObjects(removedObjects, newObjects, previousValue as EObject) + addToRemovedObjects(eventuallyRemoved, removedObjects, newObjects, + previousValue as EObject) if (newValue != null && newValue instanceof EObject) - addToNewObjects(removedObjects, newObjects, newValue as EObject) + addToNewObjects(eventuallyRemoved, removedObjects, newObjects, newValue as EObject) } } } // Case data types: we compare values @@ -177,7 +180,8 @@ public class BatchModelChangeListener { if (feature instanceof EReference && (feature as EReference).containment) { BatchModelChangeListener. - manageCollectionContainmentNotification(removedObjects, newObjects, notif) + manageCollectionContainmentNotification(eventuallyRemoved, removedObjects, newObjects, + notif) } } } @@ -191,9 +195,12 @@ public class BatchModelChangeListener { for (removedObject : removedObjects) { result.add(0, new RemovedObjectModelChange(removedObject)) } - + // And we remove changes registered in new/deleted objects - result.removeIf([c|c instanceof FieldModelChange && (newObjects.contains(c.changedObject) || removedObjects.contains(c.changedObject))]) + result.removeIf([ c | + c instanceof FieldModelChange && + (newObjects.contains(c.changedObject) || removedObjects.contains(c.changedObject) || eventuallyRemoved.contains(c.changedObject)) + ]) return result; } @@ -211,39 +218,42 @@ public class BatchModelChangeListener { registeredObservers.remove(observer) } - private static def void addToNewObjects(Collection removedObjects, Collection newObjects, - EObject object) { + private static def void addToNewObjects(Collection eventuallyRemoved, Collection removedObjects, + Collection newObjects, EObject object) { + eventuallyRemoved.remove(object) if (object != null) { val hasMoved = removedObjects.remove(object) - if (!hasMoved) + if (!hasMoved) { newObjects.add(object) + + } } } - private static def void addToRemovedObjects(Collection removedObjects, Collection newObjects, - EObject object) { + private static def void addToRemovedObjects(Collection eventuallyRemoved, + Collection removedObjects, Collection newObjects, EObject object) { + eventuallyRemoved.add(object) if (object != null) { val hasMoved = newObjects.remove(object) if (!hasMoved) removedObjects.add(object) - } } // TODO manage objects already contained in new objects ... ? - private static def void manageCollectionContainmentNotification(Collection removedObjects, - Collection newObjects, Notification notif) { + private static def void manageCollectionContainmentNotification(Collection eventuallyRemoved, + Collection removedObjects, Collection newObjects, Notification notif) { switch (notif.eventType) { case Notification.ADD: - addToNewObjects(removedObjects, newObjects, notif.newValue as EObject) + addToNewObjects(eventuallyRemoved, removedObjects, newObjects, notif.newValue as EObject) case Notification.ADD_MANY: for (add : notif.newValue as List) - addToNewObjects(removedObjects, newObjects, add) + addToNewObjects(eventuallyRemoved, removedObjects, newObjects, add) case Notification.REMOVE: - addToRemovedObjects(removedObjects, newObjects, notif.oldValue as EObject) + addToRemovedObjects(eventuallyRemoved, removedObjects, newObjects, notif.oldValue as EObject) case Notification.REMOVE_MANY: for (remove : notif.oldValue as List) - addToNewObjects(removedObjects, newObjects, remove) + addToNewObjects(eventuallyRemoved, removedObjects, newObjects, remove) } } From 55de1dccd04267f9c672bb08c09261ae2fb97ee6 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 11 Apr 2017 16:27:36 +0200 Subject: [PATCH 155/267] fr.inria.diverse.trace.gemoc.api: remove xtext/xtend nature --- .../plugins/fr.inria.diverse.trace.gemoc.api/.classpath | 1 - .../plugins/fr.inria.diverse.trace.gemoc.api/.project | 6 ------ 2 files changed, 7 deletions(-) diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.classpath b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.classpath index 428337e56..eca7bdba8 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.classpath +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.classpath @@ -3,6 +3,5 @@ - diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project index ad0021777..60e7deeb2 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project @@ -5,11 +5,6 @@ - - org.eclipse.xtext.ui.shared.xtextBuilder - - - org.eclipse.jdt.core.javabuilder @@ -35,6 +30,5 @@ org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature net.sf.eclipsecs.core.CheckstyleNature - org.eclipse.xtext.ui.shared.xtextNature From 3aa9314f8c832372e46c2c36cb6466e2532d0e3d Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 11 Apr 2017 16:49:50 +0200 Subject: [PATCH 156/267] [TraceMMGenerationTraceability] Cleanup imports --- .../TraceMMGenerationTraceability.xtend | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend index 9a20870a6..ed16fa885 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend @@ -10,17 +10,16 @@ *******************************************************************************/ package fr.inria.diverse.trace.metamodel.generator -import org.eclipse.emf.ecore.EClass -import java.util.Set -import org.eclipse.emf.ecore.EReference -import org.eclipse.xtend.lib.annotations.Accessors +import java.util.HashMap import java.util.HashSet import java.util.Map -import java.util.HashMap -import org.eclipse.emf.ecore.EStructuralFeature -import org.eclipse.emf.ecore.EClassifier +import java.util.Set import opsemanticsview.OperationalSemanticsView import opsemanticsview.Rule +import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EReference +import org.eclipse.emf.ecore.EStructuralFeature +import org.eclipse.xtend.lib.annotations.Accessors /** * Second output of the transformation: a class both to access to parts @@ -76,7 +75,7 @@ class TraceMMGenerationTraceability { tracedClasses.put(runtimeClass, tracedClass) } - public def EClass getTracedClass(org.eclipse.emf.ecore.EClass mutableClass) { + public def EClass getTracedClass(EClass mutableClass) { return tracedClasses.get(mutableClass) } @@ -120,7 +119,7 @@ class TraceMMGenerationTraceability { - public def EClass getRealMutableClass(org.eclipse.emf.ecore.EClass tracedClass) { + public def EClass getRealMutableClass(EClass tracedClass) { val mutClass = tracedClasses.entrySet.findFirst[p|p.value == tracedClass] if (mutClass != null) return mutClass.key @@ -136,7 +135,7 @@ class TraceMMGenerationTraceability { refs_originalObject.get(c1).add(r) } - public def Set getRefs_originalObject(org.eclipse.emf.ecore.EClass class1) { + public def Set getRefs_originalObject(EClass class1) { val Set res = new HashSet val existingRefs = class1.EAllSuperTypes.map[c|getRefs_originalObject(c)].flatten.toSet res.addAll(existingRefs) @@ -246,7 +245,7 @@ class TraceMMGenerationTraceability { private val Map mutablePropertyToValueProperty = new HashMap - def void putMutablePropertyToValueProperty(org.eclipse.emf.ecore.EStructuralFeature mutableProperty, org.eclipse.emf.ecore.EStructuralFeature valueProperty) { + def void putMutablePropertyToValueProperty(EStructuralFeature mutableProperty, EStructuralFeature valueProperty) { mutablePropertyToValueProperty.put(mutableProperty,valueProperty) } From 44425d8275d42a77e23b7cbee8ab174a247ef947 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 11 Apr 2017 16:50:32 +0200 Subject: [PATCH 157/267] [TraceConstructorGeneratorJava] Fix wrong generation addNewObject + cleanups --- .../codegen/TraceConstructorGeneratorJava.xtend | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend index b86bc1a3b..e1104225c 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -68,16 +68,8 @@ class TraceConstructorGeneratorJava { this.stateFQN = getJavaFQN(stateClass) this.specificStepFQN = getJavaFQN(specificStepClass) } - - def Set findAllConcreteSubTypes(EClass clazz) { - traceability.allMutableClasses.filter[c|!c.isAbstract && c.EAllSuperTypes.contains(clazz)].toSet - } - def Set findAllDirectConcreteSubTypes(EClass clazz) { - traceability.allMutableClasses.filter[c|!c.isAbstract && c.ESuperTypes.contains(clazz)].toSet - } - - def Set findAllDirectSubTypes(EClass clazz) { + private def Set findAllDirectSubTypes(EClass clazz) { traceability.allMutableClasses.filter[c|c.ESuperTypes.contains(clazz)].toSet } @@ -311,7 +303,7 @@ class TraceConstructorGeneratorJava { private def boolean shouldHaveAddNewObjectToStateMethod(EClass c){ val subTypes = findAllDirectSubTypes(c) - if (!c.abstract) + if (traceability.allMutableClasses.contains(c) && !c.abstract) return true if (subTypes.empty && c.abstract) return false @@ -321,7 +313,7 @@ class TraceConstructorGeneratorJava { return true } - return true + return false } private def String generateAddNewObjectToStateMethods() { @@ -524,7 +516,7 @@ private def String generateAddStateUsingListenerMethods() { «getJavaFQN(valueClass)» newValue = «EcoreCraftingUtil.stringCreate(valueClass)»; «val valueProperty = traceability.getValuePropertyOfMutableProperty(p)» - «IF p instanceof EReference» + «IF p instanceof EReference && shouldHaveAddNewObjectToStateMethod(p.EType)» «getJavaFQN(valueProperty.EType)» value = null; if (o_cast.«EcoreCraftingUtil.stringGetter(p)» != null) { addNewObjectToState(o_cast.«EcoreCraftingUtil.stringGetter(p)», newState); From 253a7cd431931851c39df4baf5059744afcc6e6e Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 12 Apr 2017 09:56:04 +0200 Subject: [PATCH 158/267] Removing lots of warnings - no real changes --- .../engine/ui/debug/AbstractGemocDebugger.java | 4 ++-- .../engine/commons/ModelExecutionContext.java | 4 ++-- .../eventmanager/views/EventManagerRenderer.java | 4 ++-- .../services/AbstractGemocAnimatorServices.java | 4 ++-- .../ui/views/engine/EnginesStatusView.java | 10 +++++----- .../gemoc/xdsmlframework/api/core/EngineStatus.java | 2 +- .../api/engine_addon/DefaultEngineAddon.java | 4 ++-- .../api/engine_addon/IEngineAddon.java | 4 ++-- .../inria/diverse/trace/gemoc/api/IStepFactory.java | 2 +- .../metamodel/generator/TraceMMGenerator.xtend | 13 ++++++------- .../META-INF/MANIFEST.MF | 2 +- 11 files changed, 26 insertions(+), 27 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java index 381af6ab7..4a39ef894 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java @@ -495,11 +495,11 @@ public void engineStatusChanged(IExecutionEngine engine, RunStatus newStatus) { } @Override - public void aboutToSelectStep(IExecutionEngine engine, Collection logicalSteps) { + public void aboutToSelectStep(IExecutionEngine engine, Collection> logicalSteps) { } @Override - public void proposedStepsChanged(IExecutionEngine engine, Collection logicalSteps) { + public void proposedStepsChanged(IExecutionEngine engine, Collection> logicalSteps) { } @Override diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java index e64eb8503..f2070fc58 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java @@ -25,7 +25,7 @@ import org.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension; import org.osgi.framework.Bundle; -abstract public class ModelExecutionContext implements IExecutionContext { +public abstract class ModelExecutionContext implements IExecutionContext { protected IRunConfiguration _runConfiguration; @@ -103,7 +103,7 @@ protected IExecutionPlatform createExecutionPlatform() throws CoreException { return new DefaultExecutionPlatform(_languageDefinition, _runConfiguration); } - abstract protected LanguageDefinitionExtension getLanguageDefinition(String languageName) throws EngineContextException; + protected abstract LanguageDefinitionExtension getLanguageDefinition(String languageName) throws EngineContextException; private ResourceSet getResourceSet() { return _resourceModel.getResourceSet(); diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java index a915fd6d9..d36f1cbae 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java @@ -237,10 +237,10 @@ public List validate(List otherAddons) { } @Override - public void aboutToSelectStep(IExecutionEngine engine, Collection steps) { + public void aboutToSelectStep(IExecutionEngine engine, Collection> steps) { } @Override - public void proposedStepsChanged(IExecutionEngine engine, Collection steps) { + public void proposedStepsChanged(IExecutionEngine engine, Collection> steps) { } } diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index 4330af98d..535e33ae8 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -363,7 +363,7 @@ public boolean isRepresentationToRefresh(String representationId, } @Override - public void proposedStepsChanged(IExecutionEngine engine, Collection logicalSteps) { + public void proposedStepsChanged(IExecutionEngine engine, Collection> logicalSteps) { } @Override @@ -384,7 +384,7 @@ public List validate(List otherAddons) { } @Override - public void aboutToSelectStep(IExecutionEngine engine, Collection logicalSteps) { + public void aboutToSelectStep(IExecutionEngine engine, Collection> logicalSteps) { } @Override diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java index a29c00794..d3533040a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java @@ -410,7 +410,7 @@ public void engineStarted(IExecutionEngine engine) } @Override - public void aboutToExecuteStep(IExecutionEngine executionEngine, Step logicalStepToApply) + public void aboutToExecuteStep(IExecutionEngine executionEngine, Step logicalStepToApply) { } @@ -426,19 +426,19 @@ public void engineStopped(IExecutionEngine engine) } @Override - public void aboutToSelectStep(IExecutionEngine engine, Collection logicalSteps) + public void aboutToSelectStep(IExecutionEngine engine, Collection> logicalSteps) { reselectEngine(engine); } @Override - public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) { + public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) { // TODO Auto-generated method stub } @Override - public void stepExecuted(IExecutionEngine engine, Step logicalStepExecuted) { + public void stepExecuted(IExecutionEngine engine, Step logicalStepExecuted) { reselectEngine(engine); // need to update the executed step count in the view } @@ -450,7 +450,7 @@ public void engineStatusChanged(IExecutionEngine engine, RunStatus newStatus) { } @Override - public void proposedStepsChanged(IExecutionEngine engine, Collection logicalSteps) { + public void proposedStepsChanged(IExecutionEngine engine, Collection> logicalSteps) { reselectEngine(engine); } diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java index 111e591c4..5532650dd 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java @@ -15,7 +15,7 @@ public class EngineStatus { long nbLogicalStepRun = 0; - Step chosenLogicalStep; + Step chosenLogicalStep; public enum RunStatus { Initializing, Running, WaitingLogicalStepSelection, Stopped} diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java index dae01ed66..2c7327a25 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java @@ -30,7 +30,7 @@ public void engineStarted(IExecutionEngine executionEngine) { } @Override - public void aboutToSelectStep(IExecutionEngine engine, Collection steps) { + public void aboutToSelectStep(IExecutionEngine engine, Collection> steps) { } @Override @@ -58,7 +58,7 @@ public void stepExecuted(IExecutionEngine engine, Step stepExecuted) { } @Override - public void proposedStepsChanged(IExecutionEngine engine, Collection steps) { + public void proposedStepsChanged(IExecutionEngine engine, Collection> steps) { } @Override diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java index 9733e8ef3..72f057020 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java @@ -51,9 +51,9 @@ default public void engineInitialized(IExecutionEngine executionEngine) { /** * Operation called before the Step has been chosen */ - public void aboutToSelectStep(IExecutionEngine engine, Collection steps); + public void aboutToSelectStep(IExecutionEngine engine, Collection> steps); - public void proposedStepsChanged(IExecutionEngine engine, Collection steps); + public void proposedStepsChanged(IExecutionEngine engine, Collection> steps); /** * Operation called after the Step has been chosen It also returns the diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStepFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStepFactory.java index ed63768b1..af791c192 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStepFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStepFactory.java @@ -17,7 +17,7 @@ public interface IStepFactory { - public Step createStep( + public Step createStep( MSE mse, List parameters, List result); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend index 8d5d6fccd..ff33fcace 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend @@ -12,20 +12,19 @@ package fr.inria.diverse.trace.metamodel.generator import fr.inria.diverse.trace.commons.EMFUtil import java.io.IOException +import java.util.Set +import opsemanticsview.OperationalSemanticsView +import org.eclipse.emf.codegen.ecore.genmodel.GenPackage +import org.eclipse.emf.common.util.Diagnostic import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl +import org.eclipse.emf.ecore.util.Diagnostician import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl import org.eclipse.xtend.lib.annotations.Accessors -import org.eclipse.emf.ecore.EClass -import org.eclipse.emf.ecore.util.Diagnostician -import org.eclipse.emf.common.util.Diagnostic -import java.util.Set -import org.eclipse.emf.codegen.ecore.genmodel.GenPackage -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import opsemanticsview.OperationalSemanticsView class TraceMMGenerator { diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF index 9dd5ed236..b02648bc2 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: com.google.guava, org.eclipse.ui, org.eclipse.emf.ecore;bundle-version="2.10.2" Export-Package: fr.inria.diverse.trace.commons.testutil -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 From 7c5c608c4a6f90554206da7813db34cf7566870b Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 12 Apr 2017 09:56:35 +0200 Subject: [PATCH 159/267] [DefaultModelLoader] Make methods and classes private+static --- .../modelloader/DefaultModelLoader.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index 87a6a0e88..838359507 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -92,6 +92,13 @@ */ @SuppressWarnings("restriction") public class DefaultModelLoader implements IModelLoader { + + IProgressMonitor progressMonitor; + + @Override + public void setProgressMonitor(IProgressMonitor progressMonitor) { + this.progressMonitor = progressMonitor; + } /** * Load the executed model without Sirius animation. @@ -104,7 +111,7 @@ public class DefaultModelLoader implements IModelLoader { * if anything goes wrong (eg. the model cannot be found). */ public Resource loadModel(IExecutionContext context) throws RuntimeException { - return loadModel(context, false); + return loadModel(context, false, progressMonitor); } /** @@ -118,7 +125,7 @@ public Resource loadModel(IExecutionContext context) throws RuntimeException { * if anything goes wrong (eg. the model cannot be found) */ public Resource loadModelForAnimation(IExecutionContext context) throws RuntimeException { - return loadModel(context, true); + return loadModel(context, true, progressMonitor); } /** @@ -134,10 +141,10 @@ public Resource loadModelForAnimation(IExecutionContext context) throws RuntimeE * @throws RuntimeException * if anything goes wrong (eg. the model cannot be found) */ - private Resource loadModel(IExecutionContext context, boolean withAnimation) throws RuntimeException { + private static Resource loadModel(IExecutionContext context, boolean withAnimation, IProgressMonitor progressMonitor) throws RuntimeException { // Common part: preparing URI + resource set - SubMonitor subMonitor = SubMonitor.convert(this.progressMonitor, 10); + SubMonitor subMonitor = SubMonitor.convert(progressMonitor, 10); boolean useMelange = context.getRunConfiguration().getMelangeQuery() != null && !context.getRunConfiguration().getMelangeQuery().isEmpty(); URI modelURI = null; @@ -186,7 +193,7 @@ private Resource loadModel(IExecutionContext context, boolean withAnimation) thr } - private void killPreviousSiriusSession(URI sessionResourceURI) { + private static void killPreviousSiriusSession(URI sessionResourceURI) { final Session session = SessionManager.INSTANCE.getExistingSession(sessionResourceURI); if (session != null) { final IEditingSession uiSession = SessionUIManager.INSTANCE.getUISession(session); @@ -223,7 +230,7 @@ public void run() { } } - private Session openNewSiriusSession(final IExecutionContext context, URI sessionResourceURI, ResourceSet rs, + private static Session openNewSiriusSession(final IExecutionContext context, URI sessionResourceURI, ResourceSet rs, URI modelURI, SubMonitor subMonitor) throws CoreException { subMonitor.subTask("Loading model"); @@ -366,7 +373,7 @@ protected void doExecute() { return session; } - private ResourceSet createAndConfigureResourceSet(URI modelURI, HashMap nsURIMapping, + private static ResourceSet createAndConfigureResourceSet(URI modelURI, HashMap nsURIMapping, SubMonitor subMonitor) { subMonitor.subTask("Configuring ResourceSet"); @@ -419,7 +426,7 @@ protected static HashMap getnsURIMapping(IExecutionContext conte return nsURIMapping; } - class MelangeURIConverter extends ExtensibleURIConverterImpl { + private static class MelangeURIConverter extends ExtensibleURIConverterImpl { private HashMap _nsURIMapping; @@ -476,7 +483,7 @@ private String convertStreamToString(java.io.InputStream is) { * @author dvojtise * */ - class XMLURIHandler extends XtextPlatformResourceURIHandler { + private static class XMLURIHandler extends XtextPlatformResourceURIHandler { private String _queryParameters; private String _fileExtension; @@ -510,11 +517,6 @@ public URI resolve(URI uri) { } } - IProgressMonitor progressMonitor; - @Override - public void setProgressMonitor(IProgressMonitor progressMonitor) { - this.progressMonitor = progressMonitor; - } } From 9a0a4bbb0fbfe824b9f0f966b7d582fcae76e728 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 12 Apr 2017 11:25:02 +0200 Subject: [PATCH 160/267] [DefaultModelLoader] Make convertStreamToString static --- .../extensions/sirius/modelloader/DefaultModelLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index 838359507..5e55a0517 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -466,7 +466,7 @@ public InputStream createInputStream(URI uri, Map options) throws IOExcept } - private String convertStreamToString(java.io.InputStream is) { + private static String convertStreamToString(java.io.InputStream is) { java.util.Scanner s1 = new java.util.Scanner(is); java.util.Scanner s2 = s1.useDelimiter("\\A"); String result = s2.hasNext() ? s2.next() : ""; From 9082dbd0da67a63e460b21931478b09777769744 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 12 Apr 2017 11:25:43 +0200 Subject: [PATCH 161/267] [AbstractTraceAddon] Remove dead code + cleanup API --- .../api/IMultiDimensionalTraceAddon.java | 5 +++++ .../gemoc/traceaddon/AbstractTraceAddon.xtend | 21 ++++--------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java index ba8e486a1..b4037783d 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java @@ -10,6 +10,8 @@ *******************************************************************************/ package fr.inria.diverse.trace.gemoc.api; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.trace.commons.model.trace.Dimension; @@ -30,4 +32,7 @@ public interface IMultiDimensionalTraceAddon, StateS IStepFactory getFactory(); + void load(Resource traceResource); + + boolean isAddonForTrace(EObject traceRoot); } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index bc1067dbb..18b0ce7ca 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -23,7 +23,6 @@ import fr.inria.diverse.trace.gemoc.api.IStateManager import fr.inria.diverse.trace.gemoc.api.ITraceConstructor import fr.inria.diverse.trace.gemoc.api.ITraceExplorer import fr.inria.diverse.trace.gemoc.api.ITraceExtractor -import fr.inria.diverse.trace.gemoc.api.ITraceListener import fr.inria.diverse.trace.gemoc.api.ITraceNotifier import java.util.ArrayList import java.util.HashSet @@ -62,11 +61,9 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi public static AbstractTraceAddon instance - abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map> exeToTraced) + protected abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map> exeToTraced) - abstract def IStateManager> constructStateManager(Resource modelResource, Map, EObject> tracedToExe) - - abstract def boolean isAddonForTrace(EObject traceRoot) + protected abstract def IStateManager> constructStateManager(Resource modelResource, Map, EObject> tracedToExe) override getTraceExplorer() { return traceExplorer @@ -83,18 +80,8 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi override getTraceNotifier() { return traceNotifier } - - private val List listeners = new ArrayList - - def void addListener(ITraceListener listener) { listeners.add(listener) } - - def void removeListener(ITraceListener listener) { listeners.remove(listener) } - - public def void disableTraceSaving() { - shouldSave = false - } - - public def void load(Resource traceResource) { + + public override void load(Resource traceResource) { val root = traceResource.contents.head if (root instanceof Trace) { val trace = root as Trace,TracedObject,State> From 3ce704c5011acd1cdd4a0bcc5f792dcd89b5fcfc Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 12 Apr 2017 14:46:44 +0200 Subject: [PATCH 162/267] [BatchModelChangeListener] Make fields finals --- .../modelchangelistener/BatchModelChangeListener.xtend | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend index 4e0e21bb1..0816a1fcc 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend @@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.util.EContentAdapter */ public class BatchModelChangeListener { - private EContentAdapter adapter; - private Map> changes = new HashMap - private Set registeredObservers = new HashSet - private Set observedResources + private val EContentAdapter adapter; + private val Map> changes = new HashMap + private val Set registeredObservers = new HashSet + private val Set observedResources = new HashSet public new(Set resources) { /* @@ -58,7 +58,7 @@ public class BatchModelChangeListener { } }; - observedResources = resources + observedResources.addAll(resources) observedResources.forEach [ r | if (r != null) { From 6376ca15a83a5823294264b9744480dbf2b26038 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 12 Apr 2017 15:40:51 +0200 Subject: [PATCH 163/267] [GenericTraceExtractor] Disable "updateEquivalenceClasses" for now --- .../diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java index 33357c9ba..2c276a74f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -560,7 +560,7 @@ private void updateEquivalenceClasses(List> states) { @Override public void statesAdded(List> states) { - updateEquivalenceClasses(states); + //updateEquivalenceClasses(states); notifyListeners(); } From 583da36f67ad22d87b86562f26a8c13af3519f0b Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 13 Apr 2017 16:04:01 +0200 Subject: [PATCH 164/267] [AbstractTraceAddon] Remove singleton + make manageStep private --- .../diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index 18b0ce7ca..70f6e9e10 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -56,11 +56,8 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi private BatchModelChangeListener traceListener private boolean shouldSave = true private var boolean needTransaction = true - private BatchModelChangeListener listenerAddon - public static AbstractTraceAddon instance - protected abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map> exeToTraced) protected abstract def IStateManager> constructStateManager(Resource modelResource, Map, EObject> tracedToExe) @@ -110,7 +107,7 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi manageStep(step, false) } - protected def manageStep(Step step, boolean add) { + private def manageStep(Step step, boolean add) { if (step != null) { modifyTrace([ traceConstructor.addState(listenerAddon.getChanges(this)) @@ -184,7 +181,6 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi traceNotifier.addListener(traceExplorer) } } - instance = this; } /** From d54eeea9ccb8939261ee63a071f34818b46b154f Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 18 Apr 2017 11:26:46 +0200 Subject: [PATCH 165/267] [AbstractExecutionEngine] Change Step to Step --- .../engine/core/AbstractExecutionEngine.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java index 6fdb1ced4..461e7beb1 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java @@ -64,7 +64,7 @@ public abstract class AbstractExecutionEngine implements IExecutionEngine, IDisp public Throwable error = null; protected InternalTransactionalEditingDomain editingDomain; private EMFCommandTransaction currentTransaction; - private Deque currentSteps = new ArrayDeque<>(); + private Deque> currentSteps = new ArrayDeque<>(); abstract protected void performStart(); @@ -209,7 +209,7 @@ protected void notifyEngineStatusChanged(RunStatus newStatus) { } } - protected void notifyAboutToExecuteLogicalStep(Step l) { + protected void notifyAboutToExecuteLogicalStep(Step l) { for (IEngineAddon addon : getExecutionContext().getExecutionPlatform().getEngineAddons()) { try { addon.aboutToExecuteStep(this, l); @@ -224,7 +224,7 @@ protected void notifyAboutToExecuteLogicalStep(Step l) { } } - protected void notifyLogicalStepExecuted(Step l) { + protected void notifyLogicalStepExecuted(Step l) { for (IEngineAddon addon : getExecutionContext().getExecutionPlatform().getEngineAddons()) { try { addon.stepExecuted(this, l); @@ -389,7 +389,7 @@ private void commitCurrentTransaction() { @Override public final Deque getCurrentStack() { Deque result = new ArrayDeque(); - for (Step ls : currentSteps) { + for (Step ls : currentSteps) { result.add(ls.getMseoccurrence()); } return result; @@ -433,7 +433,7 @@ protected final void stopExecutionIfAsked() { } } - protected final void beforeExecutionStep(Step step) { + protected final void beforeExecutionStep(Step step) { // We will trick the transaction with an empty command. This most // probably make rollbacks impossible, but at least we can manage @@ -452,7 +452,7 @@ protected void doExecute() { * To be called just after each execution step by an implementing engine. If * the step was done through a RecordingCommand, it can be given. */ - protected final void beforeExecutionStep(Step step, RecordingCommand rc) { + protected final void beforeExecutionStep(Step step, RecordingCommand rc) { try { @@ -485,7 +485,7 @@ private boolean isInStep() { boolean containsNotNull = false; - for (Step ls : currentSteps) { + for (Step ls : currentSteps) { if (ls != null && ls.getMseoccurrence() != null) { containsNotNull = true; break; @@ -505,7 +505,7 @@ protected void afterExecutionStep() { try { - Step step = currentSteps.pop(); + Step step = currentSteps.pop(); // We commit the transaction (which might be a different one // than the one created earlier, or null if two operations From 55fe949613461cf12671567e0ffc92fe18cbd24b Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Wed, 19 Apr 2017 23:40:32 +0200 Subject: [PATCH 166/267] [Debug-Layer] Fix compilation errors of generated service class --- .../sirius/command/AddDebugLayerHandler.java | 18 +++++++++++++ .../command/debug_services_template.txt | 7 ++++- .../NewGemocDebugRepresentationWizard.java | 26 +++---------------- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java index 430b12df9..a3dabac91 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java @@ -66,6 +66,10 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolPackage; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.handlers.HandlerUtil; +import org.gemoc.xdsmlframework.extensions.sirius.Activator; +import org.osgi.framework.BundleException; + +import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; public class AddDebugLayerHandler extends AbstractHandler { @@ -114,6 +118,8 @@ protected void doExecute() { qualifiedServiceClassName); } }); + + updateManifest(project); } } catch (IOException e) { throw new ExecutionException( @@ -124,6 +130,18 @@ protected void doExecute() { } return null; } + + public static void updateManifest(final IProject project){ + ManifestChanger changer = new ManifestChanger(project); + try { + changer.addPluginDependency("org.gemoc.executionframework.extensions.sirius"); + changer.addPluginDependency("org.gemoc.execution.sequential.javaengine.ui"); + changer.commit(); + } catch (BundleException | IOException | CoreException e) { + Activator.getMessagingSystem().error(e.getMessage(), + Activator.PLUGIN_ID, e); + } + } public static void emfModifications(final IProgressMonitor monitor, final String layerName, final DiagramDescription description, diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt index ef048779c..8b1cd6c61 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt @@ -1,4 +1,4 @@ -package PACKAGE; +package PACKAGE; import java.util.ArrayList; import java.util.List; @@ -15,5 +15,10 @@ public class CLASS_NAME extends AbstractGemocDebuggerServices { return res; } + + @Override + public String getModelIdentifier(){ + return org.gemoc.execution.sequential.javaengine.ui.Activator.DEBUG_MODEL_ID; + } } diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java index ebdb0ff31..543c4e978 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java @@ -50,9 +50,6 @@ import org.gemoc.xdsmlframework.extensions.sirius.wizards.pages.DebugRepresentationSelectionPage; import org.gemoc.xdsmlframework.extensions.sirius.wizards.pages.NewViewPointProjectPage; import org.gemoc.xdsmlframework.extensions.sirius.wizards.pages.SelectDiagramDefinitionPage; -import org.osgi.framework.BundleException; - -import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; /** * Wizard to create a new debug representation. @@ -64,7 +61,7 @@ public class NewGemocDebugRepresentationWizard extends Wizard implements IWorkbenchWizard { private String initialLanguageName = "myLanguage"; - private String initialProjectName = initialLanguageName; + private String initialProjectName = initialLanguageName.toLowerCase(); private class FinishRunnable implements IRunnableWithProgress { @@ -100,15 +97,7 @@ group, getNewViewPointProjectPage() AddDebugLayerHandler.emfModifications(monitor, layerName, diagramDescription, languageName, qualifiedServiceClassName); - // Additional project configurations - ManifestChanger changer = new ManifestChanger(project); - try { - changer.addPluginDependency("org.gemoc.executionframework.extensions.sirius"); - changer.commit(); - } catch (BundleException | IOException | CoreException e) { - Activator.getMessagingSystem().error(e.getMessage(), - Activator.PLUGIN_ID, e); - } + AddDebugLayerHandler.updateManifest(project); } catch (CoreException e) { Activator.getMessagingSystem().error(e.getMessage(), Activator.PLUGIN_ID, e); @@ -149,15 +138,7 @@ group, getNewViewPointProjectPage() AddDebugLayerHandler.emfModifications(monitor, layerName, diagramExtensionDescription, languageName, qualifiedServiceClassName); - // Additional project configurations - ManifestChanger changer = new ManifestChanger(project); - try { - changer.addPluginDependency("org.gemoc.executionframework.extensions.sirius"); - changer.commit(); - } catch (BundleException | IOException | CoreException e) { - Activator.getMessagingSystem().error(e.getMessage(), - Activator.PLUGIN_ID, e); - } + AddDebugLayerHandler.updateManifest(project); } catch (CoreException e) { Activator.getMessagingSystem().error(e.getMessage(), Activator.PLUGIN_ID, e); @@ -215,6 +196,7 @@ group, getNewViewPointProjectPage() AddDebugLayerHandler.emfModifications(monitor, layerName, diagramDescription, languageName, qualifiedServiceClassName); + AddDebugLayerHandler.updateManifest(project); } catch (IOException e) { Activator.getMessagingSystem().error(e.getMessage(), Activator.PLUGIN_ID, e); From b652ddf0336e9cd363f449cb8727420acab92788 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Mon, 24 Apr 2017 16:47:27 +0200 Subject: [PATCH 167/267] improved template documentation in order to take into account other engines. see GH-17 and https://github.com/gemoc/gemoc-studio/issues/25 --- .../extensions/sirius/command/debug_services_template.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt index 8b1cd6c61..e84243716 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt @@ -18,6 +18,12 @@ public class CLASS_NAME extends AbstractGemocDebuggerServices { @Override public String getModelIdentifier(){ + // Important Note: + // by default the wizard generates a ModelIdentifier linked with the sequential engine. + // ie. return org.gemoc.execution.sequential.javaengine.ui.Activator.DEBUG_MODEL_ID; + // however, if the Debug service is to be used by another engine, you must use the targeted engine's + // debug model id and update the manifest dependencies accordingly. + // for example, org.gemoc.execution.concurrent.ccsljavaengine.ui.Activator.DEBUG_MODEL_ID for the concurrent engine. return org.gemoc.execution.sequential.javaengine.ui.Activator.DEBUG_MODEL_ID; } From 65b1e573ad0af3d265ccd8be064acc6ab2f0c0a9 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Mon, 24 Apr 2017 17:57:05 +0200 Subject: [PATCH 168/267] added comment in the template in order to help the users see bug https://github.com/SiriusLab/ModelDebugging/issues/15 --- .../sirius/command/debug_services_template.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt index e84243716..24d64009b 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt @@ -9,8 +9,16 @@ public class CLASS_NAME extends AbstractGemocDebuggerServices { @Override protected List getRepresentationRefreshList() { + // Add in res the list of layers that should be activated and refreshed while debugging the model + // in case of a single odesign with all layers in a single viewpoint: + // - the first String is the id of the Diagram Description + // - the second String is the id of the Layer + // + // in case of a diagram extension: + // - the first String is the Representation Name of the Diagram Extension (do not confuse with the Name !!) + // - the second String is the id of the Layer final List res = new ArrayList(); - + res.add(new StringCouple("LANGUAGE_NAME", "LAYER_NAME")); return res; From 04e29ea3e72b1fd09d4903be5d48d8539b38df09 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 27 Apr 2017 11:55:12 +0200 Subject: [PATCH 169/267] [generic trace metamodel] fix wrong type hierarchy --- .../model/GenericTraceImpl.ecore | 149 ++++++++---------- .../generictrace/GenericParallelStep.java | 4 +- .../model/generictrace/GenericSmallStep.java | 4 +- .../impl/GenericParallelStepImpl.java | 11 ++ .../impl/GenerictracePackageImpl.java | 9 +- .../util/GenerictraceAdapterFactory.java | 38 +++++ .../generictrace/util/GenerictraceSwitch.java | 34 ++++ 7 files changed, 163 insertions(+), 86 deletions(-) diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore index 16449c8bb..1cd71393a 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore @@ -1,117 +1,104 @@ - + - - - - - + + + + - - - - - + + + + - - + + + + + + + - - - - - - + + + - +
    - - - - - - - + + + + - - - - + + + - + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + - - - + + - - - - + + - - - - + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java index 7cddf72fe..5a17d05f7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java @@ -2,7 +2,7 @@ */ package fr.inria.diverse.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.ParallelStep; /** @@ -15,5 +15,5 @@ * @model * @generated */ -public interface GenericParallelStep extends GenericStep, BigStep { +public interface GenericParallelStep extends GenericStep, ParallelStep { } // GenericParallelStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSmallStep.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSmallStep.java index facc30ece..2ec2aa030 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSmallStep.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSmallStep.java @@ -2,6 +2,8 @@ */ package fr.inria.diverse.trace.commons.model.generictrace; +import fr.inria.diverse.trace.commons.model.trace.SmallStep; + /** * @@ -13,5 +15,5 @@ * @model * @generated */ -public interface GenericSmallStep extends GenericStep { +public interface GenericSmallStep extends GenericStep, SmallStep { } // GenericSmallStep diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java index d7822e282..36ed857a7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java @@ -7,6 +7,7 @@ import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; import fr.inria.diverse.trace.commons.model.trace.BigStep; +import fr.inria.diverse.trace.commons.model.trace.ParallelStep; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; @@ -158,6 +159,11 @@ public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { default: return -1; } } + if (baseClass == ParallelStep.class) { + switch (derivedFeatureID) { + default: return -1; + } + } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } @@ -174,6 +180,11 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { default: return -1; } } + if (baseClass == ParallelStep.class) { + switch (baseFeatureID) { + default: return -1; + } + } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java index a5231b51c..559912c84 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java @@ -664,13 +664,18 @@ public void initializePackageContents() { genericSequentialStepEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(this.getGenericStep()); genericParallelStepEClass.getEGenericSuperTypes().add(g1); - g1 = createEGenericType(theTracePackage.getBigStep()); + g1 = createEGenericType(theTracePackage.getParallelStep()); g2 = createEGenericType(this.getGenericStep()); g1.getETypeArguments().add(g2); g2 = createEGenericType(this.getGenericState()); g1.getETypeArguments().add(g2); genericParallelStepEClass.getEGenericSuperTypes().add(g1); - genericSmallStepEClass.getESuperTypes().add(this.getGenericStep()); + g1 = createEGenericType(this.getGenericStep()); + genericSmallStepEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theTracePackage.getSmallStep()); + g2 = createEGenericType(this.getGenericState()); + g1.getETypeArguments().add(g2); + genericSmallStepEClass.getEGenericSuperTypes().add(g1); genericReferenceValueEClass.getESuperTypes().add(this.getGenericValue()); g1 = createEGenericType(theTracePackage.getDimension()); g2 = createEGenericType(this.getGenericValue()); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java index 80f1a634a..7cb8f7e1b 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java @@ -6,7 +6,9 @@ import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.ParallelStep; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.SmallStep; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; @@ -165,6 +167,14 @@ public Adapter caseManyReferenceValue(ManyReferenceValue object) { return createSequentialStepAdapter(); } @Override + public , StateSubType extends State> Adapter caseParallelStep(ParallelStep object) { + return createParallelStepAdapter(); + } + @Override + public > Adapter caseSmallStep(SmallStep object) { + return createSmallStepAdapter(); + } + @Override public > Adapter caseValue(Value object) { return createValueAdapter(); } @@ -512,6 +522,34 @@ public Adapter createSequentialStepAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ParallelStep Parallel Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.ParallelStep + * @generated + */ + public Adapter createParallelStepAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.trace.SmallStep + * @generated + */ + public Adapter createSmallStepAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java index 063884765..910ebf247 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java @@ -6,7 +6,9 @@ import fr.inria.diverse.trace.commons.model.trace.BigStep; import fr.inria.diverse.trace.commons.model.trace.Dimension; +import fr.inria.diverse.trace.commons.model.trace.ParallelStep; import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import fr.inria.diverse.trace.commons.model.trace.SmallStep; import fr.inria.diverse.trace.commons.model.trace.State; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.inria.diverse.trace.commons.model.trace.Trace; @@ -89,6 +91,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { GenericParallelStep genericParallelStep = (GenericParallelStep)theEObject; T result = caseGenericParallelStep(genericParallelStep); if (result == null) result = caseGenericStep(genericParallelStep); + if (result == null) result = caseParallelStep(genericParallelStep); if (result == null) result = caseBigStep(genericParallelStep); if (result == null) result = caseStep(genericParallelStep); if (result == null) result = defaultCase(theEObject); @@ -98,6 +101,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { GenericSmallStep genericSmallStep = (GenericSmallStep)theEObject; T result = caseGenericSmallStep(genericSmallStep); if (result == null) result = caseGenericStep(genericSmallStep); + if (result == null) result = caseSmallStep(genericSmallStep); if (result == null) result = caseStep(genericSmallStep); if (result == null) result = defaultCase(theEObject); return result; @@ -566,6 +570,36 @@ public T caseManyReferenceValue(ManyReferenceValue object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Parallel Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Parallel Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public , StateSubType extends State> T caseParallelStep(ParallelStep object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Small Step'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Small Step'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public > T caseSmallStep(SmallStep object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Value'. * From acaee390ca9485918c1c28e6a3e37733628ff7f0 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 27 Apr 2017 11:55:36 +0200 Subject: [PATCH 170/267] [reflective trace] remove old unused generated classes --- .../src/gemoc_execution_trace/Branch.java | 107 -- .../src/gemoc_execution_trace/Choice.java | 232 ---- .../gemoc_execution_trace/ContextState.java | 118 -- .../ExecutionTraceModel.java | 86 -- .../Gemoc_execution_traceFactory.java | 97 -- .../Gemoc_execution_tracePackage.java | 1000 ----------------- .../src/gemoc_execution_trace/ModelState.java | 81 -- .../gemoc_execution_trace/SolverState.java | 87 -- .../impl/BranchImpl.java | 301 ----- .../impl/ChoiceImpl.java | 622 ---------- .../impl/ContextStateImpl.java | 362 ------ .../impl/ExecutionTraceModelImpl.java | 236 ---- .../Gemoc_execution_traceFactoryImpl.java | 209 ---- .../Gemoc_execution_tracePackageImpl.java | 546 --------- .../impl/ModelStateImpl.java | 240 ---- .../impl/SolverStateImpl.java | 235 ---- .../Gemoc_execution_traceAdapterFactory.java | 220 ---- .../util/Gemoc_execution_traceSwitch.java | 225 ---- 18 files changed, 5004 deletions(-) delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Branch.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Choice.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ContextState.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ExecutionTraceModel.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_traceFactory.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_tracePackage.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ModelState.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/SolverState.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/BranchImpl.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ChoiceImpl.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ContextStateImpl.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ModelStateImpl.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/SolverStateImpl.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java delete mode 100644 framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Branch.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Branch.java deleted file mode 100644 index 1dce137b9..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Branch.java +++ /dev/null @@ -1,107 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ - -package gemoc_execution_trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Branch'. - * - * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link gemoc_execution_trace.Branch#getStartIndex Start Index}
      • - *
    • {@link gemoc_execution_trace.Branch#getStopIndex Stop Index}
      • - *
    • {@link gemoc_execution_trace.Branch#getChoices Choices}
      • - *
    - * - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch() - * @model - * @generated - */ -public interface Branch extends EObject { - /** - * Returns the value of the 'Start Index' attribute. - * - *

    - * If the meaning of the 'Start Index' attribute isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Start Index' attribute. - * @see #setStartIndex(int) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch_StartIndex() - * @model - * @generated - */ - int getStartIndex(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.Branch#getStartIndex Start Index}' attribute. - * - * - * @param value the new value of the 'Start Index' attribute. - * @see #getStartIndex() - * @generated - */ - void setStartIndex(int value); - - /** - * Returns the value of the 'Stop Index' attribute. - * - *

    - * If the meaning of the 'Stop Index' attribute isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Stop Index' attribute. - * @see #setStopIndex(int) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch_StopIndex() - * @model - * @generated - */ - int getStopIndex(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.Branch#getStopIndex Stop Index}' attribute. - * - * - * @param value the new value of the 'Stop Index' attribute. - * @see #getStopIndex() - * @generated - */ - void setStopIndex(int value); - - /** - * Returns the value of the 'Choices' reference list. - * The list contents are of type {@link gemoc_execution_trace.Choice}. - * It is bidirectional and its opposite is '{@link gemoc_execution_trace.Choice#getBranch Branch}'. - * - *

    - * If the meaning of the 'Choices' reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Choices' reference list. - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch_Choices() - * @see gemoc_execution_trace.Choice#getBranch - * @model opposite="branch" - * @generated - */ - EList getChoices(); - -} // Branch diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Choice.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Choice.java deleted file mode 100644 index be136fad1..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Choice.java +++ /dev/null @@ -1,232 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace; - -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.Step; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Choice'. - * - * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link gemoc_execution_trace.Choice#getNextChoices Next Choices}
      • - *
    • {@link gemoc_execution_trace.Choice#getPossibleLogicalSteps Possible Logical Steps}
      • - *
    • {@link gemoc_execution_trace.Choice#getChosenLogicalStep Chosen Logical Step}
      • - *
    • {@link gemoc_execution_trace.Choice#getContextState Context State}
      • - *
    • {@link gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}
      • - *
    • {@link gemoc_execution_trace.Choice#getSelectedNextChoice Selected Next Choice}
      • - *
    • {@link gemoc_execution_trace.Choice#getBranch Branch}
      • - *
    • {@link gemoc_execution_trace.Choice#getOwnedMSEOccurrences Owned MSE Occurrences}
      • - *
    - * - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice() - * @model - * @generated - */ -public interface Choice extends EObject { - /** - * Returns the value of the 'Next Choices' reference list. - * The list contents are of type {@link gemoc_execution_trace.Choice}. - * It is bidirectional and its opposite is '{@link gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}'. - * - *

    - * If the meaning of the 'Next Choices' reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Next Choices' reference list. - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_NextChoices() - * @see gemoc_execution_trace.Choice#getPreviousChoice - * @model opposite="previousChoice" - * @generated - */ - EList getNextChoices(); - - /** - * Returns the value of the 'Possible Logical Steps' containment reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.Step}. - * - *

    - * If the meaning of the 'Possible Logical Steps' containment reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Possible Logical Steps' containment reference list. - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_PossibleLogicalSteps() - * @model containment="true" - * @generated - */ - EList getPossibleLogicalSteps(); - - /** - * Returns the value of the 'Chosen Logical Step' reference. - * - *

    - * If the meaning of the 'Chosen Logical Step' reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Chosen Logical Step' reference. - * @see #setChosenLogicalStep(Step) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_ChosenLogicalStep() - * @model - * @generated - */ - Step getChosenLogicalStep(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.Choice#getChosenLogicalStep Chosen Logical Step}' reference. - * - * - * @param value the new value of the 'Chosen Logical Step' reference. - * @see #getChosenLogicalStep() - * @generated - */ - void setChosenLogicalStep(Step value); - - /** - * Returns the value of the 'Context State' containment reference. - * It is bidirectional and its opposite is '{@link gemoc_execution_trace.ContextState#getChoice Choice}'. - * - *

    - * If the meaning of the 'Context State' containment reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Context State' containment reference. - * @see #setContextState(ContextState) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_ContextState() - * @see gemoc_execution_trace.ContextState#getChoice - * @model opposite="choice" containment="true" - * @generated - */ - ContextState getContextState(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.Choice#getContextState Context State}' containment reference. - * - * - * @param value the new value of the 'Context State' containment reference. - * @see #getContextState() - * @generated - */ - void setContextState(ContextState value); - - /** - * Returns the value of the 'Previous Choice' reference. - * It is bidirectional and its opposite is '{@link gemoc_execution_trace.Choice#getNextChoices Next Choices}'. - * - *

    - * If the meaning of the 'Previous Choice' reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Previous Choice' reference. - * @see #setPreviousChoice(Choice) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_PreviousChoice() - * @see gemoc_execution_trace.Choice#getNextChoices - * @model opposite="nextChoices" - * @generated - */ - Choice getPreviousChoice(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}' reference. - * - * - * @param value the new value of the 'Previous Choice' reference. - * @see #getPreviousChoice() - * @generated - */ - void setPreviousChoice(Choice value); - - /** - * Returns the value of the 'Selected Next Choice' reference. - * - *

    - * If the meaning of the 'Selected Next Choice' reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Selected Next Choice' reference. - * @see #setSelectedNextChoice(Choice) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_SelectedNextChoice() - * @model - * @generated - */ - Choice getSelectedNextChoice(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.Choice#getSelectedNextChoice Selected Next Choice}' reference. - * - * - * @param value the new value of the 'Selected Next Choice' reference. - * @see #getSelectedNextChoice() - * @generated - */ - void setSelectedNextChoice(Choice value); - - /** - * Returns the value of the 'Branch' reference. - * It is bidirectional and its opposite is '{@link gemoc_execution_trace.Branch#getChoices Choices}'. - * - *

    - * If the meaning of the 'Branch' reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Branch' reference. - * @see #setBranch(Branch) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_Branch() - * @see gemoc_execution_trace.Branch#getChoices - * @model opposite="choices" required="true" - * @generated - */ - Branch getBranch(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.Choice#getBranch Branch}' reference. - * - * - * @param value the new value of the 'Branch' reference. - * @see #getBranch() - * @generated - */ - void setBranch(Branch value); - - /** - * Returns the value of the 'Owned MSE Occurrences' containment reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence}. - * - *

    - * If the meaning of the 'Owned MSE Occurrences' containment reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Owned MSE Occurrences' containment reference list. - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_OwnedMSEOccurrences() - * @model containment="true" - * @generated - */ - EList getOwnedMSEOccurrences(); - -} // Choice diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ContextState.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ContextState.java deleted file mode 100644 index b30752fd1..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ContextState.java +++ /dev/null @@ -1,118 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Context State'. - * - * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link gemoc_execution_trace.ContextState#getModelState Model State}
      • - *
    • {@link gemoc_execution_trace.ContextState#getSolverState Solver State}
      • - *
    • {@link gemoc_execution_trace.ContextState#getChoice Choice}
      • - *
    - * - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState() - * @model - * @generated - */ -public interface ContextState extends EObject { - /** - * Returns the value of the 'Model State' reference. - * It is bidirectional and its opposite is '{@link gemoc_execution_trace.ModelState#getContextState Context State}'. - * - *

    - * If the meaning of the 'Model State' reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Model State' reference. - * @see #setModelState(ModelState) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState_ModelState() - * @see gemoc_execution_trace.ModelState#getContextState - * @model opposite="contextState" required="true" - * @generated - */ - ModelState getModelState(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.ContextState#getModelState Model State}' reference. - * - * - * @param value the new value of the 'Model State' reference. - * @see #getModelState() - * @generated - */ - void setModelState(ModelState value); - - /** - * Returns the value of the 'Solver State' containment reference. - * - *

    - * If the meaning of the 'Solver State' containment reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Solver State' containment reference. - * @see #setSolverState(SolverState) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState_SolverState() - * @model containment="true" required="true" - * @generated - */ - SolverState getSolverState(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.ContextState#getSolverState Solver State}' containment reference. - * - * - * @param value the new value of the 'Solver State' containment reference. - * @see #getSolverState() - * @generated - */ - void setSolverState(SolverState value); - - /** - * Returns the value of the 'Choice' container reference. - * It is bidirectional and its opposite is '{@link gemoc_execution_trace.Choice#getContextState Context State}'. - * - *

    - * If the meaning of the 'Choice' container reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Choice' container reference. - * @see #setChoice(Choice) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState_Choice() - * @see gemoc_execution_trace.Choice#getContextState - * @model opposite="contextState" transient="false" - * @generated - */ - Choice getChoice(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.ContextState#getChoice Choice}' container reference. - * - * - * @param value the new value of the 'Choice' container reference. - * @see #getChoice() - * @generated - */ - void setChoice(Choice value); - -} // ContextState diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ExecutionTraceModel.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ExecutionTraceModel.java deleted file mode 100644 index 92e82675c..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ExecutionTraceModel.java +++ /dev/null @@ -1,86 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Execution Trace Model'. - * - * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link gemoc_execution_trace.ExecutionTraceModel#getChoices Choices}
      • - *
    • {@link gemoc_execution_trace.ExecutionTraceModel#getBranches Branches}
      • - *
    • {@link gemoc_execution_trace.ExecutionTraceModel#getReachedStates Reached States}
      • - *
    - * - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel() - * @model - * @generated - */ -public interface ExecutionTraceModel extends EObject { - /** - * Returns the value of the 'Choices' containment reference list. - * The list contents are of type {@link gemoc_execution_trace.Choice}. - * - *

    - * If the meaning of the 'Choices' containment reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Choices' containment reference list. - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel_Choices() - * @model containment="true" - * @generated - */ - EList getChoices(); - - /** - * Returns the value of the 'Branches' containment reference list. - * The list contents are of type {@link gemoc_execution_trace.Branch}. - * - *

    - * If the meaning of the 'Branches' containment reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Branches' containment reference list. - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel_Branches() - * @model containment="true" - * @generated - */ - EList getBranches(); - - /** - * Returns the value of the 'Reached States' containment reference list. - * The list contents are of type {@link gemoc_execution_trace.ModelState}. - * - *

    - * If the meaning of the 'Reached States' containment reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Reached States' containment reference list. - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel_ReachedStates() - * @model containment="true" - * @generated - */ - EList getReachedStates(); - -} // ExecutionTraceModel diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_traceFactory.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_traceFactory.java deleted file mode 100644 index b45d24ea6..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_traceFactory.java +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace; - -import org.eclipse.emf.ecore.EFactory; - -/** - * - * The Factory for the model. - * It provides a create method for each non-abstract class of the model. - * - * @see gemoc_execution_trace.Gemoc_execution_tracePackage - * @generated - */ -public interface Gemoc_execution_traceFactory extends EFactory { - /** - * The singleton instance of the factory. - * - * - * @generated - */ - Gemoc_execution_traceFactory eINSTANCE = gemoc_execution_trace.impl.Gemoc_execution_traceFactoryImpl.init(); - - /** - * Returns a new object of class 'Choice'. - * - * - * @return a new object of class 'Choice'. - * @generated - */ - Choice createChoice(); - - /** - * Returns a new object of class 'Execution Trace Model'. - * - * - * @return a new object of class 'Execution Trace Model'. - * @generated - */ - ExecutionTraceModel createExecutionTraceModel(); - - /** - * Returns a new object of class 'Solver State'. - * - * - * @return a new object of class 'Solver State'. - * @generated - */ - SolverState createSolverState(); - - /** - * Returns a new object of class 'Model State'. - * - * - * @return a new object of class 'Model State'. - * @generated - */ - ModelState createModelState(); - - /** - * Returns a new object of class 'Context State'. - * - * - * @return a new object of class 'Context State'. - * @generated - */ - ContextState createContextState(); - - /** - * Returns a new object of class 'Branch'. - * - * - * @return a new object of class 'Branch'. - * @generated - */ - Branch createBranch(); - - /** - * Returns the package supported by this factory. - * - * - * @return the package supported by this factory. - * @generated - */ - Gemoc_execution_tracePackage getGemoc_execution_tracePackage(); - -} //Gemoc_execution_traceFactory diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_tracePackage.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_tracePackage.java deleted file mode 100644 index 843018b2a..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/Gemoc_execution_tracePackage.java +++ /dev/null @@ -1,1000 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - -/** - * - * The Package for the model. - * It contains accessors for the meta objects to represent - *
      - *
    • each class,
      • - *
    • each feature of each class,
      • - *
    • each operation of each class,
      • - *
    • each enum,
      • - *
    • and each data type
      • - *
    - * - * @see gemoc_execution_trace.Gemoc_execution_traceFactory - * @model kind="package" - * @generated - */ -public interface Gemoc_execution_tracePackage extends EPackage { - /** - * The package name. - * - * - * @generated - */ - String eNAME = "gemoc_execution_trace"; - - /** - * The package namespace URI. - * - * - * @generated - */ - String eNS_URI = "http://www.inira.fr/gemoc_execution_trace"; - - /** - * The package namespace name. - * - * - * @generated - */ - String eNS_PREFIX = "gemoc_execution_trace"; - - /** - * The singleton instance of the package. - * - * - * @generated - */ - Gemoc_execution_tracePackage eINSTANCE = gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl.init(); - - /** - * The meta object id for the '{@link gemoc_execution_trace.impl.ChoiceImpl Choice}' class. - * - * - * @see gemoc_execution_trace.impl.ChoiceImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getChoice() - * @generated - */ - int CHOICE = 0; - - /** - * The feature id for the 'Next Choices' reference list. - * - * - * @generated - * @ordered - */ - int CHOICE__NEXT_CHOICES = 0; - - /** - * The feature id for the 'Possible Logical Steps' containment reference list. - * - * - * @generated - * @ordered - */ - int CHOICE__POSSIBLE_LOGICAL_STEPS = 1; - - /** - * The feature id for the 'Chosen Logical Step' reference. - * - * - * @generated - * @ordered - */ - int CHOICE__CHOSEN_LOGICAL_STEP = 2; - - /** - * The feature id for the 'Context State' containment reference. - * - * - * @generated - * @ordered - */ - int CHOICE__CONTEXT_STATE = 3; - - /** - * The feature id for the 'Previous Choice' reference. - * - * - * @generated - * @ordered - */ - int CHOICE__PREVIOUS_CHOICE = 4; - - /** - * The feature id for the 'Selected Next Choice' reference. - * - * - * @generated - * @ordered - */ - int CHOICE__SELECTED_NEXT_CHOICE = 5; - - /** - * The feature id for the 'Branch' reference. - * - * - * @generated - * @ordered - */ - int CHOICE__BRANCH = 6; - - /** - * The feature id for the 'Owned MSE Occurrences' containment reference list. - * - * - * @generated - * @ordered - */ - int CHOICE__OWNED_MSE_OCCURRENCES = 7; - - /** - * The number of structural features of the 'Choice' class. - * - * - * @generated - * @ordered - */ - int CHOICE_FEATURE_COUNT = 8; - - /** - * The number of operations of the 'Choice' class. - * - * - * @generated - * @ordered - */ - int CHOICE_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link gemoc_execution_trace.impl.ExecutionTraceModelImpl Execution Trace Model}' class. - * - * - * @see gemoc_execution_trace.impl.ExecutionTraceModelImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getExecutionTraceModel() - * @generated - */ - int EXECUTION_TRACE_MODEL = 1; - - /** - * The feature id for the 'Choices' containment reference list. - * - * - * @generated - * @ordered - */ - int EXECUTION_TRACE_MODEL__CHOICES = 0; - - /** - * The feature id for the 'Branches' containment reference list. - * - * - * @generated - * @ordered - */ - int EXECUTION_TRACE_MODEL__BRANCHES = 1; - - /** - * The feature id for the 'Reached States' containment reference list. - * - * - * @generated - * @ordered - */ - int EXECUTION_TRACE_MODEL__REACHED_STATES = 2; - - /** - * The number of structural features of the 'Execution Trace Model' class. - * - * - * @generated - * @ordered - */ - int EXECUTION_TRACE_MODEL_FEATURE_COUNT = 3; - - /** - * The number of operations of the 'Execution Trace Model' class. - * - * - * @generated - * @ordered - */ - int EXECUTION_TRACE_MODEL_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link gemoc_execution_trace.impl.SolverStateImpl Solver State}' class. - * - * - * @see gemoc_execution_trace.impl.SolverStateImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getSolverState() - * @generated - */ - int SOLVER_STATE = 2; - - /** - * The feature id for the 'Model' reference. - * - * - * @generated - * @ordered - */ - int SOLVER_STATE__MODEL = 0; - - /** - * The feature id for the 'Serializable Model' attribute. - * - * - * @generated - * @ordered - */ - int SOLVER_STATE__SERIALIZABLE_MODEL = 1; - - /** - * The number of structural features of the 'Solver State' class. - * - * - * @generated - * @ordered - */ - int SOLVER_STATE_FEATURE_COUNT = 2; - - /** - * The number of operations of the 'Solver State' class. - * - * - * @generated - * @ordered - */ - int SOLVER_STATE_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link gemoc_execution_trace.impl.ModelStateImpl Model State}' class. - * - * - * @see gemoc_execution_trace.impl.ModelStateImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getModelState() - * @generated - */ - int MODEL_STATE = 3; - - /** - * The feature id for the 'Model' reference. - * - * - * @generated - * @ordered - */ - int MODEL_STATE__MODEL = 0; - - /** - * The feature id for the 'Context State' reference list. - * - * - * @generated - * @ordered - */ - int MODEL_STATE__CONTEXT_STATE = 1; - - /** - * The number of structural features of the 'Model State' class. - * - * - * @generated - * @ordered - */ - int MODEL_STATE_FEATURE_COUNT = 2; - - /** - * The number of operations of the 'Model State' class. - * - * - * @generated - * @ordered - */ - int MODEL_STATE_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link gemoc_execution_trace.impl.ContextStateImpl Context State}' class. - * - * - * @see gemoc_execution_trace.impl.ContextStateImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getContextState() - * @generated - */ - int CONTEXT_STATE = 4; - - /** - * The feature id for the 'Model State' reference. - * - * - * @generated - * @ordered - */ - int CONTEXT_STATE__MODEL_STATE = 0; - - /** - * The feature id for the 'Solver State' containment reference. - * - * - * @generated - * @ordered - */ - int CONTEXT_STATE__SOLVER_STATE = 1; - - /** - * The feature id for the 'Choice' container reference. - * - * - * @generated - * @ordered - */ - int CONTEXT_STATE__CHOICE = 2; - - /** - * The number of structural features of the 'Context State' class. - * - * - * @generated - * @ordered - */ - int CONTEXT_STATE_FEATURE_COUNT = 3; - - /** - * The number of operations of the 'Context State' class. - * - * - * @generated - * @ordered - */ - int CONTEXT_STATE_OPERATION_COUNT = 0; - - /** - * The meta object id for the '{@link gemoc_execution_trace.impl.BranchImpl Branch}' class. - * - * - * @see gemoc_execution_trace.impl.BranchImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getBranch() - * @generated - */ - int BRANCH = 5; - - /** - * The feature id for the 'Start Index' attribute. - * - * - * @generated - * @ordered - */ - int BRANCH__START_INDEX = 0; - - /** - * The feature id for the 'Stop Index' attribute. - * - * - * @generated - * @ordered - */ - int BRANCH__STOP_INDEX = 1; - - /** - * The feature id for the 'Choices' reference list. - * - * - * @generated - * @ordered - */ - int BRANCH__CHOICES = 2; - - /** - * The number of structural features of the 'Branch' class. - * - * - * @generated - * @ordered - */ - int BRANCH_FEATURE_COUNT = 3; - - /** - * The number of operations of the 'Branch' class. - * - * - * @generated - * @ordered - */ - int BRANCH_OPERATION_COUNT = 0; - - /** - * The meta object id for the 'ISerializable' data type. - * - * - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getISerializable() - * @generated - */ - int ISERIALIZABLE = 6; - - - /** - * Returns the meta object for class '{@link gemoc_execution_trace.Choice Choice}'. - * - * - * @return the meta object for class 'Choice'. - * @see gemoc_execution_trace.Choice - * @generated - */ - EClass getChoice(); - - /** - * Returns the meta object for the reference list '{@link gemoc_execution_trace.Choice#getNextChoices Next Choices}'. - * - * - * @return the meta object for the reference list 'Next Choices'. - * @see gemoc_execution_trace.Choice#getNextChoices() - * @see #getChoice() - * @generated - */ - EReference getChoice_NextChoices(); - - /** - * Returns the meta object for the containment reference list '{@link gemoc_execution_trace.Choice#getPossibleLogicalSteps Possible Logical Steps}'. - * - * - * @return the meta object for the containment reference list 'Possible Logical Steps'. - * @see gemoc_execution_trace.Choice#getPossibleLogicalSteps() - * @see #getChoice() - * @generated - */ - EReference getChoice_PossibleLogicalSteps(); - - /** - * Returns the meta object for the reference '{@link gemoc_execution_trace.Choice#getChosenLogicalStep Chosen Logical Step}'. - * - * - * @return the meta object for the reference 'Chosen Logical Step'. - * @see gemoc_execution_trace.Choice#getChosenLogicalStep() - * @see #getChoice() - * @generated - */ - EReference getChoice_ChosenLogicalStep(); - - /** - * Returns the meta object for the containment reference '{@link gemoc_execution_trace.Choice#getContextState Context State}'. - * - * - * @return the meta object for the containment reference 'Context State'. - * @see gemoc_execution_trace.Choice#getContextState() - * @see #getChoice() - * @generated - */ - EReference getChoice_ContextState(); - - /** - * Returns the meta object for the reference '{@link gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}'. - * - * - * @return the meta object for the reference 'Previous Choice'. - * @see gemoc_execution_trace.Choice#getPreviousChoice() - * @see #getChoice() - * @generated - */ - EReference getChoice_PreviousChoice(); - - /** - * Returns the meta object for the reference '{@link gemoc_execution_trace.Choice#getSelectedNextChoice Selected Next Choice}'. - * - * - * @return the meta object for the reference 'Selected Next Choice'. - * @see gemoc_execution_trace.Choice#getSelectedNextChoice() - * @see #getChoice() - * @generated - */ - EReference getChoice_SelectedNextChoice(); - - /** - * Returns the meta object for the reference '{@link gemoc_execution_trace.Choice#getBranch Branch}'. - * - * - * @return the meta object for the reference 'Branch'. - * @see gemoc_execution_trace.Choice#getBranch() - * @see #getChoice() - * @generated - */ - EReference getChoice_Branch(); - - /** - * Returns the meta object for the containment reference list '{@link gemoc_execution_trace.Choice#getOwnedMSEOccurrences Owned MSE Occurrences}'. - * - * - * @return the meta object for the containment reference list 'Owned MSE Occurrences'. - * @see gemoc_execution_trace.Choice#getOwnedMSEOccurrences() - * @see #getChoice() - * @generated - */ - EReference getChoice_OwnedMSEOccurrences(); - - /** - * Returns the meta object for class '{@link gemoc_execution_trace.ExecutionTraceModel Execution Trace Model}'. - * - * - * @return the meta object for class 'Execution Trace Model'. - * @see gemoc_execution_trace.ExecutionTraceModel - * @generated - */ - EClass getExecutionTraceModel(); - - /** - * Returns the meta object for the containment reference list '{@link gemoc_execution_trace.ExecutionTraceModel#getChoices Choices}'. - * - * - * @return the meta object for the containment reference list 'Choices'. - * @see gemoc_execution_trace.ExecutionTraceModel#getChoices() - * @see #getExecutionTraceModel() - * @generated - */ - EReference getExecutionTraceModel_Choices(); - - /** - * Returns the meta object for the containment reference list '{@link gemoc_execution_trace.ExecutionTraceModel#getBranches Branches}'. - * - * - * @return the meta object for the containment reference list 'Branches'. - * @see gemoc_execution_trace.ExecutionTraceModel#getBranches() - * @see #getExecutionTraceModel() - * @generated - */ - EReference getExecutionTraceModel_Branches(); - - /** - * Returns the meta object for the containment reference list '{@link gemoc_execution_trace.ExecutionTraceModel#getReachedStates Reached States}'. - * - * - * @return the meta object for the containment reference list 'Reached States'. - * @see gemoc_execution_trace.ExecutionTraceModel#getReachedStates() - * @see #getExecutionTraceModel() - * @generated - */ - EReference getExecutionTraceModel_ReachedStates(); - - /** - * Returns the meta object for class '{@link gemoc_execution_trace.SolverState Solver State}'. - * - * - * @return the meta object for class 'Solver State'. - * @see gemoc_execution_trace.SolverState - * @generated - */ - EClass getSolverState(); - - /** - * Returns the meta object for the reference '{@link gemoc_execution_trace.SolverState#getModel Model}'. - * - * - * @return the meta object for the reference 'Model'. - * @see gemoc_execution_trace.SolverState#getModel() - * @see #getSolverState() - * @generated - */ - EReference getSolverState_Model(); - - /** - * Returns the meta object for the attribute '{@link gemoc_execution_trace.SolverState#getSerializableModel Serializable Model}'. - * - * - * @return the meta object for the attribute 'Serializable Model'. - * @see gemoc_execution_trace.SolverState#getSerializableModel() - * @see #getSolverState() - * @generated - */ - EAttribute getSolverState_SerializableModel(); - - /** - * Returns the meta object for class '{@link gemoc_execution_trace.ModelState Model State}'. - * - * - * @return the meta object for class 'Model State'. - * @see gemoc_execution_trace.ModelState - * @generated - */ - EClass getModelState(); - - /** - * Returns the meta object for the reference '{@link gemoc_execution_trace.ModelState#getModel Model}'. - * - * - * @return the meta object for the reference 'Model'. - * @see gemoc_execution_trace.ModelState#getModel() - * @see #getModelState() - * @generated - */ - EReference getModelState_Model(); - - /** - * Returns the meta object for the reference list '{@link gemoc_execution_trace.ModelState#getContextState Context State}'. - * - * - * @return the meta object for the reference list 'Context State'. - * @see gemoc_execution_trace.ModelState#getContextState() - * @see #getModelState() - * @generated - */ - EReference getModelState_ContextState(); - - /** - * Returns the meta object for class '{@link gemoc_execution_trace.ContextState Context State}'. - * - * - * @return the meta object for class 'Context State'. - * @see gemoc_execution_trace.ContextState - * @generated - */ - EClass getContextState(); - - /** - * Returns the meta object for the reference '{@link gemoc_execution_trace.ContextState#getModelState Model State}'. - * - * - * @return the meta object for the reference 'Model State'. - * @see gemoc_execution_trace.ContextState#getModelState() - * @see #getContextState() - * @generated - */ - EReference getContextState_ModelState(); - - /** - * Returns the meta object for the containment reference '{@link gemoc_execution_trace.ContextState#getSolverState Solver State}'. - * - * - * @return the meta object for the containment reference 'Solver State'. - * @see gemoc_execution_trace.ContextState#getSolverState() - * @see #getContextState() - * @generated - */ - EReference getContextState_SolverState(); - - /** - * Returns the meta object for the container reference '{@link gemoc_execution_trace.ContextState#getChoice Choice}'. - * - * - * @return the meta object for the container reference 'Choice'. - * @see gemoc_execution_trace.ContextState#getChoice() - * @see #getContextState() - * @generated - */ - EReference getContextState_Choice(); - - /** - * Returns the meta object for class '{@link gemoc_execution_trace.Branch Branch}'. - * - * - * @return the meta object for class 'Branch'. - * @see gemoc_execution_trace.Branch - * @generated - */ - EClass getBranch(); - - /** - * Returns the meta object for the attribute '{@link gemoc_execution_trace.Branch#getStartIndex Start Index}'. - * - * - * @return the meta object for the attribute 'Start Index'. - * @see gemoc_execution_trace.Branch#getStartIndex() - * @see #getBranch() - * @generated - */ - EAttribute getBranch_StartIndex(); - - /** - * Returns the meta object for the attribute '{@link gemoc_execution_trace.Branch#getStopIndex Stop Index}'. - * - * - * @return the meta object for the attribute 'Stop Index'. - * @see gemoc_execution_trace.Branch#getStopIndex() - * @see #getBranch() - * @generated - */ - EAttribute getBranch_StopIndex(); - - /** - * Returns the meta object for the reference list '{@link gemoc_execution_trace.Branch#getChoices Choices}'. - * - * - * @return the meta object for the reference list 'Choices'. - * @see gemoc_execution_trace.Branch#getChoices() - * @see #getBranch() - * @generated - */ - EReference getBranch_Choices(); - - /** - * Returns the meta object for data type 'ISerializable'. - * - * - * @return the meta object for data type 'ISerializable'. - * @model instanceClass="byte[]" - * @generated - */ - EDataType getISerializable(); - - /** - * Returns the factory that creates the instances of the model. - * - * - * @return the factory that creates the instances of the model. - * @generated - */ - Gemoc_execution_traceFactory getGemoc_execution_traceFactory(); - - /** - * - * Defines literals for the meta objects that represent - *
      - *
    • each class,
      • - *
    • each feature of each class,
      • - *
    • each operation of each class,
      • - *
    • each enum,
      • - *
    • and each data type
      • - *
    - * - * @generated - */ - interface Literals { - /** - * The meta object literal for the '{@link gemoc_execution_trace.impl.ChoiceImpl Choice}' class. - * - * - * @see gemoc_execution_trace.impl.ChoiceImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getChoice() - * @generated - */ - EClass CHOICE = eINSTANCE.getChoice(); - - /** - * The meta object literal for the 'Next Choices' reference list feature. - * - * - * @generated - */ - EReference CHOICE__NEXT_CHOICES = eINSTANCE.getChoice_NextChoices(); - - /** - * The meta object literal for the 'Possible Logical Steps' containment reference list feature. - * - * - * @generated - */ - EReference CHOICE__POSSIBLE_LOGICAL_STEPS = eINSTANCE.getChoice_PossibleLogicalSteps(); - - /** - * The meta object literal for the 'Chosen Logical Step' reference feature. - * - * - * @generated - */ - EReference CHOICE__CHOSEN_LOGICAL_STEP = eINSTANCE.getChoice_ChosenLogicalStep(); - - /** - * The meta object literal for the 'Context State' containment reference feature. - * - * - * @generated - */ - EReference CHOICE__CONTEXT_STATE = eINSTANCE.getChoice_ContextState(); - - /** - * The meta object literal for the 'Previous Choice' reference feature. - * - * - * @generated - */ - EReference CHOICE__PREVIOUS_CHOICE = eINSTANCE.getChoice_PreviousChoice(); - - /** - * The meta object literal for the 'Selected Next Choice' reference feature. - * - * - * @generated - */ - EReference CHOICE__SELECTED_NEXT_CHOICE = eINSTANCE.getChoice_SelectedNextChoice(); - - /** - * The meta object literal for the 'Branch' reference feature. - * - * - * @generated - */ - EReference CHOICE__BRANCH = eINSTANCE.getChoice_Branch(); - - /** - * The meta object literal for the 'Owned MSE Occurrences' containment reference list feature. - * - * - * @generated - */ - EReference CHOICE__OWNED_MSE_OCCURRENCES = eINSTANCE.getChoice_OwnedMSEOccurrences(); - - /** - * The meta object literal for the '{@link gemoc_execution_trace.impl.ExecutionTraceModelImpl Execution Trace Model}' class. - * - * - * @see gemoc_execution_trace.impl.ExecutionTraceModelImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getExecutionTraceModel() - * @generated - */ - EClass EXECUTION_TRACE_MODEL = eINSTANCE.getExecutionTraceModel(); - - /** - * The meta object literal for the 'Choices' containment reference list feature. - * - * - * @generated - */ - EReference EXECUTION_TRACE_MODEL__CHOICES = eINSTANCE.getExecutionTraceModel_Choices(); - - /** - * The meta object literal for the 'Branches' containment reference list feature. - * - * - * @generated - */ - EReference EXECUTION_TRACE_MODEL__BRANCHES = eINSTANCE.getExecutionTraceModel_Branches(); - - /** - * The meta object literal for the 'Reached States' containment reference list feature. - * - * - * @generated - */ - EReference EXECUTION_TRACE_MODEL__REACHED_STATES = eINSTANCE.getExecutionTraceModel_ReachedStates(); - - /** - * The meta object literal for the '{@link gemoc_execution_trace.impl.SolverStateImpl Solver State}' class. - * - * - * @see gemoc_execution_trace.impl.SolverStateImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getSolverState() - * @generated - */ - EClass SOLVER_STATE = eINSTANCE.getSolverState(); - - /** - * The meta object literal for the 'Model' reference feature. - * - * - * @generated - */ - EReference SOLVER_STATE__MODEL = eINSTANCE.getSolverState_Model(); - - /** - * The meta object literal for the 'Serializable Model' attribute feature. - * - * - * @generated - */ - EAttribute SOLVER_STATE__SERIALIZABLE_MODEL = eINSTANCE.getSolverState_SerializableModel(); - - /** - * The meta object literal for the '{@link gemoc_execution_trace.impl.ModelStateImpl Model State}' class. - * - * - * @see gemoc_execution_trace.impl.ModelStateImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getModelState() - * @generated - */ - EClass MODEL_STATE = eINSTANCE.getModelState(); - - /** - * The meta object literal for the 'Model' reference feature. - * - * - * @generated - */ - EReference MODEL_STATE__MODEL = eINSTANCE.getModelState_Model(); - - /** - * The meta object literal for the 'Context State' reference list feature. - * - * - * @generated - */ - EReference MODEL_STATE__CONTEXT_STATE = eINSTANCE.getModelState_ContextState(); - - /** - * The meta object literal for the '{@link gemoc_execution_trace.impl.ContextStateImpl Context State}' class. - * - * - * @see gemoc_execution_trace.impl.ContextStateImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getContextState() - * @generated - */ - EClass CONTEXT_STATE = eINSTANCE.getContextState(); - - /** - * The meta object literal for the 'Model State' reference feature. - * - * - * @generated - */ - EReference CONTEXT_STATE__MODEL_STATE = eINSTANCE.getContextState_ModelState(); - - /** - * The meta object literal for the 'Solver State' containment reference feature. - * - * - * @generated - */ - EReference CONTEXT_STATE__SOLVER_STATE = eINSTANCE.getContextState_SolverState(); - - /** - * The meta object literal for the 'Choice' container reference feature. - * - * - * @generated - */ - EReference CONTEXT_STATE__CHOICE = eINSTANCE.getContextState_Choice(); - - /** - * The meta object literal for the '{@link gemoc_execution_trace.impl.BranchImpl Branch}' class. - * - * - * @see gemoc_execution_trace.impl.BranchImpl - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getBranch() - * @generated - */ - EClass BRANCH = eINSTANCE.getBranch(); - - /** - * The meta object literal for the 'Start Index' attribute feature. - * - * - * @generated - */ - EAttribute BRANCH__START_INDEX = eINSTANCE.getBranch_StartIndex(); - - /** - * The meta object literal for the 'Stop Index' attribute feature. - * - * - * @generated - */ - EAttribute BRANCH__STOP_INDEX = eINSTANCE.getBranch_StopIndex(); - - /** - * The meta object literal for the 'Choices' reference list feature. - * - * - * @generated - */ - EReference BRANCH__CHOICES = eINSTANCE.getBranch_Choices(); - - /** - * The meta object literal for the 'ISerializable' data type. - * - * - * @see gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getISerializable() - * @generated - */ - EDataType ISERIALIZABLE = eINSTANCE.getISerializable(); - - } - -} //Gemoc_execution_tracePackage diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ModelState.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ModelState.java deleted file mode 100644 index 2d6e2feb6..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/ModelState.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Model State'. - * - * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link gemoc_execution_trace.ModelState#getModel Model}
      • - *
    • {@link gemoc_execution_trace.ModelState#getContextState Context State}
      • - *
    - * - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getModelState() - * @model - * @generated - */ -public interface ModelState extends EObject { - /** - * Returns the value of the 'Model' reference. - * - *

    - * If the meaning of the 'Model' reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Model' reference. - * @see #setModel(EObject) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getModelState_Model() - * @model required="true" - * @generated - */ - EObject getModel(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.ModelState#getModel Model}' reference. - * - * - * @param value the new value of the 'Model' reference. - * @see #getModel() - * @generated - */ - void setModel(EObject value); - - /** - * Returns the value of the 'Context State' reference list. - * The list contents are of type {@link gemoc_execution_trace.ContextState}. - * It is bidirectional and its opposite is '{@link gemoc_execution_trace.ContextState#getModelState Model State}'. - * - *

    - * If the meaning of the 'Context State' reference list isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Context State' reference list. - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getModelState_ContextState() - * @see gemoc_execution_trace.ContextState#getModelState - * @model opposite="modelState" - * @generated - */ - EList getContextState(); - -} // ModelState diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/SolverState.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/SolverState.java deleted file mode 100644 index caacd982d..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/SolverState.java +++ /dev/null @@ -1,87 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * A representation of the model object 'Solver State'. - * - * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link gemoc_execution_trace.SolverState#getModel Model}
      • - *
    • {@link gemoc_execution_trace.SolverState#getSerializableModel Serializable Model}
      • - *
    - * - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getSolverState() - * @model - * @generated - */ -public interface SolverState extends EObject { - /** - * Returns the value of the 'Model' reference. - * - *

    - * If the meaning of the 'Model' reference isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Model' reference. - * @see #setModel(EObject) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getSolverState_Model() - * @model required="true" - * @generated - */ - EObject getModel(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.SolverState#getModel Model}' reference. - * - * - * @param value the new value of the 'Model' reference. - * @see #getModel() - * @generated - */ - void setModel(EObject value); - - /** - * Returns the value of the 'Serializable Model' attribute. - * - *

    - * If the meaning of the 'Serializable Model' attribute isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Serializable Model' attribute. - * @see #setSerializableModel(byte[]) - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#getSolverState_SerializableModel() - * @model dataType="gemoc_execution_trace.ISerializable" - * @generated - */ - byte[] getSerializableModel(); - - /** - * Sets the value of the '{@link gemoc_execution_trace.SolverState#getSerializableModel Serializable Model}' attribute. - * - * - * @param value the new value of the 'Serializable Model' attribute. - * @see #getSerializableModel() - * @generated - */ - void setSerializableModel(byte[] value); - -} // SolverState diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/BranchImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/BranchImpl.java deleted file mode 100644 index 3af8b232a..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/BranchImpl.java +++ /dev/null @@ -1,301 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace.impl; - -import gemoc_execution_trace.Branch; -import gemoc_execution_trace.Choice; -import gemoc_execution_trace.Gemoc_execution_tracePackage; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Branch'. - * - *

    - * The following features are implemented: - *

    - *
      - *
    • {@link gemoc_execution_trace.impl.BranchImpl#getStartIndex Start Index}
      • - *
    • {@link gemoc_execution_trace.impl.BranchImpl#getStopIndex Stop Index}
      • - *
    • {@link gemoc_execution_trace.impl.BranchImpl#getChoices Choices}
      • - *
    - * - * @generated - */ -public class BranchImpl extends MinimalEObjectImpl.Container implements Branch { - /** - * The default value of the '{@link #getStartIndex() Start Index}' attribute. - * - * - * @see #getStartIndex() - * @generated - * @ordered - */ - protected static final int START_INDEX_EDEFAULT = 0; - - /** - * The cached value of the '{@link #getStartIndex() Start Index}' attribute. - * - * - * @see #getStartIndex() - * @generated - * @ordered - */ - protected int startIndex = START_INDEX_EDEFAULT; - - /** - * The default value of the '{@link #getStopIndex() Stop Index}' attribute. - * - * - * @see #getStopIndex() - * @generated - * @ordered - */ - protected static final int STOP_INDEX_EDEFAULT = 0; - - /** - * The cached value of the '{@link #getStopIndex() Stop Index}' attribute. - * - * - * @see #getStopIndex() - * @generated - * @ordered - */ - protected int stopIndex = STOP_INDEX_EDEFAULT; - - /** - * The cached value of the '{@link #getChoices() Choices}' reference list. - * - * - * @see #getChoices() - * @generated - * @ordered - */ - protected EList choices; - - /** - * - * - * @generated - */ - protected BranchImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return Gemoc_execution_tracePackage.Literals.BRANCH; - } - - /** - * - * - * @generated - */ - public int getStartIndex() { - return startIndex; - } - - /** - * - * - * @generated - */ - public void setStartIndex(int newStartIndex) { - int oldStartIndex = startIndex; - startIndex = newStartIndex; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.BRANCH__START_INDEX, oldStartIndex, startIndex)); - } - - /** - * - * - * @generated - */ - public int getStopIndex() { - return stopIndex; - } - - /** - * - * - * @generated - */ - public void setStopIndex(int newStopIndex) { - int oldStopIndex = stopIndex; - stopIndex = newStopIndex; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.BRANCH__STOP_INDEX, oldStopIndex, stopIndex)); - } - - /** - * - * - * @generated - */ - public EList getChoices() { - if (choices == null) { - choices = new EObjectWithInverseResolvingEList(Choice.class, this, Gemoc_execution_tracePackage.BRANCH__CHOICES, Gemoc_execution_tracePackage.CHOICE__BRANCH); - } - return choices; - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case Gemoc_execution_tracePackage.BRANCH__CHOICES: - return ((InternalEList)(InternalEList)getChoices()).basicAdd(otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case Gemoc_execution_tracePackage.BRANCH__CHOICES: - return ((InternalEList)getChoices()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case Gemoc_execution_tracePackage.BRANCH__START_INDEX: - return getStartIndex(); - case Gemoc_execution_tracePackage.BRANCH__STOP_INDEX: - return getStopIndex(); - case Gemoc_execution_tracePackage.BRANCH__CHOICES: - return getChoices(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case Gemoc_execution_tracePackage.BRANCH__START_INDEX: - setStartIndex((Integer)newValue); - return; - case Gemoc_execution_tracePackage.BRANCH__STOP_INDEX: - setStopIndex((Integer)newValue); - return; - case Gemoc_execution_tracePackage.BRANCH__CHOICES: - getChoices().clear(); - getChoices().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.BRANCH__START_INDEX: - setStartIndex(START_INDEX_EDEFAULT); - return; - case Gemoc_execution_tracePackage.BRANCH__STOP_INDEX: - setStopIndex(STOP_INDEX_EDEFAULT); - return; - case Gemoc_execution_tracePackage.BRANCH__CHOICES: - getChoices().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.BRANCH__START_INDEX: - return startIndex != START_INDEX_EDEFAULT; - case Gemoc_execution_tracePackage.BRANCH__STOP_INDEX: - return stopIndex != STOP_INDEX_EDEFAULT; - case Gemoc_execution_tracePackage.BRANCH__CHOICES: - return choices != null && !choices.isEmpty(); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (startIndex: "); - result.append(startIndex); - result.append(", stopIndex: "); - result.append(stopIndex); - result.append(')'); - return result.toString(); - } - -} //BranchImpl diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ChoiceImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ChoiceImpl.java deleted file mode 100644 index 5cb4aa7e7..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ChoiceImpl.java +++ /dev/null @@ -1,622 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.Step; - -import gemoc_execution_trace.Branch; -import gemoc_execution_trace.Choice; -import gemoc_execution_trace.ContextState; -import gemoc_execution_trace.Gemoc_execution_tracePackage; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Choice'. - * - *

    - * The following features are implemented: - *

    - *
      - *
    • {@link gemoc_execution_trace.impl.ChoiceImpl#getNextChoices Next Choices}
      • - *
    • {@link gemoc_execution_trace.impl.ChoiceImpl#getPossibleLogicalSteps Possible Logical Steps}
      • - *
    • {@link gemoc_execution_trace.impl.ChoiceImpl#getChosenLogicalStep Chosen Logical Step}
      • - *
    • {@link gemoc_execution_trace.impl.ChoiceImpl#getContextState Context State}
      • - *
    • {@link gemoc_execution_trace.impl.ChoiceImpl#getPreviousChoice Previous Choice}
      • - *
    • {@link gemoc_execution_trace.impl.ChoiceImpl#getSelectedNextChoice Selected Next Choice}
      • - *
    • {@link gemoc_execution_trace.impl.ChoiceImpl#getBranch Branch}
      • - *
    • {@link gemoc_execution_trace.impl.ChoiceImpl#getOwnedMSEOccurrences Owned MSE Occurrences}
      • - *
    - * - * @generated - */ -public class ChoiceImpl extends MinimalEObjectImpl.Container implements Choice { - /** - * The cached value of the '{@link #getNextChoices() Next Choices}' reference list. - * - * - * @see #getNextChoices() - * @generated - * @ordered - */ - protected EList nextChoices; - - /** - * The cached value of the '{@link #getPossibleLogicalSteps() Possible Logical Steps}' containment reference list. - * - * - * @see #getPossibleLogicalSteps() - * @generated - * @ordered - */ - protected EList possibleLogicalSteps; - - /** - * The cached value of the '{@link #getChosenLogicalStep() Chosen Logical Step}' reference. - * - * - * @see #getChosenLogicalStep() - * @generated - * @ordered - */ - protected Step chosenLogicalStep; - - /** - * The cached value of the '{@link #getContextState() Context State}' containment reference. - * - * - * @see #getContextState() - * @generated - * @ordered - */ - protected ContextState contextState; - - /** - * The cached value of the '{@link #getPreviousChoice() Previous Choice}' reference. - * - * - * @see #getPreviousChoice() - * @generated - * @ordered - */ - protected Choice previousChoice; - - /** - * The cached value of the '{@link #getSelectedNextChoice() Selected Next Choice}' reference. - * - * - * @see #getSelectedNextChoice() - * @generated - * @ordered - */ - protected Choice selectedNextChoice; - - /** - * The cached value of the '{@link #getBranch() Branch}' reference. - * - * - * @see #getBranch() - * @generated - * @ordered - */ - protected Branch branch; - - /** - * The cached value of the '{@link #getOwnedMSEOccurrences() Owned MSE Occurrences}' containment reference list. - * - * - * @see #getOwnedMSEOccurrences() - * @generated - * @ordered - */ - protected EList ownedMSEOccurrences; - - /** - * - * - * @generated - */ - protected ChoiceImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return Gemoc_execution_tracePackage.Literals.CHOICE; - } - - /** - * - * - * @generated - */ - public EList getNextChoices() { - if (nextChoices == null) { - nextChoices = new EObjectWithInverseResolvingEList(Choice.class, this, Gemoc_execution_tracePackage.CHOICE__NEXT_CHOICES, Gemoc_execution_tracePackage.CHOICE__PREVIOUS_CHOICE); - } - return nextChoices; - } - - /** - * - * - * @generated - */ - public EList getPossibleLogicalSteps() { - if (possibleLogicalSteps == null) { - possibleLogicalSteps = new EObjectContainmentEList(Step.class, this, Gemoc_execution_tracePackage.CHOICE__POSSIBLE_LOGICAL_STEPS); - } - return possibleLogicalSteps; - } - - /** - * - * - * @generated - */ - public Step getChosenLogicalStep() { - if (chosenLogicalStep != null && chosenLogicalStep.eIsProxy()) { - InternalEObject oldChosenLogicalStep = (InternalEObject)chosenLogicalStep; - chosenLogicalStep = (Step)eResolveProxy(oldChosenLogicalStep); - if (chosenLogicalStep != oldChosenLogicalStep) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Gemoc_execution_tracePackage.CHOICE__CHOSEN_LOGICAL_STEP, oldChosenLogicalStep, chosenLogicalStep)); - } - } - return chosenLogicalStep; - } - - /** - * - * - * @generated - */ - public Step basicGetChosenLogicalStep() { - return chosenLogicalStep; - } - - /** - * - * - * @generated - */ - public void setChosenLogicalStep(Step newChosenLogicalStep) { - Step oldChosenLogicalStep = chosenLogicalStep; - chosenLogicalStep = newChosenLogicalStep; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CHOICE__CHOSEN_LOGICAL_STEP, oldChosenLogicalStep, chosenLogicalStep)); - } - - /** - * - * - * @generated - */ - public ContextState getContextState() { - return contextState; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetContextState(ContextState newContextState, NotificationChain msgs) { - ContextState oldContextState = contextState; - contextState = newContextState; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE, oldContextState, newContextState); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setContextState(ContextState newContextState) { - if (newContextState != contextState) { - NotificationChain msgs = null; - if (contextState != null) - msgs = ((InternalEObject)contextState).eInverseRemove(this, Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE, ContextState.class, msgs); - if (newContextState != null) - msgs = ((InternalEObject)newContextState).eInverseAdd(this, Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE, ContextState.class, msgs); - msgs = basicSetContextState(newContextState, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE, newContextState, newContextState)); - } - - /** - * - * - * @generated - */ - public Choice getPreviousChoice() { - if (previousChoice != null && previousChoice.eIsProxy()) { - InternalEObject oldPreviousChoice = (InternalEObject)previousChoice; - previousChoice = (Choice)eResolveProxy(oldPreviousChoice); - if (previousChoice != oldPreviousChoice) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Gemoc_execution_tracePackage.CHOICE__PREVIOUS_CHOICE, oldPreviousChoice, previousChoice)); - } - } - return previousChoice; - } - - /** - * - * - * @generated - */ - public Choice basicGetPreviousChoice() { - return previousChoice; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetPreviousChoice(Choice newPreviousChoice, NotificationChain msgs) { - Choice oldPreviousChoice = previousChoice; - previousChoice = newPreviousChoice; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CHOICE__PREVIOUS_CHOICE, oldPreviousChoice, newPreviousChoice); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setPreviousChoice(Choice newPreviousChoice) { - if (newPreviousChoice != previousChoice) { - NotificationChain msgs = null; - if (previousChoice != null) - msgs = ((InternalEObject)previousChoice).eInverseRemove(this, Gemoc_execution_tracePackage.CHOICE__NEXT_CHOICES, Choice.class, msgs); - if (newPreviousChoice != null) - msgs = ((InternalEObject)newPreviousChoice).eInverseAdd(this, Gemoc_execution_tracePackage.CHOICE__NEXT_CHOICES, Choice.class, msgs); - msgs = basicSetPreviousChoice(newPreviousChoice, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CHOICE__PREVIOUS_CHOICE, newPreviousChoice, newPreviousChoice)); - } - - /** - * - * - * @generated - */ - public Choice getSelectedNextChoice() { - if (selectedNextChoice != null && selectedNextChoice.eIsProxy()) { - InternalEObject oldSelectedNextChoice = (InternalEObject)selectedNextChoice; - selectedNextChoice = (Choice)eResolveProxy(oldSelectedNextChoice); - if (selectedNextChoice != oldSelectedNextChoice) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Gemoc_execution_tracePackage.CHOICE__SELECTED_NEXT_CHOICE, oldSelectedNextChoice, selectedNextChoice)); - } - } - return selectedNextChoice; - } - - /** - * - * - * @generated - */ - public Choice basicGetSelectedNextChoice() { - return selectedNextChoice; - } - - /** - * - * - * @generated - */ - public void setSelectedNextChoice(Choice newSelectedNextChoice) { - Choice oldSelectedNextChoice = selectedNextChoice; - selectedNextChoice = newSelectedNextChoice; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CHOICE__SELECTED_NEXT_CHOICE, oldSelectedNextChoice, selectedNextChoice)); - } - - /** - * - * - * @generated - */ - public Branch getBranch() { - if (branch != null && branch.eIsProxy()) { - InternalEObject oldBranch = (InternalEObject)branch; - branch = (Branch)eResolveProxy(oldBranch); - if (branch != oldBranch) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Gemoc_execution_tracePackage.CHOICE__BRANCH, oldBranch, branch)); - } - } - return branch; - } - - /** - * - * - * @generated - */ - public Branch basicGetBranch() { - return branch; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetBranch(Branch newBranch, NotificationChain msgs) { - Branch oldBranch = branch; - branch = newBranch; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CHOICE__BRANCH, oldBranch, newBranch); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setBranch(Branch newBranch) { - if (newBranch != branch) { - NotificationChain msgs = null; - if (branch != null) - msgs = ((InternalEObject)branch).eInverseRemove(this, Gemoc_execution_tracePackage.BRANCH__CHOICES, Branch.class, msgs); - if (newBranch != null) - msgs = ((InternalEObject)newBranch).eInverseAdd(this, Gemoc_execution_tracePackage.BRANCH__CHOICES, Branch.class, msgs); - msgs = basicSetBranch(newBranch, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CHOICE__BRANCH, newBranch, newBranch)); - } - - /** - * - * - * @generated - */ - public EList getOwnedMSEOccurrences() { - if (ownedMSEOccurrences == null) { - ownedMSEOccurrences = new EObjectContainmentEList(MSEOccurrence.class, this, Gemoc_execution_tracePackage.CHOICE__OWNED_MSE_OCCURRENCES); - } - return ownedMSEOccurrences; - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case Gemoc_execution_tracePackage.CHOICE__NEXT_CHOICES: - return ((InternalEList)(InternalEList)getNextChoices()).basicAdd(otherEnd, msgs); - case Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE: - if (contextState != null) - msgs = ((InternalEObject)contextState).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE, null, msgs); - return basicSetContextState((ContextState)otherEnd, msgs); - case Gemoc_execution_tracePackage.CHOICE__PREVIOUS_CHOICE: - if (previousChoice != null) - msgs = ((InternalEObject)previousChoice).eInverseRemove(this, Gemoc_execution_tracePackage.CHOICE__NEXT_CHOICES, Choice.class, msgs); - return basicSetPreviousChoice((Choice)otherEnd, msgs); - case Gemoc_execution_tracePackage.CHOICE__BRANCH: - if (branch != null) - msgs = ((InternalEObject)branch).eInverseRemove(this, Gemoc_execution_tracePackage.BRANCH__CHOICES, Branch.class, msgs); - return basicSetBranch((Branch)otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case Gemoc_execution_tracePackage.CHOICE__NEXT_CHOICES: - return ((InternalEList)getNextChoices()).basicRemove(otherEnd, msgs); - case Gemoc_execution_tracePackage.CHOICE__POSSIBLE_LOGICAL_STEPS: - return ((InternalEList)getPossibleLogicalSteps()).basicRemove(otherEnd, msgs); - case Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE: - return basicSetContextState(null, msgs); - case Gemoc_execution_tracePackage.CHOICE__PREVIOUS_CHOICE: - return basicSetPreviousChoice(null, msgs); - case Gemoc_execution_tracePackage.CHOICE__BRANCH: - return basicSetBranch(null, msgs); - case Gemoc_execution_tracePackage.CHOICE__OWNED_MSE_OCCURRENCES: - return ((InternalEList)getOwnedMSEOccurrences()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case Gemoc_execution_tracePackage.CHOICE__NEXT_CHOICES: - return getNextChoices(); - case Gemoc_execution_tracePackage.CHOICE__POSSIBLE_LOGICAL_STEPS: - return getPossibleLogicalSteps(); - case Gemoc_execution_tracePackage.CHOICE__CHOSEN_LOGICAL_STEP: - if (resolve) return getChosenLogicalStep(); - return basicGetChosenLogicalStep(); - case Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE: - return getContextState(); - case Gemoc_execution_tracePackage.CHOICE__PREVIOUS_CHOICE: - if (resolve) return getPreviousChoice(); - return basicGetPreviousChoice(); - case Gemoc_execution_tracePackage.CHOICE__SELECTED_NEXT_CHOICE: - if (resolve) return getSelectedNextChoice(); - return basicGetSelectedNextChoice(); - case Gemoc_execution_tracePackage.CHOICE__BRANCH: - if (resolve) return getBranch(); - return basicGetBranch(); - case Gemoc_execution_tracePackage.CHOICE__OWNED_MSE_OCCURRENCES: - return getOwnedMSEOccurrences(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case Gemoc_execution_tracePackage.CHOICE__NEXT_CHOICES: - getNextChoices().clear(); - getNextChoices().addAll((Collection)newValue); - return; - case Gemoc_execution_tracePackage.CHOICE__POSSIBLE_LOGICAL_STEPS: - getPossibleLogicalSteps().clear(); - getPossibleLogicalSteps().addAll((Collection)newValue); - return; - case Gemoc_execution_tracePackage.CHOICE__CHOSEN_LOGICAL_STEP: - setChosenLogicalStep((Step)newValue); - return; - case Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE: - setContextState((ContextState)newValue); - return; - case Gemoc_execution_tracePackage.CHOICE__PREVIOUS_CHOICE: - setPreviousChoice((Choice)newValue); - return; - case Gemoc_execution_tracePackage.CHOICE__SELECTED_NEXT_CHOICE: - setSelectedNextChoice((Choice)newValue); - return; - case Gemoc_execution_tracePackage.CHOICE__BRANCH: - setBranch((Branch)newValue); - return; - case Gemoc_execution_tracePackage.CHOICE__OWNED_MSE_OCCURRENCES: - getOwnedMSEOccurrences().clear(); - getOwnedMSEOccurrences().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.CHOICE__NEXT_CHOICES: - getNextChoices().clear(); - return; - case Gemoc_execution_tracePackage.CHOICE__POSSIBLE_LOGICAL_STEPS: - getPossibleLogicalSteps().clear(); - return; - case Gemoc_execution_tracePackage.CHOICE__CHOSEN_LOGICAL_STEP: - setChosenLogicalStep((Step)null); - return; - case Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE: - setContextState((ContextState)null); - return; - case Gemoc_execution_tracePackage.CHOICE__PREVIOUS_CHOICE: - setPreviousChoice((Choice)null); - return; - case Gemoc_execution_tracePackage.CHOICE__SELECTED_NEXT_CHOICE: - setSelectedNextChoice((Choice)null); - return; - case Gemoc_execution_tracePackage.CHOICE__BRANCH: - setBranch((Branch)null); - return; - case Gemoc_execution_tracePackage.CHOICE__OWNED_MSE_OCCURRENCES: - getOwnedMSEOccurrences().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.CHOICE__NEXT_CHOICES: - return nextChoices != null && !nextChoices.isEmpty(); - case Gemoc_execution_tracePackage.CHOICE__POSSIBLE_LOGICAL_STEPS: - return possibleLogicalSteps != null && !possibleLogicalSteps.isEmpty(); - case Gemoc_execution_tracePackage.CHOICE__CHOSEN_LOGICAL_STEP: - return chosenLogicalStep != null; - case Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE: - return contextState != null; - case Gemoc_execution_tracePackage.CHOICE__PREVIOUS_CHOICE: - return previousChoice != null; - case Gemoc_execution_tracePackage.CHOICE__SELECTED_NEXT_CHOICE: - return selectedNextChoice != null; - case Gemoc_execution_tracePackage.CHOICE__BRANCH: - return branch != null; - case Gemoc_execution_tracePackage.CHOICE__OWNED_MSE_OCCURRENCES: - return ownedMSEOccurrences != null && !ownedMSEOccurrences.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //ChoiceImpl diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ContextStateImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ContextStateImpl.java deleted file mode 100644 index 7bcc20f69..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ContextStateImpl.java +++ /dev/null @@ -1,362 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace.impl; - -import gemoc_execution_trace.Choice; -import gemoc_execution_trace.ContextState; -import gemoc_execution_trace.Gemoc_execution_tracePackage; -import gemoc_execution_trace.ModelState; -import gemoc_execution_trace.SolverState; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EcoreUtil; - -/** - * - * An implementation of the model object 'Context State'. - * - *

    - * The following features are implemented: - *

    - *
      - *
    • {@link gemoc_execution_trace.impl.ContextStateImpl#getModelState Model State}
      • - *
    • {@link gemoc_execution_trace.impl.ContextStateImpl#getSolverState Solver State}
      • - *
    • {@link gemoc_execution_trace.impl.ContextStateImpl#getChoice Choice}
      • - *
    - * - * @generated - */ -public class ContextStateImpl extends MinimalEObjectImpl.Container implements ContextState { - /** - * The cached value of the '{@link #getModelState() Model State}' reference. - * - * - * @see #getModelState() - * @generated - * @ordered - */ - protected ModelState modelState; - - /** - * The cached value of the '{@link #getSolverState() Solver State}' containment reference. - * - * - * @see #getSolverState() - * @generated - * @ordered - */ - protected SolverState solverState; - - /** - * - * - * @generated - */ - protected ContextStateImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return Gemoc_execution_tracePackage.Literals.CONTEXT_STATE; - } - - /** - * - * - * @generated - */ - public ModelState getModelState() { - if (modelState != null && modelState.eIsProxy()) { - InternalEObject oldModelState = (InternalEObject)modelState; - modelState = (ModelState)eResolveProxy(oldModelState); - if (modelState != oldModelState) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Gemoc_execution_tracePackage.CONTEXT_STATE__MODEL_STATE, oldModelState, modelState)); - } - } - return modelState; - } - - /** - * - * - * @generated - */ - public ModelState basicGetModelState() { - return modelState; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetModelState(ModelState newModelState, NotificationChain msgs) { - ModelState oldModelState = modelState; - modelState = newModelState; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CONTEXT_STATE__MODEL_STATE, oldModelState, newModelState); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setModelState(ModelState newModelState) { - if (newModelState != modelState) { - NotificationChain msgs = null; - if (modelState != null) - msgs = ((InternalEObject)modelState).eInverseRemove(this, Gemoc_execution_tracePackage.MODEL_STATE__CONTEXT_STATE, ModelState.class, msgs); - if (newModelState != null) - msgs = ((InternalEObject)newModelState).eInverseAdd(this, Gemoc_execution_tracePackage.MODEL_STATE__CONTEXT_STATE, ModelState.class, msgs); - msgs = basicSetModelState(newModelState, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CONTEXT_STATE__MODEL_STATE, newModelState, newModelState)); - } - - /** - * - * - * @generated - */ - public SolverState getSolverState() { - return solverState; - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetSolverState(SolverState newSolverState, NotificationChain msgs) { - SolverState oldSolverState = solverState; - solverState = newSolverState; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CONTEXT_STATE__SOLVER_STATE, oldSolverState, newSolverState); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * - * - * @generated - */ - public void setSolverState(SolverState newSolverState) { - if (newSolverState != solverState) { - NotificationChain msgs = null; - if (solverState != null) - msgs = ((InternalEObject)solverState).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Gemoc_execution_tracePackage.CONTEXT_STATE__SOLVER_STATE, null, msgs); - if (newSolverState != null) - msgs = ((InternalEObject)newSolverState).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Gemoc_execution_tracePackage.CONTEXT_STATE__SOLVER_STATE, null, msgs); - msgs = basicSetSolverState(newSolverState, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CONTEXT_STATE__SOLVER_STATE, newSolverState, newSolverState)); - } - - /** - * - * - * @generated - */ - public Choice getChoice() { - if (eContainerFeatureID() != Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE) return null; - return (Choice)eInternalContainer(); - } - - /** - * - * - * @generated - */ - public NotificationChain basicSetChoice(Choice newChoice, NotificationChain msgs) { - msgs = eBasicSetContainer((InternalEObject)newChoice, Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE, msgs); - return msgs; - } - - /** - * - * - * @generated - */ - public void setChoice(Choice newChoice) { - if (newChoice != eInternalContainer() || (eContainerFeatureID() != Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE && newChoice != null)) { - if (EcoreUtil.isAncestor(this, newChoice)) - throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); - NotificationChain msgs = null; - if (eInternalContainer() != null) - msgs = eBasicRemoveFromContainer(msgs); - if (newChoice != null) - msgs = ((InternalEObject)newChoice).eInverseAdd(this, Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE, Choice.class, msgs); - msgs = basicSetChoice(newChoice, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE, newChoice, newChoice)); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case Gemoc_execution_tracePackage.CONTEXT_STATE__MODEL_STATE: - if (modelState != null) - msgs = ((InternalEObject)modelState).eInverseRemove(this, Gemoc_execution_tracePackage.MODEL_STATE__CONTEXT_STATE, ModelState.class, msgs); - return basicSetModelState((ModelState)otherEnd, msgs); - case Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE: - if (eInternalContainer() != null) - msgs = eBasicRemoveFromContainer(msgs); - return basicSetChoice((Choice)otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case Gemoc_execution_tracePackage.CONTEXT_STATE__MODEL_STATE: - return basicSetModelState(null, msgs); - case Gemoc_execution_tracePackage.CONTEXT_STATE__SOLVER_STATE: - return basicSetSolverState(null, msgs); - case Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE: - return basicSetChoice(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) { - switch (eContainerFeatureID()) { - case Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE: - return eInternalContainer().eInverseRemove(this, Gemoc_execution_tracePackage.CHOICE__CONTEXT_STATE, Choice.class, msgs); - } - return super.eBasicRemoveFromContainerFeature(msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case Gemoc_execution_tracePackage.CONTEXT_STATE__MODEL_STATE: - if (resolve) return getModelState(); - return basicGetModelState(); - case Gemoc_execution_tracePackage.CONTEXT_STATE__SOLVER_STATE: - return getSolverState(); - case Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE: - return getChoice(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case Gemoc_execution_tracePackage.CONTEXT_STATE__MODEL_STATE: - setModelState((ModelState)newValue); - return; - case Gemoc_execution_tracePackage.CONTEXT_STATE__SOLVER_STATE: - setSolverState((SolverState)newValue); - return; - case Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE: - setChoice((Choice)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.CONTEXT_STATE__MODEL_STATE: - setModelState((ModelState)null); - return; - case Gemoc_execution_tracePackage.CONTEXT_STATE__SOLVER_STATE: - setSolverState((SolverState)null); - return; - case Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE: - setChoice((Choice)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.CONTEXT_STATE__MODEL_STATE: - return modelState != null; - case Gemoc_execution_tracePackage.CONTEXT_STATE__SOLVER_STATE: - return solverState != null; - case Gemoc_execution_tracePackage.CONTEXT_STATE__CHOICE: - return getChoice() != null; - } - return super.eIsSet(featureID); - } - -} //ContextStateImpl diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java deleted file mode 100644 index e864ffbb8..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java +++ /dev/null @@ -1,236 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace.impl; - -import gemoc_execution_trace.Branch; -import gemoc_execution_trace.Choice; -import gemoc_execution_trace.ExecutionTraceModel; -import gemoc_execution_trace.Gemoc_execution_tracePackage; -import gemoc_execution_trace.ModelState; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Execution Trace Model'. - * - *

    - * The following features are implemented: - *

    - *
      - *
    • {@link gemoc_execution_trace.impl.ExecutionTraceModelImpl#getChoices Choices}
      • - *
    • {@link gemoc_execution_trace.impl.ExecutionTraceModelImpl#getBranches Branches}
      • - *
    • {@link gemoc_execution_trace.impl.ExecutionTraceModelImpl#getReachedStates Reached States}
      • - *
    - * - * @generated - */ -public class ExecutionTraceModelImpl extends MinimalEObjectImpl.Container implements ExecutionTraceModel { - /** - * The cached value of the '{@link #getChoices() Choices}' containment reference list. - * - * - * @see #getChoices() - * @generated - * @ordered - */ - protected EList choices; - - /** - * The cached value of the '{@link #getBranches() Branches}' containment reference list. - * - * - * @see #getBranches() - * @generated - * @ordered - */ - protected EList branches; - - /** - * The cached value of the '{@link #getReachedStates() Reached States}' containment reference list. - * - * - * @see #getReachedStates() - * @generated - * @ordered - */ - protected EList reachedStates; - - /** - * - * - * @generated - */ - protected ExecutionTraceModelImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return Gemoc_execution_tracePackage.Literals.EXECUTION_TRACE_MODEL; - } - - /** - * - * - * @generated - */ - public EList getChoices() { - if (choices == null) { - choices = new EObjectContainmentEList(Choice.class, this, Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__CHOICES); - } - return choices; - } - - /** - * - * - * @generated - */ - public EList getBranches() { - if (branches == null) { - branches = new EObjectContainmentEList(Branch.class, this, Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__BRANCHES); - } - return branches; - } - - /** - * - * - * @generated - */ - public EList getReachedStates() { - if (reachedStates == null) { - reachedStates = new EObjectContainmentEList(ModelState.class, this, Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__REACHED_STATES); - } - return reachedStates; - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__CHOICES: - return ((InternalEList)getChoices()).basicRemove(otherEnd, msgs); - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__BRANCHES: - return ((InternalEList)getBranches()).basicRemove(otherEnd, msgs); - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__REACHED_STATES: - return ((InternalEList)getReachedStates()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__CHOICES: - return getChoices(); - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__BRANCHES: - return getBranches(); - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__REACHED_STATES: - return getReachedStates(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__CHOICES: - getChoices().clear(); - getChoices().addAll((Collection)newValue); - return; - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__BRANCHES: - getBranches().clear(); - getBranches().addAll((Collection)newValue); - return; - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__REACHED_STATES: - getReachedStates().clear(); - getReachedStates().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__CHOICES: - getChoices().clear(); - return; - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__BRANCHES: - getBranches().clear(); - return; - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__REACHED_STATES: - getReachedStates().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__CHOICES: - return choices != null && !choices.isEmpty(); - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__BRANCHES: - return branches != null && !branches.isEmpty(); - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL__REACHED_STATES: - return reachedStates != null && !reachedStates.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //ExecutionTraceModelImpl diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java deleted file mode 100644 index e2d7a8246..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java +++ /dev/null @@ -1,209 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace.impl; - -import gemoc_execution_trace.*; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.impl.EFactoryImpl; - -import org.eclipse.emf.ecore.plugin.EcorePlugin; - -/** - * - * An implementation of the model Factory. - * - * @generated - */ -public class Gemoc_execution_traceFactoryImpl extends EFactoryImpl implements Gemoc_execution_traceFactory { - /** - * Creates the default factory implementation. - * - * - * @generated - */ - public static Gemoc_execution_traceFactory init() { - try { - Gemoc_execution_traceFactory theGemoc_execution_traceFactory = (Gemoc_execution_traceFactory)EPackage.Registry.INSTANCE.getEFactory(Gemoc_execution_tracePackage.eNS_URI); - if (theGemoc_execution_traceFactory != null) { - return theGemoc_execution_traceFactory; - } - } - catch (Exception exception) { - EcorePlugin.INSTANCE.log(exception); - } - return new Gemoc_execution_traceFactoryImpl(); - } - - /** - * Creates an instance of the factory. - * - * - * @generated - */ - public Gemoc_execution_traceFactoryImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - public EObject create(EClass eClass) { - switch (eClass.getClassifierID()) { - case Gemoc_execution_tracePackage.CHOICE: return createChoice(); - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL: return createExecutionTraceModel(); - case Gemoc_execution_tracePackage.SOLVER_STATE: return createSolverState(); - case Gemoc_execution_tracePackage.MODEL_STATE: return createModelState(); - case Gemoc_execution_tracePackage.CONTEXT_STATE: return createContextState(); - case Gemoc_execution_tracePackage.BRANCH: return createBranch(); - default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); - } - } - - /** - * - * - * @generated - */ - @Override - public Object createFromString(EDataType eDataType, String initialValue) { - switch (eDataType.getClassifierID()) { - case Gemoc_execution_tracePackage.ISERIALIZABLE: - return createISerializableFromString(eDataType, initialValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); - } - } - - /** - * - * - * @generated - */ - @Override - public String convertToString(EDataType eDataType, Object instanceValue) { - switch (eDataType.getClassifierID()) { - case Gemoc_execution_tracePackage.ISERIALIZABLE: - return convertISerializableToString(eDataType, instanceValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); - } - } - - /** - * - * - * @generated - */ - public Choice createChoice() { - ChoiceImpl choice = new ChoiceImpl(); - return choice; - } - - /** - * - * - * @generated - */ - public ExecutionTraceModel createExecutionTraceModel() { - ExecutionTraceModelImpl executionTraceModel = new ExecutionTraceModelImpl(); - return executionTraceModel; - } - - /** - * - * - * @generated - */ - public SolverState createSolverState() { - SolverStateImpl solverState = new SolverStateImpl(); - return solverState; - } - - /** - * - * - * @generated - */ - public ModelState createModelState() { - ModelStateImpl modelState = new ModelStateImpl(); - return modelState; - } - - /** - * - * - * @generated - */ - public ContextState createContextState() { - ContextStateImpl contextState = new ContextStateImpl(); - return contextState; - } - - /** - * - * - * @generated - */ - public Branch createBranch() { - BranchImpl branch = new BranchImpl(); - return branch; - } - - /** - * - * - * @generated - */ - public byte[] createISerializableFromString(EDataType eDataType, String initialValue) { - return (byte[])super.createFromString(initialValue); - } - - /** - * - * - * @generated - */ - public String convertISerializableToString(EDataType eDataType, Object instanceValue) { - return super.convertToString(instanceValue); - } - - /** - * - * - * @generated - */ - public Gemoc_execution_tracePackage getGemoc_execution_tracePackage() { - return (Gemoc_execution_tracePackage)getEPackage(); - } - - /** - * - * - * @deprecated - * @generated - */ - @Deprecated - public static Gemoc_execution_tracePackage getPackage() { - return Gemoc_execution_tracePackage.eINSTANCE; - } - -} //Gemoc_execution_traceFactoryImpl diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java deleted file mode 100644 index 4ebe111b0..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java +++ /dev/null @@ -1,546 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace.impl; - -import fr.inria.diverse.trace.commons.model.trace.TracePackage; - -import gemoc_execution_trace.Branch; -import gemoc_execution_trace.Choice; -import gemoc_execution_trace.ContextState; -import gemoc_execution_trace.ExecutionTraceModel; -import gemoc_execution_trace.Gemoc_execution_traceFactory; -import gemoc_execution_trace.Gemoc_execution_tracePackage; -import gemoc_execution_trace.ModelState; -import gemoc_execution_trace.SolverState; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; -import org.eclipse.emf.ecore.EcorePackage; - -import org.eclipse.emf.ecore.impl.EPackageImpl; - -/** - * - * An implementation of the model Package. - * - * @generated - */ -public class Gemoc_execution_tracePackageImpl extends EPackageImpl implements Gemoc_execution_tracePackage { - /** - * - * - * @generated - */ - private EClass choiceEClass = null; - - /** - * - * - * @generated - */ - private EClass executionTraceModelEClass = null; - - /** - * - * - * @generated - */ - private EClass solverStateEClass = null; - - /** - * - * - * @generated - */ - private EClass modelStateEClass = null; - - /** - * - * - * @generated - */ - private EClass contextStateEClass = null; - - /** - * - * - * @generated - */ - private EClass branchEClass = null; - - /** - * - * - * @generated - */ - private EDataType iSerializableEDataType = null; - - /** - * Creates an instance of the model Package, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package - * package URI value. - *

    Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * - * - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see gemoc_execution_trace.Gemoc_execution_tracePackage#eNS_URI - * @see #init() - * @generated - */ - private Gemoc_execution_tracePackageImpl() { - super(eNS_URI, Gemoc_execution_traceFactory.eINSTANCE); - } - - /** - * - * - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * - *

    This method is used to initialize {@link Gemoc_execution_tracePackage#eINSTANCE} when that field is accessed. - * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. - * - * - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static Gemoc_execution_tracePackage init() { - if (isInited) return (Gemoc_execution_tracePackage)EPackage.Registry.INSTANCE.getEPackage(Gemoc_execution_tracePackage.eNS_URI); - - // Obtain or create and register package - Gemoc_execution_tracePackageImpl theGemoc_execution_tracePackage = (Gemoc_execution_tracePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Gemoc_execution_tracePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Gemoc_execution_tracePackageImpl()); - - isInited = true; - - // Initialize simple dependencies - TracePackage.eINSTANCE.eClass(); - - // Create package meta-data objects - theGemoc_execution_tracePackage.createPackageContents(); - - // Initialize created meta-data - theGemoc_execution_tracePackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theGemoc_execution_tracePackage.freeze(); - - - // Update the registry and return the package - EPackage.Registry.INSTANCE.put(Gemoc_execution_tracePackage.eNS_URI, theGemoc_execution_tracePackage); - return theGemoc_execution_tracePackage; - } - - /** - * - * - * @generated - */ - public EClass getChoice() { - return choiceEClass; - } - - /** - * - * - * @generated - */ - public EReference getChoice_NextChoices() { - return (EReference)choiceEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getChoice_PossibleLogicalSteps() { - return (EReference)choiceEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getChoice_ChosenLogicalStep() { - return (EReference)choiceEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EReference getChoice_ContextState() { - return (EReference)choiceEClass.getEStructuralFeatures().get(3); - } - - /** - * - * - * @generated - */ - public EReference getChoice_PreviousChoice() { - return (EReference)choiceEClass.getEStructuralFeatures().get(4); - } - - /** - * - * - * @generated - */ - public EReference getChoice_SelectedNextChoice() { - return (EReference)choiceEClass.getEStructuralFeatures().get(5); - } - - /** - * - * - * @generated - */ - public EReference getChoice_Branch() { - return (EReference)choiceEClass.getEStructuralFeatures().get(6); - } - - /** - * - * - * @generated - */ - public EReference getChoice_OwnedMSEOccurrences() { - return (EReference)choiceEClass.getEStructuralFeatures().get(7); - } - - /** - * - * - * @generated - */ - public EClass getExecutionTraceModel() { - return executionTraceModelEClass; - } - - /** - * - * - * @generated - */ - public EReference getExecutionTraceModel_Choices() { - return (EReference)executionTraceModelEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getExecutionTraceModel_Branches() { - return (EReference)executionTraceModelEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getExecutionTraceModel_ReachedStates() { - return (EReference)executionTraceModelEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EClass getSolverState() { - return solverStateEClass; - } - - /** - * - * - * @generated - */ - public EReference getSolverState_Model() { - return (EReference)solverStateEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EAttribute getSolverState_SerializableModel() { - return (EAttribute)solverStateEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EClass getModelState() { - return modelStateEClass; - } - - /** - * - * - * @generated - */ - public EReference getModelState_Model() { - return (EReference)modelStateEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getModelState_ContextState() { - return (EReference)modelStateEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EClass getContextState() { - return contextStateEClass; - } - - /** - * - * - * @generated - */ - public EReference getContextState_ModelState() { - return (EReference)contextStateEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EReference getContextState_SolverState() { - return (EReference)contextStateEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getContextState_Choice() { - return (EReference)contextStateEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EClass getBranch() { - return branchEClass; - } - - /** - * - * - * @generated - */ - public EAttribute getBranch_StartIndex() { - return (EAttribute)branchEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EAttribute getBranch_StopIndex() { - return (EAttribute)branchEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getBranch_Choices() { - return (EReference)branchEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - public EDataType getISerializable() { - return iSerializableEDataType; - } - - /** - * - * - * @generated - */ - public Gemoc_execution_traceFactory getGemoc_execution_traceFactory() { - return (Gemoc_execution_traceFactory)getEFactoryInstance(); - } - - /** - * - * - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void createPackageContents() { - if (isCreated) return; - isCreated = true; - - // Create classes and their features - choiceEClass = createEClass(CHOICE); - createEReference(choiceEClass, CHOICE__NEXT_CHOICES); - createEReference(choiceEClass, CHOICE__POSSIBLE_LOGICAL_STEPS); - createEReference(choiceEClass, CHOICE__CHOSEN_LOGICAL_STEP); - createEReference(choiceEClass, CHOICE__CONTEXT_STATE); - createEReference(choiceEClass, CHOICE__PREVIOUS_CHOICE); - createEReference(choiceEClass, CHOICE__SELECTED_NEXT_CHOICE); - createEReference(choiceEClass, CHOICE__BRANCH); - createEReference(choiceEClass, CHOICE__OWNED_MSE_OCCURRENCES); - - executionTraceModelEClass = createEClass(EXECUTION_TRACE_MODEL); - createEReference(executionTraceModelEClass, EXECUTION_TRACE_MODEL__CHOICES); - createEReference(executionTraceModelEClass, EXECUTION_TRACE_MODEL__BRANCHES); - createEReference(executionTraceModelEClass, EXECUTION_TRACE_MODEL__REACHED_STATES); - - solverStateEClass = createEClass(SOLVER_STATE); - createEReference(solverStateEClass, SOLVER_STATE__MODEL); - createEAttribute(solverStateEClass, SOLVER_STATE__SERIALIZABLE_MODEL); - - modelStateEClass = createEClass(MODEL_STATE); - createEReference(modelStateEClass, MODEL_STATE__MODEL); - createEReference(modelStateEClass, MODEL_STATE__CONTEXT_STATE); - - contextStateEClass = createEClass(CONTEXT_STATE); - createEReference(contextStateEClass, CONTEXT_STATE__MODEL_STATE); - createEReference(contextStateEClass, CONTEXT_STATE__SOLVER_STATE); - createEReference(contextStateEClass, CONTEXT_STATE__CHOICE); - - branchEClass = createEClass(BRANCH); - createEAttribute(branchEClass, BRANCH__START_INDEX); - createEAttribute(branchEClass, BRANCH__STOP_INDEX); - createEReference(branchEClass, BRANCH__CHOICES); - - // Create data types - iSerializableEDataType = createEDataType(ISERIALIZABLE); - } - - /** - * - * - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * - * - * @generated - */ - public void initializePackageContents() { - if (isInitialized) return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Obtain other dependent packages - TracePackage theTracePackage = (TracePackage)EPackage.Registry.INSTANCE.getEPackage(TracePackage.eNS_URI); - EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); - - // Create type parameters - - // Set bounds for type parameters - - // Add supertypes to classes - - // Initialize classes, features, and operations; add parameters - initEClass(choiceEClass, Choice.class, "Choice", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getChoice_NextChoices(), this.getChoice(), this.getChoice_PreviousChoice(), "nextChoices", null, 0, -1, Choice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getChoice_PossibleLogicalSteps(), theTracePackage.getStep(), null, "possibleLogicalSteps", null, 0, -1, Choice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getChoice_ChosenLogicalStep(), theTracePackage.getStep(), null, "chosenLogicalStep", null, 0, 1, Choice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getChoice_ContextState(), this.getContextState(), this.getContextState_Choice(), "contextState", null, 0, 1, Choice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getChoice_PreviousChoice(), this.getChoice(), this.getChoice_NextChoices(), "previousChoice", null, 0, 1, Choice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getChoice_SelectedNextChoice(), this.getChoice(), null, "selectedNextChoice", null, 0, 1, Choice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getChoice_Branch(), this.getBranch(), this.getBranch_Choices(), "branch", null, 1, 1, Choice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getChoice_OwnedMSEOccurrences(), theTracePackage.getMSEOccurrence(), null, "ownedMSEOccurrences", null, 0, -1, Choice.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(executionTraceModelEClass, ExecutionTraceModel.class, "ExecutionTraceModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getExecutionTraceModel_Choices(), this.getChoice(), null, "choices", null, 0, -1, ExecutionTraceModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getExecutionTraceModel_Branches(), this.getBranch(), null, "branches", null, 0, -1, ExecutionTraceModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getExecutionTraceModel_ReachedStates(), this.getModelState(), null, "reachedStates", null, 0, -1, ExecutionTraceModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(solverStateEClass, SolverState.class, "SolverState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSolverState_Model(), ecorePackage.getEObject(), null, "model", null, 1, 1, SolverState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getSolverState_SerializableModel(), this.getISerializable(), "serializableModel", null, 0, 1, SolverState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(modelStateEClass, ModelState.class, "ModelState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getModelState_Model(), ecorePackage.getEObject(), null, "model", null, 1, 1, ModelState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getModelState_ContextState(), this.getContextState(), this.getContextState_ModelState(), "contextState", null, 0, -1, ModelState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(contextStateEClass, ContextState.class, "ContextState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getContextState_ModelState(), this.getModelState(), this.getModelState_ContextState(), "modelState", null, 1, 1, ContextState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getContextState_SolverState(), this.getSolverState(), null, "solverState", null, 1, 1, ContextState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getContextState_Choice(), this.getChoice(), this.getChoice_ContextState(), "choice", null, 0, 1, ContextState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(branchEClass, Branch.class, "Branch", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getBranch_StartIndex(), theEcorePackage.getEInt(), "startIndex", null, 0, 1, Branch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getBranch_StopIndex(), theEcorePackage.getEInt(), "stopIndex", null, 0, 1, Branch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getBranch_Choices(), this.getChoice(), this.getChoice_Branch(), "choices", null, 0, -1, Branch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - // Initialize data types - initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - - // Create resource - createResource(eNS_URI); - } - -} //Gemoc_execution_tracePackageImpl diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ModelStateImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ModelStateImpl.java deleted file mode 100644 index aa962a7b9..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/ModelStateImpl.java +++ /dev/null @@ -1,240 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace.impl; - -import gemoc_execution_trace.ContextState; -import gemoc_execution_trace.Gemoc_execution_tracePackage; -import gemoc_execution_trace.ModelState; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; - -/** - * - * An implementation of the model object 'Model State'. - * - *

    - * The following features are implemented: - *

    - *
      - *
    • {@link gemoc_execution_trace.impl.ModelStateImpl#getModel Model}
      • - *
    • {@link gemoc_execution_trace.impl.ModelStateImpl#getContextState Context State}
      • - *
    - * - * @generated - */ -public class ModelStateImpl extends MinimalEObjectImpl.Container implements ModelState { - /** - * The cached value of the '{@link #getModel() Model}' reference. - * - * - * @see #getModel() - * @generated - * @ordered - */ - protected EObject model; - - /** - * The cached value of the '{@link #getContextState() Context State}' reference list. - * - * - * @see #getContextState() - * @generated - * @ordered - */ - protected EList contextState; - - /** - * - * - * @generated - */ - protected ModelStateImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return Gemoc_execution_tracePackage.Literals.MODEL_STATE; - } - - /** - * - * - * @generated - */ - public EObject getModel() { - if (model != null && model.eIsProxy()) { - InternalEObject oldModel = (InternalEObject)model; - model = eResolveProxy(oldModel); - if (model != oldModel) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Gemoc_execution_tracePackage.MODEL_STATE__MODEL, oldModel, model)); - } - } - return model; - } - - /** - * - * - * @generated - */ - public EObject basicGetModel() { - return model; - } - - /** - * - * - * @generated - */ - public void setModel(EObject newModel) { - EObject oldModel = model; - model = newModel; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.MODEL_STATE__MODEL, oldModel, model)); - } - - /** - * - * - * @generated - */ - public EList getContextState() { - if (contextState == null) { - contextState = new EObjectWithInverseResolvingEList(ContextState.class, this, Gemoc_execution_tracePackage.MODEL_STATE__CONTEXT_STATE, Gemoc_execution_tracePackage.CONTEXT_STATE__MODEL_STATE); - } - return contextState; - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case Gemoc_execution_tracePackage.MODEL_STATE__CONTEXT_STATE: - return ((InternalEList)(InternalEList)getContextState()).basicAdd(otherEnd, msgs); - } - return super.eInverseAdd(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case Gemoc_execution_tracePackage.MODEL_STATE__CONTEXT_STATE: - return ((InternalEList)getContextState()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case Gemoc_execution_tracePackage.MODEL_STATE__MODEL: - if (resolve) return getModel(); - return basicGetModel(); - case Gemoc_execution_tracePackage.MODEL_STATE__CONTEXT_STATE: - return getContextState(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case Gemoc_execution_tracePackage.MODEL_STATE__MODEL: - setModel((EObject)newValue); - return; - case Gemoc_execution_tracePackage.MODEL_STATE__CONTEXT_STATE: - getContextState().clear(); - getContextState().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.MODEL_STATE__MODEL: - setModel((EObject)null); - return; - case Gemoc_execution_tracePackage.MODEL_STATE__CONTEXT_STATE: - getContextState().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.MODEL_STATE__MODEL: - return model != null; - case Gemoc_execution_tracePackage.MODEL_STATE__CONTEXT_STATE: - return contextState != null && !contextState.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //ModelStateImpl diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/SolverStateImpl.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/SolverStateImpl.java deleted file mode 100644 index e22d1cdba..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/impl/SolverStateImpl.java +++ /dev/null @@ -1,235 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace.impl; - -import gemoc_execution_trace.Gemoc_execution_tracePackage; -import gemoc_execution_trace.SolverState; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -/** - * - * An implementation of the model object 'Solver State'. - * - *

    - * The following features are implemented: - *

    - *
      - *
    • {@link gemoc_execution_trace.impl.SolverStateImpl#getModel Model}
      • - *
    • {@link gemoc_execution_trace.impl.SolverStateImpl#getSerializableModel Serializable Model}
      • - *
    - * - * @generated - */ -public class SolverStateImpl extends MinimalEObjectImpl.Container implements SolverState { - /** - * The cached value of the '{@link #getModel() Model}' reference. - * - * - * @see #getModel() - * @generated - * @ordered - */ - protected EObject model; - - /** - * The default value of the '{@link #getSerializableModel() Serializable Model}' attribute. - * - * - * @see #getSerializableModel() - * @generated - * @ordered - */ - protected static final byte[] SERIALIZABLE_MODEL_EDEFAULT = null; - - /** - * The cached value of the '{@link #getSerializableModel() Serializable Model}' attribute. - * - * - * @see #getSerializableModel() - * @generated - * @ordered - */ - protected byte[] serializableModel = SERIALIZABLE_MODEL_EDEFAULT; - - /** - * - * - * @generated - */ - protected SolverStateImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return Gemoc_execution_tracePackage.Literals.SOLVER_STATE; - } - - /** - * - * - * @generated - */ - public EObject getModel() { - if (model != null && model.eIsProxy()) { - InternalEObject oldModel = (InternalEObject)model; - model = eResolveProxy(oldModel); - if (model != oldModel) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, Gemoc_execution_tracePackage.SOLVER_STATE__MODEL, oldModel, model)); - } - } - return model; - } - - /** - * - * - * @generated - */ - public EObject basicGetModel() { - return model; - } - - /** - * - * - * @generated - */ - public void setModel(EObject newModel) { - EObject oldModel = model; - model = newModel; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.SOLVER_STATE__MODEL, oldModel, model)); - } - - /** - * - * - * @generated - */ - public byte[] getSerializableModel() { - return serializableModel; - } - - /** - * - * - * @generated - */ - public void setSerializableModel(byte[] newSerializableModel) { - byte[] oldSerializableModel = serializableModel; - serializableModel = newSerializableModel; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Gemoc_execution_tracePackage.SOLVER_STATE__SERIALIZABLE_MODEL, oldSerializableModel, serializableModel)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case Gemoc_execution_tracePackage.SOLVER_STATE__MODEL: - if (resolve) return getModel(); - return basicGetModel(); - case Gemoc_execution_tracePackage.SOLVER_STATE__SERIALIZABLE_MODEL: - return getSerializableModel(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case Gemoc_execution_tracePackage.SOLVER_STATE__MODEL: - setModel((EObject)newValue); - return; - case Gemoc_execution_tracePackage.SOLVER_STATE__SERIALIZABLE_MODEL: - setSerializableModel((byte[])newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.SOLVER_STATE__MODEL: - setModel((EObject)null); - return; - case Gemoc_execution_tracePackage.SOLVER_STATE__SERIALIZABLE_MODEL: - setSerializableModel(SERIALIZABLE_MODEL_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case Gemoc_execution_tracePackage.SOLVER_STATE__MODEL: - return model != null; - case Gemoc_execution_tracePackage.SOLVER_STATE__SERIALIZABLE_MODEL: - return SERIALIZABLE_MODEL_EDEFAULT == null ? serializableModel != null : !SERIALIZABLE_MODEL_EDEFAULT.equals(serializableModel); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (serializableModel: "); - result.append(serializableModel); - result.append(')'); - return result.toString(); - } - -} //SolverStateImpl diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java deleted file mode 100644 index a3085195f..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java +++ /dev/null @@ -1,220 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace.util; - -import gemoc_execution_trace.*; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notifier; - -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - -import org.eclipse.emf.ecore.EObject; - -/** - * - * The Adapter Factory for the model. - * It provides an adapter createXXX method for each class of the model. - * - * @see gemoc_execution_trace.Gemoc_execution_tracePackage - * @generated - */ -public class Gemoc_execution_traceAdapterFactory extends AdapterFactoryImpl { - /** - * The cached model package. - * - * - * @generated - */ - protected static Gemoc_execution_tracePackage modelPackage; - - /** - * Creates an instance of the adapter factory. - * - * - * @generated - */ - public Gemoc_execution_traceAdapterFactory() { - if (modelPackage == null) { - modelPackage = Gemoc_execution_tracePackage.eINSTANCE; - } - } - - /** - * Returns whether this factory is applicable for the type of the object. - * - * This implementation returns true if the object is either the model's package or is an instance object of the model. - * - * @return whether this factory is applicable for the type of the object. - * @generated - */ - @Override - public boolean isFactoryForType(Object object) { - if (object == modelPackage) { - return true; - } - if (object instanceof EObject) { - return ((EObject)object).eClass().getEPackage() == modelPackage; - } - return false; - } - - /** - * The switch that delegates to the createXXX methods. - * - * - * @generated - */ - protected Gemoc_execution_traceSwitch modelSwitch = - new Gemoc_execution_traceSwitch() { - @Override - public Adapter caseChoice(Choice object) { - return createChoiceAdapter(); - } - @Override - public Adapter caseExecutionTraceModel(ExecutionTraceModel object) { - return createExecutionTraceModelAdapter(); - } - @Override - public Adapter caseSolverState(SolverState object) { - return createSolverStateAdapter(); - } - @Override - public Adapter caseModelState(ModelState object) { - return createModelStateAdapter(); - } - @Override - public Adapter caseContextState(ContextState object) { - return createContextStateAdapter(); - } - @Override - public Adapter caseBranch(Branch object) { - return createBranchAdapter(); - } - @Override - public Adapter defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; - - /** - * Creates an adapter for the target. - * - * - * @param target the object to adapt. - * @return the adapter for the target. - * @generated - */ - @Override - public Adapter createAdapter(Notifier target) { - return modelSwitch.doSwitch((EObject)target); - } - - - /** - * Creates a new adapter for an object of class '{@link gemoc_execution_trace.Choice Choice}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see gemoc_execution_trace.Choice - * @generated - */ - public Adapter createChoiceAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link gemoc_execution_trace.ExecutionTraceModel Execution Trace Model}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see gemoc_execution_trace.ExecutionTraceModel - * @generated - */ - public Adapter createExecutionTraceModelAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link gemoc_execution_trace.SolverState Solver State}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see gemoc_execution_trace.SolverState - * @generated - */ - public Adapter createSolverStateAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link gemoc_execution_trace.ModelState Model State}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see gemoc_execution_trace.ModelState - * @generated - */ - public Adapter createModelStateAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link gemoc_execution_trace.ContextState Context State}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see gemoc_execution_trace.ContextState - * @generated - */ - public Adapter createContextStateAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link gemoc_execution_trace.Branch Branch}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see gemoc_execution_trace.Branch - * @generated - */ - public Adapter createBranchAdapter() { - return null; - } - - /** - * Creates a new adapter for the default case. - * - * This default implementation returns null. - * - * @return the new adapter. - * @generated - */ - public Adapter createEObjectAdapter() { - return null; - } - -} //Gemoc_execution_traceAdapterFactory diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java b/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java deleted file mode 100644 index a9ab09559..000000000 --- a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java +++ /dev/null @@ -1,225 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Inria and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Inria - initial API and implementation - *******************************************************************************/ -/** - */ -package gemoc_execution_trace.util; - -import gemoc_execution_trace.*; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.util.Switch; - -/** - * - * The Switch for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} - * to invoke the caseXXX method for each class of the model, - * starting with the actual class of the object - * and proceeding up the inheritance hierarchy - * until a non-null result is returned, - * which is the result of the switch. - * - * @see gemoc_execution_trace.Gemoc_execution_tracePackage - * @generated - */ -public class Gemoc_execution_traceSwitch extends Switch { - /** - * The cached model package - * - * - * @generated - */ - protected static Gemoc_execution_tracePackage modelPackage; - - /** - * Creates an instance of the switch. - * - * - * @generated - */ - public Gemoc_execution_traceSwitch() { - if (modelPackage == null) { - modelPackage = Gemoc_execution_tracePackage.eINSTANCE; - } - } - - /** - * Checks whether this is a switch for the given package. - * - * - * @param ePackage the package in question. - * @return whether this is a switch for the given package. - * @generated - */ - @Override - protected boolean isSwitchFor(EPackage ePackage) { - return ePackage == modelPackage; - } - - /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. - * - * - * @return the first non-null result returned by a caseXXX call. - * @generated - */ - @Override - protected T doSwitch(int classifierID, EObject theEObject) { - switch (classifierID) { - case Gemoc_execution_tracePackage.CHOICE: { - Choice choice = (Choice)theEObject; - T result = caseChoice(choice); - if (result == null) result = defaultCase(theEObject); - return result; - } - case Gemoc_execution_tracePackage.EXECUTION_TRACE_MODEL: { - ExecutionTraceModel executionTraceModel = (ExecutionTraceModel)theEObject; - T result = caseExecutionTraceModel(executionTraceModel); - if (result == null) result = defaultCase(theEObject); - return result; - } - case Gemoc_execution_tracePackage.SOLVER_STATE: { - SolverState solverState = (SolverState)theEObject; - T result = caseSolverState(solverState); - if (result == null) result = defaultCase(theEObject); - return result; - } - case Gemoc_execution_tracePackage.MODEL_STATE: { - ModelState modelState = (ModelState)theEObject; - T result = caseModelState(modelState); - if (result == null) result = defaultCase(theEObject); - return result; - } - case Gemoc_execution_tracePackage.CONTEXT_STATE: { - ContextState contextState = (ContextState)theEObject; - T result = caseContextState(contextState); - if (result == null) result = defaultCase(theEObject); - return result; - } - case Gemoc_execution_tracePackage.BRANCH: { - Branch branch = (Branch)theEObject; - T result = caseBranch(branch); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); - } - } - - /** - * Returns the result of interpreting the object as an instance of 'Choice'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Choice'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseChoice(Choice object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Execution Trace Model'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Execution Trace Model'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseExecutionTraceModel(ExecutionTraceModel object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Solver State'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Solver State'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseSolverState(SolverState object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Model State'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Model State'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseModelState(ModelState object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Context State'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Context State'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseContextState(ContextState object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Branch'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Branch'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseBranch(Branch object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'EObject'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last case anyway. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'EObject'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) - * @generated - */ - @Override - public T defaultCase(EObject object) { - return null; - } - -} //Gemoc_execution_traceSwitch From a096f5fa88882b436867daa35fb818933f0c0fee Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 27 Apr 2017 11:56:02 +0200 Subject: [PATCH 171/267] [DynamicAnnotationHelper] Add copyright --- .../commons/DynamicAnnotationHelper.xtend | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/src/org/gemoc/xdsmlframework/commons/DynamicAnnotationHelper.xtend b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/src/org/gemoc/xdsmlframework/commons/DynamicAnnotationHelper.xtend index e075117fe..d93eaf7b7 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/src/org/gemoc/xdsmlframework/commons/DynamicAnnotationHelper.xtend +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.commons/src/org/gemoc/xdsmlframework/commons/DynamicAnnotationHelper.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package org.gemoc.xdsmlframework.commons import org.eclipse.emf.ecore.EModelElement From 789d57c733e06fdad1d34bd3dbb296c33064bb60 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 12 May 2017 09:57:11 +0200 Subject: [PATCH 172/267] [ExeFramework] Add first version of test lib plugin --- .../.classpath | 8 ++ .../.project | 34 +++++ .../.settings/org.eclipse.jdt.core.prefs | 7 + .../META-INF/MANIFEST.MF | 22 +++ .../build.properties | 5 + .../test/lib/IEngineWrapper.xtend | 15 ++ .../test/lib/IExecutableModel.xtend | 12 ++ .../test/lib/ILanguageWrapper.xtend | 11 ++ .../test/lib/impl/TestEngineAddon.xtend | 77 ++++++++++ .../test/lib/impl/TestHelper.xtend | 94 +++++++++++++ .../test/lib/impl/TestModel.xtend | 40 ++++++ .../test/lib/impl/TestRunConfiguration.xtend | 99 +++++++++++++ .../test/lib/impl/TestUtil.xtend | 133 ++++++++++++++++++ 13 files changed, 557 insertions(+) create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.classpath create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.project create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.settings/org.eclipse.jdt.core.prefs create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/build.properties create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend create mode 100644 framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.classpath b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.classpath new file mode 100644 index 000000000..428337e56 --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.project b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.project new file mode 100644 index 000000000..5dabcaf7d --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.project @@ -0,0 +1,34 @@ + + + org.gemoc.executionframework.test.lib + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature + + diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF new file mode 100644 index 000000000..142138e5b --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF @@ -0,0 +1,22 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Test +Bundle-SymbolicName: org.gemoc.executionframework.test.lib +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: com.google.guava, + org.eclipse.xtext.xbase.lib, + org.eclipse.xtend.lib, + org.eclipse.xtend.lib.macro, + org.junit;bundle-version="4.12.0", + org.eclipse.core.runtime;bundle-version="3.12.0", + org.eclipse.core.resources;bundle-version="3.11.1", + org.gemoc.xdsmlframework.api;bundle-version="2.3.0", + org.eclipse.emf.ecore;bundle-version="2.12.0", + org.eclipse.swt;bundle-version="3.105.3", + org.eclipse.ui;bundle-version="3.108.1", + fr.inria.diverse.trace.gemoc;bundle-version="2.3.0", + org.gemoc.executionframework.engine;bundle-version="2.3.0" +Export-Package: org.gemoc.executionframework.test.lib, + org.gemoc.executionframework.test.lib.impl + diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/build.properties b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/build.properties new file mode 100644 index 000000000..d8e2f0e92 --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/build.properties @@ -0,0 +1,5 @@ +source.. = src/,\ + xtend-gen/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend new file mode 100644 index 000000000..90bb9a36b --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend @@ -0,0 +1,15 @@ +package org.gemoc.executionframework.test.lib + +import java.util.Set +import org.eclipse.emf.common.util.URI +import org.gemoc.xdsmlframework.api.core.IExecutionEngine + +interface IEngineWrapper { + + def void prepare(ILanguageWrapper wrapper,IExecutableModel model, Set addons, URI uri) + + def void run() + + def IExecutionEngine getRealEngine() + +} \ No newline at end of file diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend new file mode 100644 index 000000000..6a5499bc2 --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend @@ -0,0 +1,12 @@ +package org.gemoc.executionframework.test.lib + +interface IExecutableModel { + + def String getFileName() + def String getPluginName() + def String getFolderPath() + def String getMelangeQuery() + def String getInitArgument() + def int getShouldStopAfter() + +} diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend new file mode 100644 index 000000000..f83d26888 --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend @@ -0,0 +1,11 @@ +package org.gemoc.executionframework.test.lib + +interface ILanguageWrapper { + + def String getEntryPoint() + + def String getLanguageName() + + def String getInitializationMethod() + +} \ No newline at end of file diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend new file mode 100644 index 000000000..d4e87d1c1 --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend @@ -0,0 +1,77 @@ +package org.gemoc.executionframework.test.lib.impl + +import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon +import org.gemoc.xdsmlframework.api.core.IExecutionEngine +import fr.inria.diverse.trace.commons.model.trace.Step +import java.util.Collection +import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus +import java.util.List +import org.eclipse.xtend.lib.annotations.Accessors + +class TestEngineAddon implements IEngineAddon { + + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + var int amountOfStepsExecuted = 0 + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + var boolean engineAboutToStart = false + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + var boolean engineAboutToStop = false + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + var boolean engineStarted = false + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + var boolean engineStopped = false + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + var boolean engineAboutToDispose = false + + val int shouldStopAfter + + new(int shouldStopAfter) { + this.shouldStopAfter = shouldStopAfter + } + + override aboutToExecuteStep(IExecutionEngine engine, Step stepToExecute) { + } + + override aboutToSelectStep(IExecutionEngine engine, Collection> steps) { + } + + override engineAboutToDispose(IExecutionEngine engine) { + engineAboutToDispose = true + } + + override engineAboutToStart(IExecutionEngine engine) { + engineAboutToStart = true + } + + override engineAboutToStop(IExecutionEngine engine) { + engineAboutToStop = true + } + + override engineStarted(IExecutionEngine executionEngine) { + engineStarted = true + } + + override engineStatusChanged(IExecutionEngine engine, RunStatus newStatus) { + } + + override engineStopped(IExecutionEngine engine) { + engineStopped = true + } + + override proposedStepsChanged(IExecutionEngine engine, Collection> steps) { + } + + override stepExecuted(IExecutionEngine engine, Step stepExecuted) { + amountOfStepsExecuted++ + if (shouldStopAfter != -1 && shouldStopAfter < amountOfStepsExecuted) { + engine.stop + } + } + + override stepSelected(IExecutionEngine engine, Step selectedStep) { + } + + override validate(List otherAddons) { + } + +} diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend new file mode 100644 index 000000000..f65906331 --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend @@ -0,0 +1,94 @@ +package org.gemoc.executionframework.test.lib.impl + +import java.io.File +import java.io.PrintWriter +import java.io.StringWriter +import java.util.Random +import java.util.Set +import org.eclipse.core.resources.IFile +import org.eclipse.core.resources.ResourcesPlugin +import org.eclipse.core.runtime.IProgressMonitor +import org.eclipse.core.runtime.Status +import org.eclipse.core.runtime.jobs.Job +import org.eclipse.emf.common.util.URI +import org.gemoc.executionframework.test.lib.IEngineWrapper +import org.gemoc.executionframework.test.lib.IExecutableModel +import org.gemoc.executionframework.test.lib.ILanguageWrapper + +import static org.junit.Assert.* + +class TestHelper { + + private static def testInternal(IProgressMonitor m, IEngineWrapper engine, ILanguageWrapper language, + Set addons, IExecutableModel model) { + + // Create eclipse project in test WS + val eclipseProject = ResourcesPlugin::getWorkspace().getRoot().getProject(Math::abs(new Random().nextInt).toString); + if (eclipseProject.exists) + eclipseProject.delete(true, m) + eclipseProject.create(m) + eclipseProject.open(m) + + // Copy model to execute in WS + val IFile file = eclipseProject.getFile(model.getFileName()); + val String filePath = new File(new File(model.getFolderPath()), model.getFileName()).absolutePath + TestUtil::copyFileFromPlugin(model.pluginName, filePath, file, m) + + // Create model URI + val modelURI = URI::createPlatformResourceURI(file.fullPath.toString, true) + + // Prepare engine + val TestEngineAddon testAddon = new TestEngineAddon(model.shouldStopAfter) + engine.prepare(language, model, addons, modelURI) + engine.realEngine.executionContext.executionPlatform.addEngineAddon(testAddon) + + // Execute engine + engine.run + + // Dispose engine + engine.realEngine.dispose + + // Generic oracle using test addon + assertTrue("No steps were executed", testAddon.amountOfStepsExecuted > 0) + assertTrue("engineAboutToStart never performed", testAddon.engineAboutToStart) + assertTrue("engineStarted never performed", testAddon.engineStarted) + assertTrue("engineAboutToStop never performed", testAddon.engineAboutToStop) + assertTrue("engineStopped never performed", testAddon.engineStopped) + assertTrue("engineAboutToDispose never performed", testAddon.engineAboutToDispose) + + // Done + return Status.OK_STATUS + } + + def static void testWithAddons(IEngineWrapper engine, ILanguageWrapper language, Set addons, + IExecutableModel model) { + val job = new Job("single test case") { + + override protected run(IProgressMonitor m) { + try { + return testInternal(m, engine, language, addons, model) + } catch (Throwable t) { + t.printStackTrace + val StringWriter sw = new StringWriter(); + t.printStackTrace(new PrintWriter(sw)); + val errorStatus = new Status(Status.ERROR, "trace test", "An error occured in the test case", t) + return errorStatus + } + } + } + job.schedule + TestUtil::waitForJobs + if (job.result != null && job.result.exception != null) { + throw job.result.exception + } + } + + def static void testWithGenericTrace(IEngineWrapper engine, ILanguageWrapper language, IExecutableModel model) { + testWithAddons(engine, language, #{"Generic MultiDimensional Trace"}, model) + } + + def static void testWithoutExtraAddons(IEngineWrapper engine, ILanguageWrapper language, IExecutableModel model) { + testWithAddons(engine, language, #{}, model) + } + +} diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend new file mode 100644 index 000000000..f200e26e4 --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend @@ -0,0 +1,40 @@ +package org.gemoc.executionframework.test.lib.impl + +import org.eclipse.xtend.lib.annotations.Accessors +import org.gemoc.executionframework.test.lib.IExecutableModel + +class TestModel implements IExecutableModel { + + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + val String fileName + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + val String pluginName + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + val String folderPath + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + val String initArgument + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + val String melangeQuery + @Accessors(PRIVATE_SETTER,PUBLIC_GETTER) + val int shouldStopAfter + + new(String pluginName, String folderPath, String fileName, String initArgument, String melangeQuery, + int shouldStopAfter) { + this.pluginName = pluginName + this.folderPath = folderPath + this.fileName = fileName + this.initArgument = initArgument + this.melangeQuery = melangeQuery + this.shouldStopAfter = shouldStopAfter + } + + new(String pluginName, String folderPath, String fileName) { + this(pluginName, folderPath, fileName, "", "", -1) + } + + new(String pluginName, String folderPath, String fileName, String initArgument, String melangeQuery) { + this(pluginName, folderPath, fileName, initArgument, melangeQuery, -1) + } + + +} diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend new file mode 100644 index 000000000..67c05bf63 --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend @@ -0,0 +1,99 @@ +package org.gemoc.executionframework.test.lib.impl + +import java.util.ArrayList +import java.util.List +import java.util.Set +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.resource.Resource +import org.eclipse.emf.ecore.resource.ResourceSet +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl +import org.gemoc.executionframework.test.lib.ILanguageWrapper +import org.gemoc.xdsmlframework.api.core.IRunConfiguration +import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension +import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint +import org.gemoc.executionframework.test.lib.IExecutableModel + +class TestRunConfiguration implements IRunConfiguration { + private val ILanguageWrapper language + private val IExecutableModel model + private val Set addonsToLoad + private val URI modelURI + + new(IExecutableModel model, URI modelURI, ILanguageWrapper language, Set addonsToLoad) { + this.language = language + this.model = model + this.addonsToLoad = addonsToLoad + this.modelURI = modelURI + } + + override getAnimationDelay() { + return 0; + } + + override getAnimatorURI() { + return null; + } + + override getDeadlockDetectionDepth() { + return 0; + } + + override getEngineAddonExtensions() { + val List result = new ArrayList(); + val loadedAddons = EngineAddonSpecificationExtensionPoint.getSpecifications() + for (ext : loadedAddons) { + if (addonsToLoad.contains(ext.name)) { + result.add(ext) + } + } + return result + } + + override getExecutedModelAsMelangeURI() { + if (melangeQuery.isEmpty()) + return modelURI; + val String melangeURIString = modelURI.toString().replace("platform:/", "melange:/") + melangeQuery; + return URI.createURI(melangeURIString); + } + + override getExecutedModelURI() { + modelURI + } + + override getExecutionEntryPoint() { + language.entryPoint + } + + override getLanguageName() { + language.languageName + } + + override getMelangeQuery() { + model.melangeQuery + } + + override getBreakStart() { + false + } + + override getDebugModelID() { + "org.gemoc.execution.sequential.javaengine.ui.debugModel" + } + + override getModelEntryPoint() { + val ResourceSet resourceSet = new ResourceSetImpl(); + val Resource modelResource = resourceSet.createResource(modelURI); + modelResource.load(null); + val result = modelResource.getURIFragment(modelResource.contents.head) + modelResource.unload + return result + } + + override getModelInitializationArguments() { + model.initArgument + } + + override getModelInitializationMethod() { + language.initializationMethod + } +} diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend new file mode 100644 index 000000000..790b0ebe3 --- /dev/null +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend @@ -0,0 +1,133 @@ +package org.gemoc.executionframework.test.lib.impl + +import java.io.File +import java.io.FileInputStream +import java.io.InputStream +import java.util.Map.Entry +import org.eclipse.core.resources.IFile +import org.eclipse.core.resources.IFolder +import org.eclipse.core.resources.IProject +import org.eclipse.core.resources.IResource +import org.eclipse.core.runtime.FileLocator +import org.eclipse.core.runtime.IProgressMonitor +import org.eclipse.core.runtime.Path +import org.eclipse.core.runtime.Platform +import org.eclipse.core.runtime.jobs.Job +import org.eclipse.swt.widgets.Display +import org.eclipse.ui.IWindowListener +import org.eclipse.ui.IWorkbenchWindow +import org.eclipse.ui.PlatformUI +import org.gemoc.executionframework.engine.Activator +import org.gemoc.xdsmlframework.api.core.EngineStatus +import org.gemoc.xdsmlframework.api.core.IExecutionEngine +import org.osgi.framework.Bundle + +class TestUtil { + + public static def void copyFileInWS(File file, IFolder destination, IProgressMonitor m) { + val fileInProject = destination.getFile(file.name) + if (!fileInProject.exists) + fileInProject.create(new FileInputStream(file), true, m); + } + + public static def IFolder copyFolderInWS(File folder, IResource destination, IProgressMonitor m) { + val folderCopy = if (destination instanceof IProject) { + destination.getFolder(folder.name) + } else if (destination instanceof IFolder) { + destination.getFolder(folder.name) + } else + null + + if (!folderCopy.exists) + folderCopy.create(true, true, m) + for (File f : folder.listFiles) { + if (f.isFile) { + copyFileInWS(f, folderCopy, m) + } else if (f.isDirectory) { + copyFolderInWS(f, folderCopy, m) + } + } + return folderCopy + } + + public static def void waitForJobs() { + while (!Job.getJobManager().isIdle()) + delay(100); + } + + public static def void waitForJobsThenWindowClosed() { + waitForJobsThenWait(1000000000); + } + + public static def void waitForJobsThenWait(long waitTimeMillis) { + waitForJobs(); + delay(waitTimeMillis); + } + + public static def void waitUIThread(long waitTimeMillis) { + delay(waitTimeMillis); + } + + static var closed = false; + + private static def void delay(long waitTimeMillis) { + val Display display = Display.getCurrent(); + + // We try to capture when the window is closed by the tester + PlatformUI.getWorkbench.addWindowListener( + new IWindowListener() { + + override windowActivated(IWorkbenchWindow window) { + } + + override windowClosed(IWorkbenchWindow window) { + closed = true + } + + override windowDeactivated(IWorkbenchWindow window) { + } + + override windowOpened(IWorkbenchWindow window) { + } + + } + ) + + // If this is the UI thread, + // then process input. + if (display != null) { + val long endTimeMillis = System.currentTimeMillis() + waitTimeMillis; + while (System.currentTimeMillis() < endTimeMillis && !closed) { + if (!display.readAndDispatch()) + display.sleep(); + } + display.update(); + } // Otherwise, perform a simple sleep. + else { + try { + Thread.sleep(waitTimeMillis); + } catch (InterruptedException e) { + // Ignored. + } + } + } + + def static public void removeStoppedEngines() { + val registry = Activator.getDefault().gemocRunningEngineRegistry + for (Entry engineEntry : registry.getRunningEngines().entrySet()) { + if (engineEntry.value.runningStatus.equals(EngineStatus.RunStatus.Stopped)) { + registry.unregisterEngine(engineEntry.getKey()) + } + + } + } + + def static copyFileFromPlugin(String pluginName, String pathInPlugin, IFile targetFile, IProgressMonitor m) { + val Bundle bundle = Platform::getBundle(pluginName); + val path = new Path(pathInPlugin) + val InputStream stream = FileLocator::openStream(bundle, path, false); + targetFile.create(stream, true, m); + } + + +} From dd13f537a2cd44e68797c0a3d5850ea14fdbbd81 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 12 May 2017 09:57:33 +0200 Subject: [PATCH 173/267] [JavaEngine] Add first version of java engine test plugin --- .../.classpath | 8 ++++ .../.project | 34 +++++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 7 +++ .../JavaEngineTests.launch | 43 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 19 ++++++++ .../build.properties | 5 +++ .../test/javaengine/JavaEngineWrapper.xtend | 40 +++++++++++++++++ .../test/javaengine/languages/LegacyFSM.xtend | 21 +++++++++ .../test/javaengine/languages/TFSM.xtend | 20 +++++++++ .../javaengine/tests/JavaEngineTests.xtend | 39 +++++++++++++++++ 10 files changed, 236 insertions(+) create mode 100644 java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.classpath create mode 100644 java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.project create mode 100644 java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.settings/org.eclipse.jdt.core.prefs create mode 100644 java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/JavaEngineTests.launch create mode 100644 java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/META-INF/MANIFEST.MF create mode 100644 java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/build.properties create mode 100644 java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/JavaEngineWrapper.xtend create mode 100644 java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/LegacyFSM.xtend create mode 100644 java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/TFSM.xtend create mode 100644 java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/tests/JavaEngineTests.xtend diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.classpath b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.classpath new file mode 100644 index 000000000..428337e56 --- /dev/null +++ b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.project b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.project new file mode 100644 index 000000000..074cdf9a8 --- /dev/null +++ b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.project @@ -0,0 +1,34 @@ + + + org.gemoc.executionframework.test.javaengine + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature + + diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.settings/org.eclipse.jdt.core.prefs b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/JavaEngineTests.launch b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/JavaEngineTests.launch new file mode 100644 index 000000000..f53aaeec8 --- /dev/null +++ b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/JavaEngineTests.launch @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/META-INF/MANIFEST.MF b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/META-INF/MANIFEST.MF new file mode 100644 index 000000000..d29284023 --- /dev/null +++ b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/META-INF/MANIFEST.MF @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Javaengine +Bundle-SymbolicName: org.gemoc.executionframework.test.javaengine +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: com.google.guava, + org.eclipse.xtext.xbase.lib, + org.eclipse.xtend.lib, + org.eclipse.xtend.lib.macro, + org.gemoc.executionframework.test.lib;bundle-version="1.0.0", + org.gemoc.execution.sequential.javaengine;bundle-version="2.3.0", + org.eclipse.emf.common;bundle-version="2.12.0", + org.junit;bundle-version="4.12.0", + org.gemoc.executionframework.engine;bundle-version="2.3.0", + org.gemoc.xdsmlframework.api;bundle-version="2.3.0", + fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="3.2.1" +Export-Package: org.gemoc.executionframework.test.javaengine.languages + diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/build.properties b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/build.properties new file mode 100644 index 000000000..d8e2f0e92 --- /dev/null +++ b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/build.properties @@ -0,0 +1,5 @@ +source.. = src/,\ + xtend-gen/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/JavaEngineWrapper.xtend b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/JavaEngineWrapper.xtend new file mode 100644 index 000000000..218804f11 --- /dev/null +++ b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/JavaEngineWrapper.xtend @@ -0,0 +1,40 @@ +package org.gemoc.executionframework.test.javaengine + +import java.util.Set +import org.eclipse.emf.common.util.URI +import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine +import org.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext +import org.gemoc.executionframework.test.lib.IEngineWrapper +import org.gemoc.executionframework.test.lib.ILanguageWrapper +import org.gemoc.executionframework.test.lib.impl.TestRunConfiguration +import org.gemoc.xdsmlframework.api.core.ExecutionMode +import org.gemoc.xdsmlframework.api.core.IExecutionContext +import org.gemoc.xdsmlframework.api.core.IRunConfiguration +import org.gemoc.executionframework.test.lib.IExecutableModel + +class JavaEngineWrapper implements IEngineWrapper { + + private PlainK3ExecutionEngine engine + + override run() { + engine.start(); + engine.joinThread(); + if (engine.error != null) + throw engine.error + } + + override prepare(ILanguageWrapper wrapper, IExecutableModel model, Set addons, URI uri) { + engine = new PlainK3ExecutionEngine() + val IRunConfiguration runConf = new TestRunConfiguration(model, uri,wrapper,addons) + val IExecutionContext exeContext = new SequentialModelExecutionContext(runConf, ExecutionMode::Run); + exeContext.initializeResourceModel(); + engine.initialize(exeContext) + engine.stopOnAddonError = true; + } + + override getRealEngine() { + return engine + } + + +} diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/LegacyFSM.xtend b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/LegacyFSM.xtend new file mode 100644 index 000000000..0cbeb2db1 --- /dev/null +++ b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/LegacyFSM.xtend @@ -0,0 +1,21 @@ +package org.gemoc.executionframework.test.javaengine.languages + +import org.gemoc.executionframework.test.lib.ILanguageWrapper + +class LegacyFSM implements ILanguageWrapper { + + override getEntryPoint() { + "public static void org.gemoc.sample.legacyfsm.xsfsm.xsfsm.aspects.StateMachineAspect.main(org.gemoc.sample.legacyfsm.xsfsm.xsfsm.fsm.StateMachine)" + } + + override getLanguageName() { + "org.gemoc.sample.legacyfsm.xsfsm.XSFSM" + } + + override getInitializationMethod() { + "org.gemoc.sample.legacyfsm.xsfsm.xsfsm.aspects.StateMachineAspect.initializeModel" + } + + + +} \ No newline at end of file diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/TFSM.xtend b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/TFSM.xtend new file mode 100644 index 000000000..5f51f7bc9 --- /dev/null +++ b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/TFSM.xtend @@ -0,0 +1,20 @@ +package org.gemoc.executionframework.test.javaengine.languages + +import org.gemoc.executionframework.test.lib.ILanguageWrapper + +class TFSM implements ILanguageWrapper { + + override getEntryPoint() { + "public static void org.gemoc.sample.tfsm.sequential.xtfsm.aspects.TimedSystemAspect.main(org.gemoc.sample.tfsm.sequential.xtfsm.tfsm.TimedSystem)" + } + + override getLanguageName() { + "org.gemoc.sample.tfsm.sequential.XTfsm" + } + + override getInitializationMethod() { + "org.gemoc.sample.tfsm.sequential.xtfsm.aspects.TimedSystemAspect.initializeModel" + } + + +} diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/tests/JavaEngineTests.xtend b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/tests/JavaEngineTests.xtend new file mode 100644 index 000000000..480e466bc --- /dev/null +++ b/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/tests/JavaEngineTests.xtend @@ -0,0 +1,39 @@ +package org.gemoc.executionframework.test.javaengine.tests + +import org.gemoc.executionframework.test.javaengine.JavaEngineWrapper +import org.gemoc.executionframework.test.javaengine.languages.LegacyFSM +import org.gemoc.executionframework.test.javaengine.languages.TFSM +import org.gemoc.executionframework.test.lib.impl.TestHelper +import org.gemoc.executionframework.test.lib.impl.TestModel +import org.junit.Test + +class JavaEngineTests { + + public static val tfsmModelsPlugin = "org.gemoc.sample.tfsm.sequential.single_traffic_light_sample" + public static val legacyFsmModelsPlugin = "org.gemoc.sample.legacyfsm.model_examples" + + @Test + def void testTFSM() { + TestHelper::testWithoutExtraAddons(new JavaEngineWrapper(), new TFSM(), + new TestModel(tfsmModelsPlugin, "/", "single_traffic_light.xtfsm", "","")) + } + + @Test + def void testTFSMGenericTrace() { + TestHelper::testWithGenericTrace(new JavaEngineWrapper(), new TFSM(), + new TestModel(tfsmModelsPlugin, "/", "single_traffic_light.xtfsm", "","")) + } + + @Test + def void testLegacyFSM() { + TestHelper::testWithGenericTrace(new JavaEngineWrapper(), new LegacyFSM(), + new TestModel(legacyFsmModelsPlugin, "/", "BitShifting.fsm", "000101010","?lang=org.gemoc.sample.legacyfsm.xsfsm.XSFSM")) + } + + @Test + def void testLegacyFSMGenericTrace() { + TestHelper::testWithoutExtraAddons(new JavaEngineWrapper(), new LegacyFSM(), + new TestModel(legacyFsmModelsPlugin, "/", "BitShifting.fsm", "000101010","?lang=org.gemoc.sample.legacyfsm.xsfsm.XSFSM")) + } + +} From 149a205afd26e972ee7064bdfef446b28e8b9635 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 12 May 2017 10:02:31 +0200 Subject: [PATCH 174/267] [JavaEngine] Rename test plugin to match java engine plugin --- .../.classpath | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../JavaEngineTests.launch | 8 ++++---- .../META-INF/MANIFEST.MF | 6 ++++-- .../build.properties | 0 .../sequential}/javaengine/tests/JavaEngineTests.xtend | 8 ++++---- .../javaengine/tests}/languages/LegacyFSM.xtend | 4 ++-- .../sequential/javaengine/tests}/languages/TFSM.xtend | 2 +- .../javaengine/tests/wrapper}/JavaEngineWrapper.xtend | 2 +- 10 files changed, 17 insertions(+), 15 deletions(-) rename java_execution/java_engine/tests/{org.gemoc.executionframework.test.javaengine => org.gemoc.execution.sequential.javaengine.tests}/.classpath (100%) rename java_execution/java_engine/tests/{org.gemoc.executionframework.test.javaengine => org.gemoc.execution.sequential.javaengine.tests}/.project (92%) rename java_execution/java_engine/tests/{org.gemoc.executionframework.test.javaengine => org.gemoc.execution.sequential.javaengine.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename java_execution/java_engine/tests/{org.gemoc.executionframework.test.javaengine => org.gemoc.execution.sequential.javaengine.tests}/JavaEngineTests.launch (99%) rename java_execution/java_engine/tests/{org.gemoc.executionframework.test.javaengine => org.gemoc.execution.sequential.javaengine.tests}/META-INF/MANIFEST.MF (71%) rename java_execution/java_engine/tests/{org.gemoc.executionframework.test.javaengine => org.gemoc.execution.sequential.javaengine.tests}/build.properties (100%) rename java_execution/java_engine/tests/{org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test => org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential}/javaengine/tests/JavaEngineTests.xtend (81%) rename java_execution/java_engine/tests/{org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine => org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests}/languages/LegacyFSM.xtend (88%) rename java_execution/java_engine/tests/{org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine => org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests}/languages/TFSM.xtend (88%) rename java_execution/java_engine/tests/{org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine => org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/wrapper}/JavaEngineWrapper.xtend (95%) diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.classpath b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.classpath similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.classpath rename to java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.classpath diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.project b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.project similarity index 92% rename from java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.project rename to java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.project index 074cdf9a8..38705632c 100644 --- a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.project +++ b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.project @@ -1,6 +1,6 @@ - org.gemoc.executionframework.test.javaengine + org.gemoc.execution.sequential.javaengine.tests diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.settings/org.eclipse.jdt.core.prefs b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/.settings/org.eclipse.jdt.core.prefs rename to java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/JavaEngineTests.launch b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/JavaEngineTests.launch similarity index 99% rename from java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/JavaEngineTests.launch rename to java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/JavaEngineTests.launch index f53aaeec8..462477f8c 100644 --- a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/JavaEngineTests.launch +++ b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/JavaEngineTests.launch @@ -14,19 +14,19 @@ - + - + - + - + diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/META-INF/MANIFEST.MF b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF similarity index 71% rename from java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/META-INF/MANIFEST.MF rename to java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF index d29284023..dfddafa66 100644 --- a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Javaengine -Bundle-SymbolicName: org.gemoc.executionframework.test.javaengine +Bundle-SymbolicName: org.gemoc.execution.sequential.javaengine.tests Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.google.guava, @@ -15,5 +15,7 @@ Require-Bundle: com.google.guava, org.gemoc.executionframework.engine;bundle-version="2.3.0", org.gemoc.xdsmlframework.api;bundle-version="2.3.0", fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="3.2.1" -Export-Package: org.gemoc.executionframework.test.javaengine.languages +Export-Package: org.gemoc.execution.sequential.javaengine.tests, + org.gemoc.execution.sequential.javaengine.tests.languages, + org.gemoc.execution.sequential.javaengine.tests.wrapper diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/build.properties b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/build.properties similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/build.properties rename to java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/build.properties diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/tests/JavaEngineTests.xtend b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend similarity index 81% rename from java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/tests/JavaEngineTests.xtend rename to java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend index 480e466bc..80b79045e 100644 --- a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/tests/JavaEngineTests.xtend +++ b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend @@ -1,8 +1,8 @@ -package org.gemoc.executionframework.test.javaengine.tests +package org.gemoc.execution.sequential.javaengine.tests -import org.gemoc.executionframework.test.javaengine.JavaEngineWrapper -import org.gemoc.executionframework.test.javaengine.languages.LegacyFSM -import org.gemoc.executionframework.test.javaengine.languages.TFSM +import org.gemoc.execution.sequential.javaengine.tests.languages.LegacyFSM +import org.gemoc.execution.sequential.javaengine.tests.languages.TFSM +import org.gemoc.execution.sequential.javaengine.tests.wrapper.JavaEngineWrapper import org.gemoc.executionframework.test.lib.impl.TestHelper import org.gemoc.executionframework.test.lib.impl.TestModel import org.junit.Test diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/LegacyFSM.xtend b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend similarity index 88% rename from java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/LegacyFSM.xtend rename to java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend index 0cbeb2db1..13bb35094 100644 --- a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/LegacyFSM.xtend +++ b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend @@ -1,4 +1,4 @@ -package org.gemoc.executionframework.test.javaengine.languages +package org.gemoc.execution.sequential.javaengine.tests.languages import org.gemoc.executionframework.test.lib.ILanguageWrapper @@ -18,4 +18,4 @@ class LegacyFSM implements ILanguageWrapper { -} \ No newline at end of file +} diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/TFSM.xtend b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend similarity index 88% rename from java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/TFSM.xtend rename to java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend index 5f51f7bc9..e2b560b52 100644 --- a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/languages/TFSM.xtend +++ b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend @@ -1,4 +1,4 @@ -package org.gemoc.executionframework.test.javaengine.languages +package org.gemoc.execution.sequential.javaengine.tests.languages import org.gemoc.executionframework.test.lib.ILanguageWrapper diff --git a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/JavaEngineWrapper.xtend b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend similarity index 95% rename from java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/JavaEngineWrapper.xtend rename to java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend index 218804f11..55284c0b4 100644 --- a/java_execution/java_engine/tests/org.gemoc.executionframework.test.javaengine/src/org/gemoc/executionframework/test/javaengine/JavaEngineWrapper.xtend +++ b/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend @@ -1,4 +1,4 @@ -package org.gemoc.executionframework.test.javaengine +package org.gemoc.execution.sequential.javaengine.tests.wrapper import java.util.Set import org.eclipse.emf.common.util.URI From 2124044a8f3947c37f82621bd6a9712eeb41b7b3 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Fri, 12 May 2017 11:04:39 +0200 Subject: [PATCH 175/267] [Travis] Add use of travis_retry for maven commands --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84587be86..f00f22b9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ jdk: - oraclejdk8 before_install: echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc install: -- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository +- travis_retry mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository script: # Build update-site -- mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository clean verify +- travis_retry mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository clean verify # Rename the zipped update site to nightly - mv releng/org.gemoc.siriusanimation.repository/target/org.gemoc.siriusanimation.repository-*-SNAPSHOT.zip releng/org.gemoc.siriusanimation.repository/target/org.gemoc.siriusanimation.repository-nightly.zip From 1a7cafe98791f529fe1fb278943f7b5267f9fd88 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 12 May 2017 12:14:09 +0200 Subject: [PATCH 176/267] adding .m2 in travis cache --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f00f22b9f..8bc78d279 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,9 @@ env: - MAVEN_OPTS="-Xmx2g" jdk: - oraclejdk8 +cache: + directories: + - $HOME/.m2 before_install: echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc install: - travis_retry mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository From e97dad93ca83621255d74322129bd5587dbe0a76 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 9 May 2017 16:00:13 +0200 Subject: [PATCH 177/267] [ExeFramework] Create new debugger plugins + move debug stuff there --- .../.classpath | 7 +++++ .../.project | 28 +++++++++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 7 +++++ .../META-INF/MANIFEST.MF | 8 ++++++ .../build.properties | 4 +++ .../BreakpointDetailPaneFactory.java | 0 .../breakpoint/GemocBreakpointDetailPane.java | 0 .../semanticsopener/OpenSemanticsHandler.java | 0 .../action/GemocToggleBreakpointAction.java | 0 .../ui/debug2}/MutableFieldNameProvider.xtend | 0 .../.classpath | 7 +++++ .../org.executionframework.debugger/.project | 28 +++++++++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 7 +++++ .../META-INF/MANIFEST.MF | 15 ++++++++++ .../build.properties | 4 +++ .../ui/debug/AbstractGemocDebugger.java | 0 .../debug/AbstractGemocDebuggerFactory.java | 0 .../AnnotationMutableFieldExtractor.xtend | 0 .../engine/ui/debug/IGemocDebugger.java | 0 .../ui/debug/IMutableFieldExtractor.java | 0 .../IntrospectiveMutableFieldExtractor.xtend | 0 .../engine/ui/debug/MutableField.java | 0 .../ui/debug/breakpoint/GemocBreakpoint.java | 0 .../.classpath | 1 - .../.project | 6 ---- 25 files changed, 115 insertions(+), 7 deletions(-) create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger.ui/.project create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger.ui/build.properties rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger.ui}/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/BreakpointDetailPaneFactory.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger.ui}/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpointDetailPane.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger.ui}/src/org/gemoc/executionframework/engine/ui/debug/semanticsopener/OpenSemanticsHandler.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger.ui}/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug => org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug2}/MutableFieldNameProvider.xtend (100%) create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger/.classpath create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger/.project create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger/build.properties rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger}/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger}/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebuggerFactory.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger}/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger}/src/org/gemoc/executionframework/engine/ui/debug/IGemocDebugger.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger}/src/org/gemoc/executionframework/engine/ui/debug/IMutableFieldExtractor.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger}/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger}/src/org/gemoc/executionframework/engine/ui/debug/MutableField.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger}/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpoint.java (100%) diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath b/framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath new file mode 100644 index 000000000..eca7bdba8 --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.project b/framework/execution_framework/plugins/org.executionframework.debugger.ui/.project new file mode 100644 index 000000000..14e7b2444 --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/.project @@ -0,0 +1,28 @@ + + + org.executionframework.debugger.ui + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF new file mode 100644 index 000000000..3af73808e --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Ui +Bundle-SymbolicName: org.executionframework.debugger.ui +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: org.gemoc.executionframework.engine.ui.debug.semanticsopener;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", + org.gemoc.executionframework.engine.ui.debug.sirius.action diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/build.properties b/framework/execution_framework/plugins/org.executionframework.debugger.ui/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/BreakpointDetailPaneFactory.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/BreakpointDetailPaneFactory.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/BreakpointDetailPaneFactory.java rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/BreakpointDetailPaneFactory.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpointDetailPane.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpointDetailPane.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpointDetailPane.java rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpointDetailPane.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/semanticsopener/OpenSemanticsHandler.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/semanticsopener/OpenSemanticsHandler.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/semanticsopener/OpenSemanticsHandler.java rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/semanticsopener/OpenSemanticsHandler.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/MutableFieldNameProvider.xtend b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug2/MutableFieldNameProvider.xtend similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/MutableFieldNameProvider.xtend rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug2/MutableFieldNameProvider.xtend diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/.classpath b/framework/execution_framework/plugins/org.executionframework.debugger/.classpath new file mode 100644 index 000000000..eca7bdba8 --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/.project b/framework/execution_framework/plugins/org.executionframework.debugger/.project new file mode 100644 index 000000000..974346ec1 --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger/.project @@ -0,0 +1,28 @@ + + + org.executionframework.debugger + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF new file mode 100644 index 000000000..b017bd655 --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF @@ -0,0 +1,15 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Debugger +Bundle-SymbolicName: org.executionframework.debugger +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: org.gemoc.executionframework.engine.ui.debug;uses:="org.eclipse.emf.ecore", + org.gemoc.executionframework.engine.ui.debug.breakpoint; + uses:="org.eclipse.emf.ecore, + org.eclipse.ui, + fr.obeo.dsl.debug.ide, + org.eclipse.swt.widgets, + org.eclipse.core.resources, + org.eclipse.debug.ui, + org.eclipse.jface.viewers" diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/build.properties b/framework/execution_framework/plugins/org.executionframework.debugger/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebuggerFactory.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebuggerFactory.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebuggerFactory.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebuggerFactory.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IGemocDebugger.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IGemocDebugger.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IGemocDebugger.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IGemocDebugger.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IMutableFieldExtractor.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IMutableFieldExtractor.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IMutableFieldExtractor.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IMutableFieldExtractor.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/MutableField.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/MutableField.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/MutableField.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/MutableField.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpoint.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpoint.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpoint.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpoint.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.classpath b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.classpath index 96d4ad218..8ec67028c 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.classpath +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.classpath @@ -7,6 +7,5 @@ - diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.project b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.project index 72dc08dd8..b4cc92774 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.project +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.project @@ -5,11 +5,6 @@ - - org.eclipse.xtext.ui.shared.xtextBuilder - - - org.eclipse.jdt.core.javabuilder @@ -40,7 +35,6 @@ org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature net.sourceforge.metrics.nature - org.eclipse.xtext.ui.shared.xtextNature net.sf.eclipsecs.core.CheckstyleNature From aaa3eed50ff1a107c4a155376a43da53abe610d5 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 9 May 2017 16:04:48 +0200 Subject: [PATCH 178/267] [ExeFramework] Rename packages in new debugger plugins --- .../org.executionframework.debugger.ui/META-INF/MANIFEST.MF | 2 +- .../debugger/ui}/MutableFieldNameProvider.xtend | 0 .../debugger/ui}/OpenSemanticsHandler.java | 2 +- .../debugger/ui/breakpoints}/BreakpointDetailPaneFactory.java | 2 +- .../debugger/ui/breakpoints}/GemocBreakpointDetailPane.java | 2 +- .../debugger/ui/breakpoints}/GemocToggleBreakpointAction.java | 4 ++-- .../org.executionframework.debugger/META-INF/MANIFEST.MF | 2 +- .../debugger}/AbstractGemocDebugger.java | 4 ++-- .../debugger}/AbstractGemocDebuggerFactory.java | 2 +- .../debugger}/AnnotationMutableFieldExtractor.xtend | 0 .../debugger}/GemocBreakpoint.java | 2 +- .../debug => executionframework/debugger}/IGemocDebugger.java | 2 +- .../debugger}/IMutableFieldExtractor.java | 2 +- .../debugger}/IntrospectiveMutableFieldExtractor.xtend | 0 .../debug => executionframework/debugger}/MutableField.java | 2 +- 15 files changed, 14 insertions(+), 14 deletions(-) rename framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/{gemoc/executionframework/engine/ui/debug2 => executionframework/debugger/ui}/MutableFieldNameProvider.xtend (100%) rename framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/{gemoc/executionframework/engine/ui/debug/semanticsopener => executionframework/debugger/ui}/OpenSemanticsHandler.java (98%) rename framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/{gemoc/executionframework/engine/ui/debug/breakpoint => executionframework/debugger/ui/breakpoints}/BreakpointDetailPaneFactory.java (97%) rename framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/{gemoc/executionframework/engine/ui/debug/breakpoint => executionframework/debugger/ui/breakpoints}/GemocBreakpointDetailPane.java (98%) rename framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/{gemoc/executionframework/engine/ui/debug/sirius/action => executionframework/debugger/ui/breakpoints}/GemocToggleBreakpointAction.java (93%) rename framework/execution_framework/plugins/org.executionframework.debugger/src/org/{gemoc/executionframework/engine/ui/debug => executionframework/debugger}/AbstractGemocDebugger.java (99%) rename framework/execution_framework/plugins/org.executionframework.debugger/src/org/{gemoc/executionframework/engine/ui/debug => executionframework/debugger}/AbstractGemocDebuggerFactory.java (94%) rename framework/execution_framework/plugins/org.executionframework.debugger/src/org/{gemoc/executionframework/engine/ui/debug => executionframework/debugger}/AnnotationMutableFieldExtractor.xtend (100%) rename framework/execution_framework/plugins/org.executionframework.debugger/src/org/{gemoc/executionframework/engine/ui/debug/breakpoint => executionframework/debugger}/GemocBreakpoint.java (98%) rename framework/execution_framework/plugins/org.executionframework.debugger/src/org/{gemoc/executionframework/engine/ui/debug => executionframework/debugger}/IGemocDebugger.java (94%) rename framework/execution_framework/plugins/org.executionframework.debugger/src/org/{gemoc/executionframework/engine/ui/debug => executionframework/debugger}/IMutableFieldExtractor.java (92%) rename framework/execution_framework/plugins/org.executionframework.debugger/src/org/{gemoc/executionframework/engine/ui/debug => executionframework/debugger}/IntrospectiveMutableFieldExtractor.xtend (100%) rename framework/execution_framework/plugins/org.executionframework.debugger/src/org/{gemoc/executionframework/engine/ui/debug => executionframework/debugger}/MutableField.java (96%) diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF index 3af73808e..5e86d303b 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: Ui Bundle-SymbolicName: org.executionframework.debugger.ui Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.gemoc.executionframework.engine.ui.debug.semanticsopener;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", +Export-Package: org.executionframework.debugger.ui;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", org.gemoc.executionframework.engine.ui.debug.sirius.action diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug2/MutableFieldNameProvider.xtend b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/MutableFieldNameProvider.xtend similarity index 100% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug2/MutableFieldNameProvider.xtend rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/MutableFieldNameProvider.xtend diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/semanticsopener/OpenSemanticsHandler.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java similarity index 98% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/semanticsopener/OpenSemanticsHandler.java rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java index 9af56fcf5..f8cf9b8fe 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/semanticsopener/OpenSemanticsHandler.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.debug.semanticsopener; +package org.executionframework.debugger.ui; import java.io.File; import java.io.IOException; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/BreakpointDetailPaneFactory.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java similarity index 97% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/BreakpointDetailPaneFactory.java rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java index 8a13af5bc..4ab728c63 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/BreakpointDetailPaneFactory.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.debug.breakpoint; +package org.executionframework.debugger.ui.breakpoints; import java.util.HashSet; import java.util.Set; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpointDetailPane.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java similarity index 98% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpointDetailPane.java rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java index 132a7cc1e..40a68eac0 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpointDetailPane.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.debug.breakpoint; +package org.executionframework.debugger.ui.breakpoints; import org.eclipse.debug.ui.IDetailPane; import org.eclipse.jface.viewers.IStructuredSelection; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java similarity index 93% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java index e227ecabe..8d0ee45bd 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/gemoc/executionframework/engine/ui/debug/sirius/action/GemocToggleBreakpointAction.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.debug.sirius.action; +package org.executionframework.debugger.ui.breakpoints; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint; +import org.executionframework.debugger.ui.breakpoint.GemocBreakpoint; import org.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher; import fr.inria.diverse.melange.resource.MelangeResource; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF index b017bd655..bcd561cd7 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Debugger Bundle-SymbolicName: org.executionframework.debugger Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.gemoc.executionframework.engine.ui.debug;uses:="org.eclipse.emf.ecore", +Export-Package: org.executionframework.debugger;uses:="org.eclipse.emf.ecore", org.gemoc.executionframework.engine.ui.debug.breakpoint; uses:="org.eclipse.emf.ecore, org.eclipse.ui, diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebugger.java similarity index 99% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebugger.java index 4a39ef894..2ebce2763 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebugger.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.debug; +package org.executionframework.debugger; import java.util.ArrayDeque; import java.util.ArrayList; @@ -46,8 +46,8 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; +import org.executionframework.debugger.semanticsopener.OpenSemanticsHandler; import org.gemoc.executionframework.engine.ui.Activator; -import org.gemoc.executionframework.engine.ui.debug.semanticsopener.OpenSemanticsHandler; import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebuggerFactory.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebuggerFactory.java similarity index 94% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebuggerFactory.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebuggerFactory.java index 13512c9ba..8ef4ae66e 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebuggerFactory.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebuggerFactory.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.debug; +package org.executionframework.debugger; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AnnotationMutableFieldExtractor.xtend similarity index 100% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AnnotationMutableFieldExtractor.xtend diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpoint.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/GemocBreakpoint.java similarity index 98% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpoint.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/GemocBreakpoint.java index 8804220ad..80fcd3ed4 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/breakpoint/GemocBreakpoint.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/GemocBreakpoint.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.debug.breakpoint; +package org.executionframework.debugger; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IGemocDebugger.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IGemocDebugger.java similarity index 94% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IGemocDebugger.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IGemocDebugger.java index 459c6dead..fad23b019 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IGemocDebugger.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IGemocDebugger.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.debug; +package org.executionframework.debugger; import java.util.function.BiPredicate; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IMutableFieldExtractor.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IMutableFieldExtractor.java similarity index 92% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IMutableFieldExtractor.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IMutableFieldExtractor.java index 4a6ff70b6..d18ed5b61 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IMutableFieldExtractor.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IMutableFieldExtractor.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.debug; +package org.executionframework.debugger; import java.util.List; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend similarity index 100% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/IntrospectiveMutableFieldExtractor.xtend rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/MutableField.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/MutableField.java similarity index 96% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/MutableField.java rename to framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/MutableField.java index 85b2973a6..f6501c110 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/gemoc/executionframework/engine/ui/debug/MutableField.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/MutableField.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.debug; +package org.executionframework.debugger; import java.util.function.Consumer; import java.util.function.Supplier; From 57589bb2cca76771c33c2d8c5e03b8ee4864f9f8 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 9 May 2017 18:35:39 +0200 Subject: [PATCH 179/267] [ExeFramework] Add activators to debugger plugins --- .../debugger/ui/Activator.java | 98 ++++++++++++++++ .../debugger/Activator.java | 109 ++++++++++++++++++ 2 files changed, 207 insertions(+) create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/Activator.java create mode 100644 framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/Activator.java diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/Activator.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/Activator.java new file mode 100644 index 000000000..72ebeffc7 --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/Activator.java @@ -0,0 +1,98 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package org.executionframework.debugger.ui; + +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; +//import org.gemoc.gemoc_language_workbench.extensions.sirius.services.AbstractGemocDebuggerServices; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.executionframework.debugger.ui"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + private OpenSemanticsHandler handler; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework. + * BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework. + * BundleContext) + */ + public void stop(BundleContext context) throws Exception { + // AbstractGemocDebuggerServices.LISTENER.uninstall(); + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + /** + * Returns an image descriptor for the image file at the given plug-in + * relative path + * + * @param path + * the path + * @return the image descriptor + */ + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } + + public static void warn(String msg, Throwable e) { + Activator.getDefault().getLog().log(new Status(Status.WARNING, PLUGIN_ID, Status.OK, msg, e)); + } + + public static void error(String msg, Throwable e) { + Activator.getDefault().getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, msg, e)); + } + + public OpenSemanticsHandler getHandler() { + return handler; + } + + void setHandler(OpenSemanticsHandler handler) { + this.handler = handler; + } + +} diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/Activator.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/Activator.java new file mode 100644 index 000000000..356d5a754 --- /dev/null +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/Activator.java @@ -0,0 +1,109 @@ +/******************************************************************************* + * Copyright (c) 2016 Inria and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package org.executionframework.debugger; + +import java.util.function.Supplier; + +import org.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend; +import org.gemoc.commons.eclipse.pde.GemocPlugin; +import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.osgi.framework.BundleContext; + +import fr.inria.diverse.commons.eclipse.messagingsystem.api.MessagingSystemManager; +import fr.inria.diverse.commons.messagingsystem.api.MessagingSystem; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends GemocPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.executionframework.debugger"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + private Supplier engineSupplier; + + private Supplier bundleSymbolicNameSupplier; + + public void setHandlerFieldSuppliers(Supplier engineSupplier, + Supplier bundleSymbolicNameSupplier) { + this.engineSupplier = engineSupplier; + this.bundleSymbolicNameSupplier = bundleSymbolicNameSupplier; + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return Activator.plugin; + } + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework. + * BundleContext ) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + Activator.plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework. + * BundleContext ) + */ + @Override + public void stop(BundleContext context) throws Exception { + Activator.plugin = null; + super.stop(context); + } + + @Override + public String getId() { + return PLUGIN_ID; + } + + private DefaultLoggingBackend _loggingBackend; + + @Override + public DefaultLoggingBackend resolveLoggingBackend() { + if (_loggingBackend == null) { + _loggingBackend = new DefaultLoggingBackend(this); + MessagingSystemManager msm = new MessagingSystemManager(); + MessagingSystem ms = msm.createBestPlatformMessagingSystem(PLUGIN_ID, "Debugger"); + _loggingBackend.setMessagingSystem(ms); + } + return _loggingBackend; + } + + public Supplier getEngineSupplier() { + return engineSupplier; + } + + public Supplier getBundleSymbolicNameSupplier() { + return bundleSymbolicNameSupplier; + } + +} From 5dcdc68a41237fcc6dda71aca431708dce5dd1ec Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 9 May 2017 18:37:15 +0200 Subject: [PATCH 180/267] [Debugger] Only configure suppliers for OpenSemanticsHandler --- .../debugger/AbstractGemocDebugger.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebugger.java index 2ebce2763..9fdd0754e 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebugger.java @@ -46,8 +46,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; -import org.executionframework.debugger.semanticsopener.OpenSemanticsHandler; -import org.gemoc.executionframework.engine.ui.Activator; import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; @@ -104,15 +102,8 @@ public AbstractGemocDebugger(IDSLDebugEventProcessor target, IExecutionEngine en registerModelChangeListener(); Activator openSourceActivator = Activator.getDefault(); - if (openSourceActivator != null) { - OpenSemanticsHandler openSourceHandler = openSourceActivator.getHandler(); - if (openSourceHandler != null) { - openSourceHandler.setBundleSymbolicName(bundleSymbolicName); - openSourceHandler.setEngine(this.engine); - } else { - openSourceActivator.setHandlerFieldSuppliers(() -> this.engine, () -> this.bundleSymbolicName); - } - } + openSourceActivator.setHandlerFieldSuppliers(() -> this.engine, () -> this.bundleSymbolicName); + } protected void registerModelChangeListener() { @@ -441,7 +432,7 @@ private void selectLastStackframe() { final IWorkbenchPage workbenchPage = workbench.getActiveWorkbenchWindow().getActivePage(); final IViewPart view = workbenchPage.findView("org.eclipse.debug.ui.DebugView"); if(view == null){ - Activator.warn("Cannot find view org.eclipse.debug.ui.DebugView and update the stack", null); + Activator.getDefault().warn("Cannot find view org.eclipse.debug.ui.DebugView and update the stack", null); return; } view.setFocus(); @@ -503,7 +494,7 @@ public void proposedStepsChanged(IExecutionEngine engine, Collection> lo } @Override - public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) { + public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) { } @Override From 24dba08f14f6adcd05a314b4eb9d4f30644b5f8e Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 9 May 2017 18:38:08 +0200 Subject: [PATCH 181/267] [ExeFramework] Adapt imports/manifests/code to new debug plugins --- .../.classpath | 1 + .../.project | 6 +++ .../META-INF/MANIFEST.MF | 41 ++++++++++++---- .../build.properties | 6 ++- .../plugin.xml | 34 ++++++-------- .../ui/MutableFieldNameProvider.xtend | 7 +-- .../debugger/ui/OpenSemanticsHandler.java | 11 ++++- .../BreakpointDetailPaneFactory.java | 1 + .../GemocBreakpointDetailPane.java | 1 + .../GemocToggleBreakpointAction.java | 2 +- .../.classpath | 1 + .../org.executionframework.debugger/.project | 6 +++ .../META-INF/MANIFEST.MF | 47 +++++++++++++------ .../build.properties | 3 +- .../AnnotationMutableFieldExtractor.xtend | 10 ++-- .../debugger/GemocBreakpoint.java | 5 +- .../IntrospectiveMutableFieldExtractor.xtend | 17 +++---- .../META-INF/MANIFEST.MF | 19 +------- .../build.properties | 4 +- .../engine/ui/Activator.java | 27 ----------- .../META-INF/MANIFEST.MF | 4 +- .../GemocToggleBreakpointHandler.java | 2 +- .../debug/GenericSequentialModelDebugger.java | 4 +- ...GemocSequentialToggleBreakpointAction.java | 2 +- .../javaengine/ui/launcher/Launcher.java | 9 ++-- .../META-INF/MANIFEST.MF | 3 +- .../MultidimensionalTimelineViewPart.java | 2 +- 27 files changed, 148 insertions(+), 127 deletions(-) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.executionframework.debugger.ui}/plugin.xml (52%) diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath b/framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath index eca7bdba8..428337e56 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath @@ -3,5 +3,6 @@ + diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.project b/framework/execution_framework/plugins/org.executionframework.debugger.ui/.project index 14e7b2444..346a0c00a 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.project +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/.project @@ -5,6 +5,11 @@ + + org.eclipse.xtext.ui.shared.xtextBuilder + + + org.eclipse.jdt.core.javabuilder @@ -24,5 +29,6 @@ org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF index 5e86d303b..f27127ed7 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF @@ -1,8 +1,33 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Ui -Bundle-SymbolicName: org.executionframework.debugger.ui -Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.executionframework.debugger.ui;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", - org.gemoc.executionframework.engine.ui.debug.sirius.action +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Ui +Bundle-SymbolicName: org.executionframework.debugger.ui;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Activator: org.executionframework.debugger.ui.Activator +Export-Package: org.executionframework.debugger.ui;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", + org.executionframework.debugger.ui.breakpoints +Require-Bundle: com.google.guava, + org.eclipse.xtext.xbase.lib, + org.eclipse.xtend.lib, + org.eclipse.xtend.lib.macro, + org.eclipse.core.commands, + org.gemoc.xdsmlframework.api, + org.eclipse.jface, + org.eclipse.debug.core, + fr.obeo.dsl.debug.ide, + org.eclipse.core.runtime;bundle-version="3.12.0", + org.gemoc.executionframework.engine, + org.gemoc.commons.eclipse.ui, + org.eclipse.equinox.registry, + org.eclipse.ui.workbench, + org.eclipse.xtext;bundle-version="2.10.0", + org.executionframework.debugger;bundle-version="1.0.0", + fr.obeo.dsl.debug.ide.sirius.ui, + org.gemoc.executionframework.engine.ui, + fr.inria.diverse.melange.resource, + fr.obeo.dsl.debug.ide.ui;bundle-version="2.3.0", + org.eclipse.sirius;bundle-version="4.1.3", + org.eclipse.debug.ui +Bundle-ActivationPolicy: lazy + diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/build.properties b/framework/execution_framework/plugins/org.executionframework.debugger.ui/build.properties index 34d2e4d2d..600d1b446 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/build.properties +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/build.properties @@ -1,4 +1,6 @@ -source.. = src/ +source.. = src/,\ + xtend-gen/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + plugin.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/plugin.xml b/framework/execution_framework/plugins/org.executionframework.debugger.ui/plugin.xml similarity index 52% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/plugin.xml rename to framework/execution_framework/plugins/org.executionframework.debugger.ui/plugin.xml index 43f28086b..d755bae54 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/plugin.xml +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/plugin.xml @@ -2,7 +2,7 @@ @@ -10,19 +10,13 @@ - - - - @@ -30,8 +24,8 @@ + class="org.executionframework.debugger.ui.breakpoints.BreakpointDetailPaneFactory" + id="org.executionframework.debugger.detailFactories"> @@ -40,7 +34,7 @@ + value="org.executionframework.debugger.GemocBreakpoint"> @@ -50,7 +44,7 @@ @@ -60,15 +54,15 @@ + class="org.executionframework.debugger.ui.OpenSemanticsHandler" + commandId="org.executionframework.debugger.ui.openSemantics"> @@ -85,8 +79,8 @@ + actionClass="org.executionframework.debugger.ui.breakpoints.GemocToggleBreakpointAction" + id="org.executionframework.debugger.ui.GemocToggleBreakpointAction"> diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/MutableFieldNameProvider.xtend b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/MutableFieldNameProvider.xtend index 64e17a93b..51b859833 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/MutableFieldNameProvider.xtend +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/MutableFieldNameProvider.xtend @@ -8,11 +8,12 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.gemoc.executionframework.engine.ui.debug + package org.executionframework.debugger.ui import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; - +import org.executionframework.debugger.MutableField + public class MutableFieldNameProvider extends DefaultDeclarativeQualifiedNameProvider{ def QualifiedName qualifiedName(MutableField e) { @@ -21,4 +22,4 @@ public class MutableFieldNameProvider extends DefaultDeclarativeQualifiedNamePro return QualifiedName.create(qnameSegments); } -} \ No newline at end of file +} diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java index f8cf9b8fe..3f56c41d4 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java @@ -16,6 +16,7 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import java.util.function.Supplier; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -28,7 +29,6 @@ import org.eclipse.ui.handlers.HandlerUtil; import org.gemoc.commons.eclipse.ui.OpenEditor; import org.gemoc.executionframework.engine.core.AbstractExecutionEngine; -import org.gemoc.executionframework.engine.ui.Activator; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.osgi.framework.Bundle; @@ -102,6 +102,15 @@ public void locateAndOpenSource(TreeSelection selection) { } public Object execute(ExecutionEvent event) throws ExecutionException { + Supplier engineSupplier = org.executionframework.debugger.Activator.getDefault().getEngineSupplier(); + Supplier bundleSupplier = org.executionframework.debugger.Activator.getDefault().getBundleSymbolicNameSupplier(); + if (engineSupplier != null) { + this.engine = engineSupplier.get(); + } + if (bundleSupplier != null) { + this.bundleSymbolicName = bundleSupplier.get(); + } + TreeSelection selection = (TreeSelection) HandlerUtil.getCurrentSelection(event); locateAndOpenSource(selection); return null; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java index 4ab728c63..d1a8b01a3 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java @@ -17,6 +17,7 @@ import org.eclipse.debug.ui.IDetailPane; import org.eclipse.debug.ui.IDetailPaneFactory; import org.eclipse.jface.viewers.IStructuredSelection; +import org.executionframework.debugger.GemocBreakpoint; import fr.obeo.dsl.debug.ide.DSLBreakpoint; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java index 40a68eac0..2336aa55b 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java @@ -19,6 +19,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbenchPartSite; +import org.executionframework.debugger.GemocBreakpoint; /** * Gemoc {@link IDetailPane} for breakpoints. diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java index 8d0ee45bd..510ef7dd7 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.executionframework.debugger.ui.breakpoint.GemocBreakpoint; +import org.executionframework.debugger.GemocBreakpoint; import org.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher; import fr.inria.diverse.melange.resource.MelangeResource; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/.classpath b/framework/execution_framework/plugins/org.executionframework.debugger/.classpath index eca7bdba8..428337e56 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/.classpath +++ b/framework/execution_framework/plugins/org.executionframework.debugger/.classpath @@ -3,5 +3,6 @@ + diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/.project b/framework/execution_framework/plugins/org.executionframework.debugger/.project index 974346ec1..b55759bd3 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/.project +++ b/framework/execution_framework/plugins/org.executionframework.debugger/.project @@ -5,6 +5,11 @@ + + org.eclipse.xtext.ui.shared.xtextBuilder + + + org.eclipse.jdt.core.javabuilder @@ -24,5 +29,6 @@ org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF index bcd561cd7..e15206fcf 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF @@ -1,15 +1,32 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Debugger -Bundle-SymbolicName: org.executionframework.debugger -Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.executionframework.debugger;uses:="org.eclipse.emf.ecore", - org.gemoc.executionframework.engine.ui.debug.breakpoint; - uses:="org.eclipse.emf.ecore, - org.eclipse.ui, - fr.obeo.dsl.debug.ide, - org.eclipse.swt.widgets, - org.eclipse.core.resources, - org.eclipse.debug.ui, - org.eclipse.jface.viewers" +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Debugger +Bundle-SymbolicName: org.executionframework.debugger;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Activator: org.executionframework.debugger.Activator +Require-Bundle: com.google.guava, + org.eclipse.xtext.xbase.lib, + org.eclipse.xtend.lib, + org.eclipse.xtend.lib.macro, + fr.obeo.dsl.debug.ide, + org.gemoc.xdsmlframework.api, + org.eclipse.emf.ecore, + fr.inria.diverse.trace.commons.model, + org.eclipse.ui.workbench, + org.eclipse.swt;bundle-version="3.105.3", + org.eclipse.jface;bundle-version="3.12.2", + org.eclipse.debug.ui, + fr.obeo.dsl.debug;bundle-version="2.3.0", + org.eclipse.core.runtime;bundle-version="3.12.0", + org.gemoc.executionframework.engine;bundle-version="2.3.0", + org.eclipse.emf.transaction;bundle-version="1.9.0", + org.gemoc.xdsmlframework.commons;bundle-version="2.3.0", + org.eclipse.xtext;bundle-version="2.10.0", + org.gemoc.commons.eclipse;bundle-version="2.3.0", + org.gemoc.commons.eclipse.pde;bundle-version="2.3.0", + fr.inria.diverse.commons.eclipse;bundle-version="1.0.0", + fr.inria.diverse.commons.eclipse.messagingsystem.api;bundle-version="1.0.0" +Export-Package: org.executionframework.debugger +Bundle-ActivationPolicy: lazy + diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/build.properties b/framework/execution_framework/plugins/org.executionframework.debugger/build.properties index 34d2e4d2d..d8e2f0e92 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/build.properties +++ b/framework/execution_framework/plugins/org.executionframework.debugger/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + xtend-gen/ output.. = bin/ bin.includes = META-INF/,\ . diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AnnotationMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AnnotationMutableFieldExtractor.xtend index 889fd3817..b8b64b686 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AnnotationMutableFieldExtractor.xtend +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AnnotationMutableFieldExtractor.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.gemoc.executionframework.engine.ui.debug + package org.executionframework.debugger import java.text.DecimalFormat import java.text.NumberFormat @@ -21,8 +21,6 @@ import org.eclipse.emf.ecore.EObject import org.eclipse.emf.transaction.RecordingCommand import org.eclipse.emf.transaction.util.TransactionUtil import org.gemoc.executionframework.engine.core.CommandExecution -import org.gemoc.executionframework.engine.ui.debug.IMutableFieldExtractor -import org.gemoc.executionframework.engine.ui.debug.MutableField import org.gemoc.xdsmlframework.commons.DynamicAnnotationHelper import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider @@ -36,7 +34,7 @@ class AnnotationMutableFieldExtractor implements IMutableFieldExtractor { val List result = new ArrayList() - val idProp = eObject.eClass.EIDAttribute + val idProp = eObject.eClass.getEIDAttribute val String objectName = if (idProp != null) { val id = eObject.eGet(idProp); if (id != null) { @@ -60,7 +58,7 @@ class AnnotationMutableFieldExtractor implements IMutableFieldExtractor { qname.toString } - for (prop : eObject.eClass.EAllStructuralFeatures) { + for (prop : eObject.eClass.getEAllStructuralFeatures) { if (DynamicAnnotationHelper.isDynamic(prop)) { val mut = new MutableField( /* name */ prop.name+" ("+objectName+ " :"+eObject.eClass.getName +")", @@ -87,4 +85,4 @@ class AnnotationMutableFieldExtractor implements IMutableFieldExtractor { return result } -} \ No newline at end of file +} diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/GemocBreakpoint.java b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/GemocBreakpoint.java index 80fcd3ed4..ff2abc813 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/GemocBreakpoint.java +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/GemocBreakpoint.java @@ -14,7 +14,6 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EObject; -import org.gemoc.executionframework.engine.ui.Activator; import fr.inria.diverse.trace.commons.model.trace.Step; import fr.obeo.dsl.debug.ide.DSLBreakpoint; @@ -104,7 +103,7 @@ public void setBreakOnLogicalStep(boolean value) { try { getMarker().setAttribute(GemocBreakpoint.BREAK_ON_LOGICAL_STEP, String.valueOf(breakOnLogicalStep)); } catch (CoreException e) { - Activator.error(e.getMessage(), e); + Activator.getDefault().error(e.getMessage(), e); } } @@ -120,7 +119,7 @@ public void setBreakOnMSE(boolean value) { getMarker().setAttribute(GemocBreakpoint.BREAK_ON_MSE_OCCURRENCE, String.valueOf(breakOnMSE) ); } catch (CoreException e) { - Activator.error(e.getMessage(), e); + Activator.getDefault().error(e.getMessage(), e); } } diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend index 8cfc83080..982e42b6d 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend +++ b/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.gemoc.executionframework.engine.ui.debug + package org.executionframework.debugger import java.util.ArrayList import java.util.Arrays @@ -33,11 +33,11 @@ class IntrospectiveMutableFieldExtractor implements IMutableFieldExtractor { this.languageName = languageName } - private def String capitalize(String string) { - val c = string.toCharArray() - c.set(0, Character.toUpperCase(c.get(0))) - return new String(c) - } +// private def String capitalize(String string) { +// val c = string.toCharArray() +// c.set(0, Character.toUpperCase(c.get(0))) +// return new String(c) +// } private def String decapitalize(String string) { val c = string.toCharArray() @@ -196,7 +196,7 @@ class IntrospectiveMutableFieldExtractor implements IMutableFieldExtractor { return res } - private def getAllInterfaces(Class cls, HashSet> interfacesFound) { + private def void getAllInterfaces(Class cls, HashSet> interfacesFound) { var currCls = cls; while (currCls != null) { currCls.getInterfaces().forEach [ i | @@ -243,4 +243,5 @@ class IntrospectiveMutableFieldExtractor implements IMutableFieldExtractor { return res } -} \ No newline at end of file +} + \ No newline at end of file diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF index b3fef9341..c055a2b97 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF @@ -25,21 +25,6 @@ Require-Bundle: org.gemoc.xdsmlframework.api, fr.inria.diverse.melange Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.gemoc.executionframework.engine.ui; - uses:="org.osgi.framework, - org.eclipse.jface.resource, - org.gemoc.executionframework.engine.debug.ui.semanticsopener, - org.eclipse.ui.plugin", - org.gemoc.executionframework.engine.ui.commons;uses:="org.eclipse.emf.common.util,org.gemoc.xdsmlframework.api.core,org.eclipse.debug.core", - org.gemoc.executionframework.engine.ui.debug;uses:="org.eclipse.emf.ecore", - org.gemoc.executionframework.engine.ui.debug.breakpoint; - uses:="org.eclipse.emf.ecore, - org.eclipse.ui, - fr.obeo.dsl.debug.ide, - org.eclipse.swt.widgets, - org.eclipse.core.resources, - org.eclipse.debug.ui, - org.eclipse.jface.viewers", - org.gemoc.executionframework.engine.ui.debug.semanticsopener;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", - org.gemoc.executionframework.engine.ui.debug.sirius.action, +Export-Package: org.gemoc.executionframework.engine.ui, + org.gemoc.executionframework.engine.ui.commons, org.gemoc.executionframework.engine.ui.launcher diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/build.properties b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/build.properties index 5e63db887..9cbab3c13 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/build.properties +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/build.properties @@ -1,8 +1,6 @@ -source.. = src/,\ - xtend-gen/ +source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml,\ about.html src.includes = about.html diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java index 34dddccd4..e780f5a6f 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java @@ -10,13 +10,9 @@ *******************************************************************************/ package org.gemoc.executionframework.engine.ui; -import java.util.function.Supplier; - import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.gemoc.executionframework.engine.ui.debug.semanticsopener.OpenSemanticsHandler; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; //import org.gemoc.gemoc_language_workbench.extensions.sirius.services.AbstractGemocDebuggerServices; import org.osgi.framework.BundleContext; @@ -33,12 +29,6 @@ public class Activator extends AbstractUIPlugin { // The shared instance private static Activator plugin; - private OpenSemanticsHandler handler; - - private Supplier engineSupplier; - - private Supplier bundleSymbolicNameSupplier; - /** * The constructor */ @@ -97,21 +87,4 @@ public static void error(String msg, Throwable e){ e)); } - public void setHandler(OpenSemanticsHandler handler) { - this.handler = handler; - if(engineSupplier != null && bundleSymbolicNameSupplier != null) { - this.handler.setEngine(engineSupplier.get()); - this.handler.setBundleSymbolicName(bundleSymbolicNameSupplier.get()); - } - } - - public void setHandlerFieldSuppliers(Supplier engineSupplier, Supplier bundleSymbolicNameSupplier) { - this.engineSupplier = engineSupplier; - this.bundleSymbolicNameSupplier = bundleSymbolicNameSupplier; - } - - public OpenSemanticsHandler getHandler() { - return handler; - } - } diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index 5cc53da82..1573aff81 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -34,7 +34,9 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.gemoc.xdsmlframework.ui.utils, org.eclipse.xtext, org.eclipse.xtend.lib, - fr.inria.diverse.melange.resource + fr.inria.diverse.melange.resource, + org.executionframework.debugger, + org.executionframework.debugger.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java index 8af1bc3e7..772efc3ae 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java @@ -24,8 +24,8 @@ import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.HandlerUtil; +import org.executionframework.debugger.GemocBreakpoint; import org.gemoc.execution.sequential.javaengine.ui.launcher.Launcher; -import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint; import fr.inria.diverse.melange.resource.MelangeResource; import fr.inria.diverse.trace.commons.model.trace.MSE; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java index 52f65ae1c..4d8f106b1 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java @@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; +import org.executionframework.debugger.AbstractGemocDebugger; +import org.executionframework.debugger.GemocBreakpoint; import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; import org.gemoc.executionframework.engine.core.EngineStoppedException; -import org.gemoc.executionframework.engine.ui.debug.AbstractGemocDebugger; -import org.gemoc.executionframework.engine.ui.debug.breakpoint.GemocBreakpoint; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import fr.inria.diverse.melange.resource.MelangeResourceImpl; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java index f0dcf715a..f7f5ba80b 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action; +import org.executionframework.debugger.ui.breakpoints.GemocToggleBreakpointAction; import org.gemoc.execution.sequential.javaengine.ui.Activator; -import org.gemoc.executionframework.engine.ui.debug.sirius.action.GemocToggleBreakpointAction; /** * commons class for all Gemoc based models diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java index 2fa47e6e7..f8e947b12 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java @@ -22,6 +22,10 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.emf.ecore.EObject; +import org.executionframework.debugger.AbstractGemocDebugger; +import org.executionframework.debugger.AnnotationMutableFieldExtractor; +import org.executionframework.debugger.IMutableFieldExtractor; +import org.executionframework.debugger.IntrospectiveMutableFieldExtractor; import org.gemoc.commons.eclipse.ui.ViewHelper; import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; import org.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext; @@ -31,10 +35,6 @@ import org.gemoc.executionframework.engine.commons.EngineContextException; import org.gemoc.executionframework.engine.commons.ModelExecutionContext; import org.gemoc.executionframework.engine.ui.commons.RunConfiguration; -import org.gemoc.executionframework.engine.ui.debug.AbstractGemocDebugger; -import org.gemoc.executionframework.engine.ui.debug.AnnotationMutableFieldExtractor; -import org.gemoc.executionframework.engine.ui.debug.IMutableFieldExtractor; -import org.gemoc.executionframework.engine.ui.debug.IntrospectiveMutableFieldExtractor; import org.gemoc.executionframework.engine.ui.launcher.AbstractSequentialGemocLauncher; import org.gemoc.executionframework.ui.views.engine.EnginesStatusView; import org.gemoc.xdsmlframework.api.core.ExecutionMode; @@ -46,7 +46,6 @@ import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; import fr.obeo.dsl.debug.ide.IDSLDebugger; import fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher; diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF index 3d08093a5..30c668e4e 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF @@ -20,7 +20,8 @@ Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", org.gemoc.executionframework.engine.ui, fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", fr.obeo.dsl.debug.ide, - org.gemoc.xdsmlframework.api + org.gemoc.xdsmlframework.api, + org.executionframework.debugger Import-Package: javafx.animation;version="2.0.0", javafx.application;version="2.0.0", javafx.beans;version="2.0.0", diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java index 2f8262d80..35d6a6f55 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java @@ -54,7 +54,7 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IActionBars; -import org.gemoc.executionframework.engine.ui.debug.AbstractGemocDebugger; +import org.executionframework.debugger.AbstractGemocDebugger; import org.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher; import org.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; import org.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; From 20cf3ab9aed7e150d140c6a91fe63f20db76c8da Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 10 May 2017 09:30:51 +0200 Subject: [PATCH 182/267] [ExeFramework] fix misnamed new debugger plugins --- .../.classpath | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 10 +-- .../build.properties | 0 .../plugin.xml | 28 ++++---- .../debugger/ui/Activator.java | 2 +- .../ui/MutableFieldNameProvider.xtend | 4 +- .../debugger/ui/OpenSemanticsHandler.java | 6 +- .../BreakpointDetailPaneFactory.java | 4 +- .../GemocBreakpointDetailPane.java | 4 +- .../GemocToggleBreakpointAction.java | 4 +- .../.classpath | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 6 +- .../build.properties | 0 .../pom.xml | 65 +++++++++++++++++++ .../debugger/AbstractGemocDebugger.java | 2 +- .../AbstractGemocDebuggerFactory.java | 2 +- .../debugger/Activator.java | 2 +- .../AnnotationMutableFieldExtractor.xtend | 2 +- .../debugger/GemocBreakpoint.java | 2 +- .../debugger/IGemocDebugger.java | 2 +- .../debugger/IMutableFieldExtractor.java | 2 +- .../IntrospectiveMutableFieldExtractor.xtend | 2 +- .../debugger/MutableField.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../GemocToggleBreakpointHandler.java | 2 +- .../debug/GenericSequentialModelDebugger.java | 4 +- ...GemocSequentialToggleBreakpointAction.java | 2 +- .../javaengine/ui/launcher/Launcher.java | 8 +-- .../META-INF/MANIFEST.MF | 2 +- .../MultidimensionalTimelineViewPart.java | 2 +- 34 files changed, 122 insertions(+), 57 deletions(-) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui => org.gemoc.executionframework.debugger.ui}/.classpath (100%) rename framework/execution_framework/plugins/{org.executionframework.debugger => org.gemoc.executionframework.debugger.ui}/.project (93%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui => org.gemoc.executionframework.debugger.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui => org.gemoc.executionframework.debugger.ui}/META-INF/MANIFEST.MF (65%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui => org.gemoc.executionframework.debugger.ui}/build.properties (100%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui => org.gemoc.executionframework.debugger.ui}/plugin.xml (60%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui/src/org => org.gemoc.executionframework.debugger.ui/src/org/gemoc}/executionframework/debugger/ui/Activator.java (98%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui/src/org => org.gemoc.executionframework.debugger.ui/src/org/gemoc}/executionframework/debugger/ui/MutableFieldNameProvider.xtend (89%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui/src/org => org.gemoc.executionframework.debugger.ui/src/org/gemoc}/executionframework/debugger/ui/OpenSemanticsHandler.java (92%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui/src/org => org.gemoc.executionframework.debugger.ui/src/org/gemoc}/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java (94%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui/src/org => org.gemoc.executionframework.debugger.ui/src/org/gemoc}/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java (96%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui/src/org => org.gemoc.executionframework.debugger.ui/src/org/gemoc}/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java (94%) rename framework/execution_framework/plugins/{org.executionframework.debugger => org.gemoc.executionframework.debugger}/.classpath (100%) rename framework/execution_framework/plugins/{org.executionframework.debugger.ui => org.gemoc.executionframework.debugger}/.project (93%) rename framework/execution_framework/plugins/{org.executionframework.debugger => org.gemoc.executionframework.debugger}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/execution_framework/plugins/{org.executionframework.debugger => org.gemoc.executionframework.debugger}/META-INF/MANIFEST.MF (82%) rename framework/execution_framework/plugins/{org.executionframework.debugger => org.gemoc.executionframework.debugger}/build.properties (100%) create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.debugger/pom.xml rename framework/execution_framework/plugins/{org.executionframework.debugger/src/org => org.gemoc.executionframework.debugger/src/org/gemoc}/executionframework/debugger/AbstractGemocDebugger.java (99%) rename framework/execution_framework/plugins/{org.executionframework.debugger/src/org => org.gemoc.executionframework.debugger/src/org/gemoc}/executionframework/debugger/AbstractGemocDebuggerFactory.java (94%) rename framework/execution_framework/plugins/{org.executionframework.debugger/src/org => org.gemoc.executionframework.debugger/src/org/gemoc}/executionframework/debugger/Activator.java (98%) rename framework/execution_framework/plugins/{org.executionframework.debugger/src/org => org.gemoc.executionframework.debugger/src/org/gemoc}/executionframework/debugger/AnnotationMutableFieldExtractor.xtend (98%) rename framework/execution_framework/plugins/{org.executionframework.debugger/src/org => org.gemoc.executionframework.debugger/src/org/gemoc}/executionframework/debugger/GemocBreakpoint.java (98%) rename framework/execution_framework/plugins/{org.executionframework.debugger/src/org => org.gemoc.executionframework.debugger/src/org/gemoc}/executionframework/debugger/IGemocDebugger.java (95%) rename framework/execution_framework/plugins/{org.executionframework.debugger/src/org => org.gemoc.executionframework.debugger/src/org/gemoc}/executionframework/debugger/IMutableFieldExtractor.java (93%) rename framework/execution_framework/plugins/{org.executionframework.debugger/src/org => org.gemoc.executionframework.debugger/src/org/gemoc}/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend (99%) rename framework/execution_framework/plugins/{org.executionframework.debugger/src/org => org.gemoc.executionframework.debugger/src/org/gemoc}/executionframework/debugger/MutableField.java (97%) diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.classpath similarity index 100% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/.classpath rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.classpath diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/.project b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.project similarity index 93% rename from framework/execution_framework/plugins/org.executionframework.debugger/.project rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.project index b55759bd3..748c7f83c 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/.project +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.project @@ -1,6 +1,6 @@ - org.executionframework.debugger + org.gemoc.executionframework.debugger.ui diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF similarity index 65% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF index f27127ed7..c7cbf585f 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Ui -Bundle-SymbolicName: org.executionframework.debugger.ui;singleton:=true +Bundle-SymbolicName: org.gemoc.executionframework.debugger.ui;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-Activator: org.executionframework.debugger.ui.Activator -Export-Package: org.executionframework.debugger.ui;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", - org.executionframework.debugger.ui.breakpoints +Bundle-Activator: org.gemoc.executionframework.debugger.ui.Activator +Export-Package: org.gemoc.executionframework.debugger.ui;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", + org.gemoc.executionframework.debugger.ui.breakpoints Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, @@ -22,7 +22,7 @@ Require-Bundle: com.google.guava, org.eclipse.equinox.registry, org.eclipse.ui.workbench, org.eclipse.xtext;bundle-version="2.10.0", - org.executionframework.debugger;bundle-version="1.0.0", + org.gemoc.executionframework.debugger;bundle-version="1.0.0", fr.obeo.dsl.debug.ide.sirius.ui, org.gemoc.executionframework.engine.ui, fr.inria.diverse.melange.resource, diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/build.properties b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/build.properties similarity index 100% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/build.properties rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/build.properties diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/plugin.xml b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/plugin.xml similarity index 60% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/plugin.xml rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/plugin.xml index d755bae54..9f60c99a1 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/plugin.xml +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/plugin.xml @@ -2,7 +2,7 @@ @@ -14,9 +14,9 @@ @@ -24,8 +24,8 @@ + class="org.gemoc.executionframework.debugger.ui.breakpoints.BreakpointDetailPaneFactory" + id="org.gemoc.executionframework.debugger.detailFactories"> @@ -34,7 +34,7 @@ + value="org.gemoc.executionframework.debugger.GemocBreakpoint"> @@ -44,7 +44,7 @@ @@ -54,15 +54,15 @@ + class="org.gemoc.executionframework.debugger.ui.OpenSemanticsHandler" + commandId="org.gemoc.executionframework.debugger.ui.openSemantics"> @@ -79,8 +79,8 @@ + actionClass="org.gemoc.executionframework.debugger.ui.breakpoints.GemocToggleBreakpointAction" + id="org.gemoc.executionframework.debugger.ui.GemocToggleBreakpointAction"> diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/Activator.java similarity index 98% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/Activator.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/Activator.java index 72ebeffc7..ddc86a678 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger.ui; +package org.gemoc.executionframework.debugger.ui; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/MutableFieldNameProvider.xtend b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend similarity index 89% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/MutableFieldNameProvider.xtend rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend index 51b859833..808300756 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/MutableFieldNameProvider.xtend +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend @@ -8,11 +8,11 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.executionframework.debugger.ui + package org.gemoc.executionframework.debugger.ui import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; -import org.executionframework.debugger.MutableField +import org.gemoc.executionframework.debugger.MutableField public class MutableFieldNameProvider extends DefaultDeclarativeQualifiedNameProvider{ diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java similarity index 92% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java index 3f56c41d4..207c2c32a 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/OpenSemanticsHandler.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger.ui; +package org.gemoc.executionframework.debugger.ui; import java.io.File; import java.io.IOException; @@ -102,8 +102,8 @@ public void locateAndOpenSource(TreeSelection selection) { } public Object execute(ExecutionEvent event) throws ExecutionException { - Supplier engineSupplier = org.executionframework.debugger.Activator.getDefault().getEngineSupplier(); - Supplier bundleSupplier = org.executionframework.debugger.Activator.getDefault().getBundleSymbolicNameSupplier(); + Supplier engineSupplier = org.gemoc.executionframework.debugger.Activator.getDefault().getEngineSupplier(); + Supplier bundleSupplier = org.gemoc.executionframework.debugger.Activator.getDefault().getBundleSymbolicNameSupplier(); if (engineSupplier != null) { this.engine = engineSupplier.get(); } diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java similarity index 94% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java index d1a8b01a3..5d9d44f90 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger.ui.breakpoints; +package org.gemoc.executionframework.debugger.ui.breakpoints; import java.util.HashSet; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.debug.ui.IDetailPane; import org.eclipse.debug.ui.IDetailPaneFactory; import org.eclipse.jface.viewers.IStructuredSelection; -import org.executionframework.debugger.GemocBreakpoint; +import org.gemoc.executionframework.debugger.GemocBreakpoint; import fr.obeo.dsl.debug.ide.DSLBreakpoint; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java similarity index 96% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java index 2336aa55b..477c11290 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger.ui.breakpoints; +package org.gemoc.executionframework.debugger.ui.breakpoints; import org.eclipse.debug.ui.IDetailPane; import org.eclipse.jface.viewers.IStructuredSelection; @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbenchPartSite; -import org.executionframework.debugger.GemocBreakpoint; +import org.gemoc.executionframework.debugger.GemocBreakpoint; /** * Gemoc {@link IDetailPane} for breakpoints. diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java similarity index 94% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java index 510ef7dd7..495374c5e 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/src/org/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger.ui.breakpoints; +package org.gemoc.executionframework.debugger.ui.breakpoints; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.executionframework.debugger.GemocBreakpoint; +import org.gemoc.executionframework.debugger.GemocBreakpoint; import org.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher; import fr.inria.diverse.melange.resource.MelangeResource; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/.classpath b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.classpath similarity index 100% rename from framework/execution_framework/plugins/org.executionframework.debugger/.classpath rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.classpath diff --git a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.project b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.project similarity index 93% rename from framework/execution_framework/plugins/org.executionframework.debugger.ui/.project rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.project index 346a0c00a..a21fa6b47 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger.ui/.project +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.project @@ -1,6 +1,6 @@ - org.executionframework.debugger.ui + org.gemoc.executionframework.debugger diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/execution_framework/plugins/org.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF similarity index 82% rename from framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF index e15206fcf..c2e5696b6 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Debugger -Bundle-SymbolicName: org.executionframework.debugger;singleton:=true +Bundle-SymbolicName: org.gemoc.executionframework.debugger;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-Activator: org.executionframework.debugger.Activator +Bundle-Activator: org.gemoc.executionframework.debugger.Activator Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, @@ -27,6 +27,6 @@ Require-Bundle: com.google.guava, org.gemoc.commons.eclipse.pde;bundle-version="2.3.0", fr.inria.diverse.commons.eclipse;bundle-version="1.0.0", fr.inria.diverse.commons.eclipse.messagingsystem.api;bundle-version="1.0.0" -Export-Package: org.executionframework.debugger +Export-Package: org.gemoc.executionframework.debugger Bundle-ActivationPolicy: lazy diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/build.properties b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/build.properties similarity index 100% rename from framework/execution_framework/plugins/org.executionframework.debugger/build.properties rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/build.properties diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/pom.xml b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/pom.xml new file mode 100644 index 000000000..ef0a733bc --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + + ../.. + org.gemoc.modeldebugging.executionframework + org.executionframework.debugger + 2.3.0-SNAPSHOT + + + org.gemoc.executionframework.engine + 2.3.0-SNAPSHOT + eclipse-plugin + + + + + + + + + + + + + + + + + + org.eclipse.xtend + xtend-maven-plugin + ${xtend.version} + + + + compile + + + xtend-gen + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + + + + xtend-gen + + + + + + + + + + diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java similarity index 99% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebugger.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java index 9fdd0754e..99bf0308e 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger; +package org.gemoc.executionframework.debugger; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebuggerFactory.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java similarity index 94% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebuggerFactory.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java index 8ef4ae66e..e90912681 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AbstractGemocDebuggerFactory.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger; +package org.gemoc.executionframework.debugger; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java similarity index 98% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/Activator.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java index 356d5a754..48b77af40 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger; +package org.gemoc.executionframework.debugger; import java.util.function.Supplier; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AnnotationMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend similarity index 98% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AnnotationMutableFieldExtractor.xtend rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend index b8b64b686..716b66c79 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/AnnotationMutableFieldExtractor.xtend +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.executionframework.debugger + package org.gemoc.executionframework.debugger import java.text.DecimalFormat import java.text.NumberFormat diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/GemocBreakpoint.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java similarity index 98% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/GemocBreakpoint.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java index ff2abc813..87db3fd53 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/GemocBreakpoint.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger; +package org.gemoc.executionframework.debugger; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java similarity index 95% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IGemocDebugger.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java index fad23b019..4bfe31fd8 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IGemocDebugger.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger; +package org.gemoc.executionframework.debugger; import java.util.function.BiPredicate; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IMutableFieldExtractor.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java similarity index 93% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IMutableFieldExtractor.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java index d18ed5b61..7655ad119 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IMutableFieldExtractor.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger; +package org.gemoc.executionframework.debugger; import java.util.List; diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend similarity index 99% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend index 982e42b6d..f282dc554 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.executionframework.debugger + package org.gemoc.executionframework.debugger import java.util.ArrayList import java.util.Arrays diff --git a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/MutableField.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/MutableField.java similarity index 97% rename from framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/MutableField.java rename to framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/MutableField.java index f6501c110..bd6c43157 100644 --- a/framework/execution_framework/plugins/org.executionframework.debugger/src/org/executionframework/debugger/MutableField.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/MutableField.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.executionframework.debugger; +package org.gemoc.executionframework.debugger; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index 1573aff81..8ea40bd53 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -35,8 +35,8 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.xtext, org.eclipse.xtend.lib, fr.inria.diverse.melange.resource, - org.executionframework.debugger, - org.executionframework.debugger.ui + org.gemoc.executionframework.debugger, + org.gemoc.executionframework.debugger.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java index 772efc3ae..8ded64662 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java @@ -24,8 +24,8 @@ import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.HandlerUtil; -import org.executionframework.debugger.GemocBreakpoint; import org.gemoc.execution.sequential.javaengine.ui.launcher.Launcher; +import org.gemoc.executionframework.debugger.GemocBreakpoint; import fr.inria.diverse.melange.resource.MelangeResource; import fr.inria.diverse.trace.commons.model.trace.MSE; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java index 4d8f106b1..9397d43ba 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java @@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; -import org.executionframework.debugger.AbstractGemocDebugger; -import org.executionframework.debugger.GemocBreakpoint; import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; +import org.gemoc.executionframework.debugger.AbstractGemocDebugger; +import org.gemoc.executionframework.debugger.GemocBreakpoint; import org.gemoc.executionframework.engine.core.EngineStoppedException; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java index f7f5ba80b..5a064c47a 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action; -import org.executionframework.debugger.ui.breakpoints.GemocToggleBreakpointAction; import org.gemoc.execution.sequential.javaengine.ui.Activator; +import org.gemoc.executionframework.debugger.ui.breakpoints.GemocToggleBreakpointAction; /** * commons class for all Gemoc based models diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java index f8e947b12..99a4411b1 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java @@ -22,16 +22,16 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.emf.ecore.EObject; -import org.executionframework.debugger.AbstractGemocDebugger; -import org.executionframework.debugger.AnnotationMutableFieldExtractor; -import org.executionframework.debugger.IMutableFieldExtractor; -import org.executionframework.debugger.IntrospectiveMutableFieldExtractor; +import org.gemoc.executionframework.debugger.AnnotationMutableFieldExtractor; +import org.gemoc.executionframework.debugger.IntrospectiveMutableFieldExtractor; import org.gemoc.commons.eclipse.ui.ViewHelper; import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; import org.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext; import org.gemoc.execution.sequential.javaengine.ui.Activator; import org.gemoc.execution.sequential.javaengine.ui.debug.GenericSequentialModelDebugger; import org.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; +import org.gemoc.executionframework.debugger.AbstractGemocDebugger; +import org.gemoc.executionframework.debugger.IMutableFieldExtractor; import org.gemoc.executionframework.engine.commons.EngineContextException; import org.gemoc.executionframework.engine.commons.ModelExecutionContext; import org.gemoc.executionframework.engine.ui.commons.RunConfiguration; diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF index 30c668e4e..deb9cdc72 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", fr.obeo.dsl.debug.ide, org.gemoc.xdsmlframework.api, - org.executionframework.debugger + org.gemoc.executionframework.debugger Import-Package: javafx.animation;version="2.0.0", javafx.application;version="2.0.0", javafx.beans;version="2.0.0", diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java index 35d6a6f55..713ef1184 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java @@ -54,7 +54,7 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IActionBars; -import org.executionframework.debugger.AbstractGemocDebugger; +import org.gemoc.executionframework.debugger.AbstractGemocDebugger; import org.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher; import org.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; import org.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; From f8745af0bbe7ba5b05b5fc54f1c429272693e0b1 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 10 May 2017 09:55:42 +0200 Subject: [PATCH 183/267] [ExeFramework] Adding poms for debugger plugins --- .../pom.xml | 53 +++++++++++++++++++ .../pom.xml | 16 +----- framework/execution_framework/pom.xml | 2 + 3 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/pom.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/pom.xml b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/pom.xml new file mode 100644 index 000000000..5358c227b --- /dev/null +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + + ../.. + org.gemoc.modeldebugging.executionframework + org.gemoc.modeldebugging.executionframework.root + 2.3.0-SNAPSHOT + + + org.gemoc.executionframework.debugger.ui + 2.3.0-SNAPSHOT + eclipse-plugin + + + + + + org.eclipse.xtend + xtend-maven-plugin + ${xtend.version} + + + + compile + + + xtend-gen + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + + + + xtend-gen + + + + + + + + + + diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/pom.xml b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/pom.xml index ef0a733bc..e8a807cfe 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/pom.xml +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/pom.xml @@ -6,25 +6,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ../.. org.gemoc.modeldebugging.executionframework - org.executionframework.debugger + org.gemoc.modeldebugging.executionframework.root 2.3.0-SNAPSHOT - org.gemoc.executionframework.engine + org.gemoc.executionframework.debugger 2.3.0-SNAPSHOT eclipse-plugin - - - - - - - - - - - - diff --git a/framework/execution_framework/pom.xml b/framework/execution_framework/pom.xml index 572e21b5c..02d854e7d 100644 --- a/framework/execution_framework/pom.xml +++ b/framework/execution_framework/pom.xml @@ -17,6 +17,8 @@ plugins/org.gemoc.executionframework.engine.ui plugins/org.gemoc.executionframework.ui plugins/org.gemoc.executionframework.extensions.sirius + plugins/org.gemoc.executionframework.debugger.ui + plugins/org.gemoc.executionframework.debugger.ui releng/org.gemoc.modeldebugging.executionframework.feature From e31c3461182cc1df4d15da734bbe98d85ad52e39 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 10 May 2017 09:58:13 +0200 Subject: [PATCH 184/267] [ExeFramework] Fix small typo in pom.xml --- framework/execution_framework/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/execution_framework/pom.xml b/framework/execution_framework/pom.xml index 02d854e7d..2f2cdceb9 100644 --- a/framework/execution_framework/pom.xml +++ b/framework/execution_framework/pom.xml @@ -17,7 +17,7 @@ plugins/org.gemoc.executionframework.engine.ui plugins/org.gemoc.executionframework.ui plugins/org.gemoc.executionframework.extensions.sirius - plugins/org.gemoc.executionframework.debugger.ui + plugins/org.gemoc.executionframework.debugger plugins/org.gemoc.executionframework.debugger.ui From 70a62c9605df1ec7d582c6b899373655af262cb9 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 10 May 2017 11:19:51 +0200 Subject: [PATCH 185/267] [Debugger] Align manifest versions with pom versions --- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF index c7cbf585f..9b8f48e8b 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Ui +Bundle-Name: org.gemoc.executionframework.debugger.ui Bundle-SymbolicName: org.gemoc.executionframework.debugger.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.gemoc.executionframework.debugger.ui.Activator Export-Package: org.gemoc.executionframework.debugger.ui;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF index c2e5696b6..6ff6914e4 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Debugger +Bundle-Name: org.gemoc.executionframework.debugger Bundle-SymbolicName: org.gemoc.executionframework.debugger;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.gemoc.executionframework.debugger.Activator Require-Bundle: com.google.guava, From 8f32bca730277f469b44a717bb67428cf7e6e6cb Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Wed, 10 May 2017 17:55:58 +0200 Subject: [PATCH 186/267] [ExeFramework] Add debugger plugins to releng feature --- .../feature.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml index cadaeb803..bcbfb11a4 100644 --- a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml +++ b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml @@ -45,4 +45,19 @@ version="0.0.0" unpack="false"/> + + + + + From 95cf4272d9b773421d017f359ee555e26d39f282 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 11 May 2017 15:27:30 +0200 Subject: [PATCH 187/267] [JavaEngine] Adapt SequentialLanguageDefinitionExtension to debug plugins --- .../META-INF/MANIFEST.MF | 3 ++- .../languages/SequentialLanguageDefinitionExtension.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF index 3b6a1404f..e785e7fab 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.gemoc.execution.sequential.javaxdsml.api;singleton:=tru Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.gemoc.xdsmlframework.api, - org.gemoc.executionframework.engine.ui + org.gemoc.executionframework.engine.ui, + org.gemoc.executionframework.debugger;bundle-version="2.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.gemoc.execution.sequential.javaxdsml.api.extensions.languages diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java index 5a1ce12df..c658a47a6 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java @@ -11,7 +11,7 @@ package org.gemoc.execution.sequential.javaxdsml.api.extensions.languages; import org.eclipse.core.runtime.CoreException; -import org.gemoc.executionframework.engine.ui.debug.AbstractGemocDebuggerFactory; +import org.gemoc.executionframework.debugger.AbstractGemocDebuggerFactory; import org.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension; public class SequentialLanguageDefinitionExtension extends LanguageDefinitionExtension { From 927bd797251ab9c73ad84a3519ec403aa745a170 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 11 May 2017 15:29:06 +0200 Subject: [PATCH 188/267] [GenericTrace] Add IntegerObject in metamodel as possible value --- .../model/GenericTrace.ecore | 174 +++++++++--------- .../model/GenericTraceImpl.ecore | 3 + .../model/LaunchConfiguration.ecore | 32 ++-- .../generictrace/GenerictraceFactory.java | 9 + .../generictrace/GenerictracePackage.java | 87 ++++++++- .../IntegerObjectAttributeValue.java | 49 +++++ .../impl/GenerictraceFactoryImpl.java | 11 ++ .../impl/GenerictracePackageImpl.java | 33 ++++ .../impl/IntegerObjectAttributeValueImpl.java | 162 ++++++++++++++++ .../util/GenerictraceAdapterFactory.java | 18 ++ .../generictrace/util/GenerictraceSwitch.java | 24 +++ 11 files changed, 498 insertions(+), 104 deletions(-) create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerObjectAttributeValue.java create mode 100644 trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore index 9c6c34a16..a2c748cfa 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore @@ -1,159 +1,153 @@ - + - - - - - - - + + + - - - - - - - - + + + - + - - + +
    - - +
    - - - - - - - + + - + - - - + + + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - - + + + - - + + - - + + - - - + + + - + - + - + - - - - - + + - - + + - - + + + - + @@ -161,55 +155,61 @@
    - + - +
    - + - + - - + + - + - - + + - + - + - - + + - - + + - - + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore index 1cd71393a..2d194bba3 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore @@ -101,4 +101,7 @@ + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore index cfa0528a1..909c76c5c 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore @@ -1,23 +1,23 @@ - + - - - - + + - - - + - - - - - - - - + + + + + + + + diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java index ce3b8572c..f9af063e5 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java @@ -156,6 +156,15 @@ public interface GenerictraceFactory extends EFactory { */ ManyReferenceValue createManyReferenceValue(); + /** + * Returns a new object of class 'Integer Object Attribute Value'. + * + * + * @return a new object of class 'Integer Object Attribute Value'. + * @generated + */ + IntegerObjectAttributeValue createIntegerObjectAttributeValue(); + /** * Returns the package supported by this factory. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java index bb8d5e0ac..6711e31fb 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java @@ -1006,6 +1006,52 @@ public interface GenerictracePackage extends EPackage { */ int MANY_REFERENCE_VALUE_OPERATION_COUNT = GENERIC_REFERENCE_VALUE_OPERATION_COUNT + 0; + /** + * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl Integer Object Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerObjectAttributeValue() + * @generated + */ + int INTEGER_OBJECT_ATTRIBUTE_VALUE = 19; + + /** + * The feature id for the 'States' reference list. + * + * + * @generated + * @ordered + */ + int INTEGER_OBJECT_ATTRIBUTE_VALUE__STATES = GENERIC_ATTRIBUTE_VALUE__STATES; + + /** + * The feature id for the 'Attribute Value' attribute. + * + * + * @generated + * @ordered + */ + int INTEGER_OBJECT_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Integer Object Attribute Value' class. + * + * + * @generated + * @ordered + */ + int INTEGER_OBJECT_ATTRIBUTE_VALUE_FEATURE_COUNT = GENERIC_ATTRIBUTE_VALUE_FEATURE_COUNT + 1; + + /** + * The number of operations of the 'Integer Object Attribute Value' class. + * + * + * @generated + * @ordered + */ + int INTEGER_OBJECT_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; + /** * The meta object id for the 'ISerializable' data type. * @@ -1013,7 +1059,7 @@ public interface GenerictracePackage extends EPackage { * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getISerializable() * @generated */ - int ISERIALIZABLE = 19; + int ISERIALIZABLE = 20; /** @@ -1337,6 +1383,27 @@ public interface GenerictracePackage extends EPackage { */ EReference getManyReferenceValue_ReferenceValues(); + /** + * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue Integer Object Attribute Value}'. + * + * + * @return the meta object for class 'Integer Object Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue + * @generated + */ + EClass getIntegerObjectAttributeValue(); + + /** + * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue Attribute Value}'. + * + * + * @return the meta object for the attribute 'Attribute Value'. + * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue() + * @see #getIntegerObjectAttributeValue() + * @generated + */ + EAttribute getIntegerObjectAttributeValue_AttributeValue(); + /** * Returns the meta object for data type 'ISerializable'. * @@ -1656,6 +1723,24 @@ interface Literals { */ EReference MANY_REFERENCE_VALUE__REFERENCE_VALUES = eINSTANCE.getManyReferenceValue_ReferenceValues(); + /** + * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl Integer Object Attribute Value}' class. + * + * + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl + * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerObjectAttributeValue() + * @generated + */ + EClass INTEGER_OBJECT_ATTRIBUTE_VALUE = eINSTANCE.getIntegerObjectAttributeValue(); + + /** + * The meta object literal for the 'Attribute Value' attribute feature. + * + * + * @generated + */ + EAttribute INTEGER_OBJECT_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getIntegerObjectAttributeValue_AttributeValue(); + /** * The meta object literal for the 'ISerializable' data type. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerObjectAttributeValue.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerObjectAttributeValue.java new file mode 100644 index 000000000..1af954af7 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerObjectAttributeValue.java @@ -0,0 +1,49 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace; + + +/** + * + * A representation of the model object 'Integer Object Attribute Value'. + * + * + *

    + * The following features are supported: + *

    + *
      + *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue Attribute Value}
      • + *
    + * + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerObjectAttributeValue() + * @model + * @generated + */ +public interface IntegerObjectAttributeValue extends GenericAttributeValue { + /** + * Returns the value of the 'Attribute Value' attribute. + * + *

    + * If the meaning of the 'Attribute Value' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Attribute Value' attribute. + * @see #setAttributeValue(Integer) + * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerObjectAttributeValue_AttributeValue() + * @model + * @generated + */ + Integer getAttributeValue(); + + /** + * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue Attribute Value}' attribute. + * + * + * @param value the new value of the 'Attribute Value' attribute. + * @see #getAttributeValue() + * @generated + */ + void setAttributeValue(Integer value); + +} // IntegerObjectAttributeValue diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java index 44764057a..5b307e371 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java @@ -72,6 +72,7 @@ public EObject create(EClass eClass) { case GenerictracePackage.MANY_STRING_ATTRIBUTE_VALUE: return createManyStringAttributeValue(); case GenerictracePackage.SINGLE_REFERENCE_VALUE: return createSingleReferenceValue(); case GenerictracePackage.MANY_REFERENCE_VALUE: return createManyReferenceValue(); + case GenerictracePackage.INTEGER_OBJECT_ATTRIBUTE_VALUE: return createIntegerObjectAttributeValue(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -257,6 +258,16 @@ public ManyReferenceValue createManyReferenceValue() { return manyReferenceValue; } + /** + * + * + * @generated + */ + public IntegerObjectAttributeValue createIntegerObjectAttributeValue() { + IntegerObjectAttributeValueImpl integerObjectAttributeValue = new IntegerObjectAttributeValueImpl(); + return integerObjectAttributeValue; + } + /** * * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java index 559912c84..12c036954 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java @@ -17,6 +17,7 @@ import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue; import fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue; import fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue; import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; @@ -178,6 +179,13 @@ public class GenerictracePackageImpl extends EPackageImpl implements Generictrac */ private EClass manyReferenceValueEClass = null; + /** + * + * + * @generated + */ + private EClass integerObjectAttributeValueEClass = null; + /** * * @@ -528,6 +536,24 @@ public EReference getManyReferenceValue_ReferenceValues() { return (EReference)manyReferenceValueEClass.getEStructuralFeatures().get(0); } + /** + * + * + * @generated + */ + public EClass getIntegerObjectAttributeValue() { + return integerObjectAttributeValueEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getIntegerObjectAttributeValue_AttributeValue() { + return (EAttribute)integerObjectAttributeValueEClass.getEStructuralFeatures().get(0); + } + /** * * @@ -615,6 +641,9 @@ public void createPackageContents() { manyReferenceValueEClass = createEClass(MANY_REFERENCE_VALUE); createEReference(manyReferenceValueEClass, MANY_REFERENCE_VALUE__REFERENCE_VALUES); + integerObjectAttributeValueEClass = createEClass(INTEGER_OBJECT_ATTRIBUTE_VALUE); + createEAttribute(integerObjectAttributeValueEClass, INTEGER_OBJECT_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE); + // Create data types iSerializableEDataType = createEDataType(ISERIALIZABLE); } @@ -716,6 +745,7 @@ public void initializePackageContents() { genericValueEClass.getEGenericSuperTypes().add(g1); singleReferenceValueEClass.getESuperTypes().add(this.getGenericReferenceValue()); manyReferenceValueEClass.getESuperTypes().add(this.getGenericReferenceValue()); + integerObjectAttributeValueEClass.getESuperTypes().add(this.getGenericAttributeValue()); // Initialize classes, features, and operations; add parameters initEClass(genericSequentialStepEClass, GenericSequentialStep.class, "GenericSequentialStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -769,6 +799,9 @@ public void initializePackageContents() { initEClass(manyReferenceValueEClass, ManyReferenceValue.class, "ManyReferenceValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getManyReferenceValue_ReferenceValues(), ecorePackage.getEObject(), null, "referenceValues", null, 0, -1, ManyReferenceValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(integerObjectAttributeValueEClass, IntegerObjectAttributeValue.class, "IntegerObjectAttributeValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getIntegerObjectAttributeValue_AttributeValue(), ecorePackage.getEIntegerObject(), "attributeValue", null, 0, 1, IntegerObjectAttributeValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + // Initialize data types initEDataType(iSerializableEDataType, byte[].class, "ISerializable", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java new file mode 100644 index 000000000..c13a5c025 --- /dev/null +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java @@ -0,0 +1,162 @@ +/** + */ +package fr.inria.diverse.trace.commons.model.generictrace.impl; + +import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * + * An implementation of the model object 'Integer Object Attribute Value'. + * + *

    + * The following features are implemented: + *

    + *
      + *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl#getAttributeValue Attribute Value}
      • + *
    + * + * @generated + */ +public class IntegerObjectAttributeValueImpl extends GenericAttributeValueImpl implements IntegerObjectAttributeValue { + /** + * The default value of the '{@link #getAttributeValue() Attribute Value}' attribute. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected static final Integer ATTRIBUTE_VALUE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAttributeValue() Attribute Value}' attribute. + * + * + * @see #getAttributeValue() + * @generated + * @ordered + */ + protected Integer attributeValue = ATTRIBUTE_VALUE_EDEFAULT; + + /** + * + * + * @generated + */ + protected IntegerObjectAttributeValueImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return GenerictracePackage.Literals.INTEGER_OBJECT_ATTRIBUTE_VALUE; + } + + /** + * + * + * @generated + */ + public Integer getAttributeValue() { + return attributeValue; + } + + /** + * + * + * @generated + */ + public void setAttributeValue(Integer newAttributeValue) { + Integer oldAttributeValue = attributeValue; + attributeValue = newAttributeValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GenerictracePackage.INTEGER_OBJECT_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE, oldAttributeValue, attributeValue)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GenerictracePackage.INTEGER_OBJECT_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return getAttributeValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GenerictracePackage.INTEGER_OBJECT_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + setAttributeValue((Integer)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GenerictracePackage.INTEGER_OBJECT_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + setAttributeValue(ATTRIBUTE_VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GenerictracePackage.INTEGER_OBJECT_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE: + return ATTRIBUTE_VALUE_EDEFAULT == null ? attributeValue != null : !ATTRIBUTE_VALUE_EDEFAULT.equals(attributeValue); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeValue: "); + result.append(attributeValue); + result.append(')'); + return result.toString(); + } + +} //IntegerObjectAttributeValueImpl diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java index 7cb8f7e1b..c193a649c 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java @@ -155,6 +155,10 @@ public Adapter caseManyReferenceValue(ManyReferenceValue object) { return createManyReferenceValueAdapter(); } @Override + public Adapter caseIntegerObjectAttributeValue(IntegerObjectAttributeValue object) { + return createIntegerObjectAttributeValueAdapter(); + } + @Override public > Adapter caseStep(Step object) { return createStepAdapter(); } @@ -480,6 +484,20 @@ public Adapter createManyReferenceValueAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue Integer Object Attribute Value}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue + * @generated + */ + public Adapter createIntegerObjectAttributeValueAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. * diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java index 910ebf247..ed4d32aa7 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java @@ -236,6 +236,15 @@ protected T doSwitch(int classifierID, EObject theEObject) { if (result == null) result = defaultCase(theEObject); return result; } + case GenerictracePackage.INTEGER_OBJECT_ATTRIBUTE_VALUE: { + IntegerObjectAttributeValue integerObjectAttributeValue = (IntegerObjectAttributeValue)theEObject; + T result = caseIntegerObjectAttributeValue(integerObjectAttributeValue); + if (result == null) result = caseGenericAttributeValue(integerObjectAttributeValue); + if (result == null) result = caseGenericValue(integerObjectAttributeValue); + if (result == null) result = caseValue(integerObjectAttributeValue); + if (result == null) result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } @@ -525,6 +534,21 @@ public T caseManyReferenceValue(ManyReferenceValue object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Integer Object Attribute Value'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Integer Object Attribute Value'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseIntegerObjectAttributeValue(IntegerObjectAttributeValue object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Step'. * From f70d206201f23a9b0c964caa3b948a0aee501417 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 11 May 2017 15:29:24 +0200 Subject: [PATCH 189/267] [GenericTraceConstructor] Add IntegerObject case in trace construction --- .../trace/gemoc/traceaddon/GenericTraceConstructor.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index f25284b4a..8fea0ef74 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -45,6 +45,7 @@ import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; +import fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue; import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; @@ -108,6 +109,10 @@ private GenericValue getGenericValue(EObject object, EStructuralFeature mutableP final StringAttributeValue value = GenerictraceFactory.eINSTANCE.createStringAttributeValue(); value.setAttributeValue((String) object.eGet(mutableProperty)); result = value; + } else if (eType == EcorePackage.Literals.EINTEGER_OBJECT) { + final IntegerObjectAttributeValue value = GenerictraceFactory.eINSTANCE.createIntegerObjectAttributeValue(); + value.setAttributeValue((Integer) object.eGet(mutableProperty)); + result = value; } } else if (mutableProperty instanceof EReference) { if (mutableProperty.isMany()) { From 02b92655a23ca16f1ecf5cd39ed93bb2f8e82a37 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Thu, 11 May 2017 09:09:36 +0200 Subject: [PATCH 190/267] [SimulationModelAnimation] Changes to remove checkstyle errors. --- .../services/AbstractDSLDebuggerServices.java | 51 ++++- .../ide/ui/DSLDebugModelPresentation.java | 191 +++++++++--------- .../src/fr/obeo/dsl/debug/ide/Activator.java | 14 +- .../obeo/dsl/debug/ide/DSLSourceLocator.java | 53 +++-- .../fr/obeo/dsl/debug/ide/IDSLDebugger.java | 11 +- .../ide/adapter/DSLDebugTargetAdapter.java | 61 +++--- .../ide/adapter/DSLStackFrameAdapter.java | 136 +++++++------ .../obeo/dsl/debug/ide/adapter/ILocator.java | 61 +++++- 8 files changed, 358 insertions(+), 220 deletions(-) diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java index 79fbef0a9..32a5be762 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java @@ -34,11 +34,14 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IBreakpointListener; import org.eclipse.debug.core.model.IBreakpoint; +import org.eclipse.emf.common.command.CommandStack; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.transaction.ExceptionHandler; import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.emf.transaction.impl.AbstractTransactionalCommandStack; import org.eclipse.sirius.business.api.dialect.DialectManager; import org.eclipse.sirius.business.api.dialect.command.RefreshRepresentationsCommand; import org.eclipse.sirius.diagram.DDiagram; @@ -129,6 +132,9 @@ public static final class BreakpointListener implements IBreakpointListener, IDS */ private StackFrame currentFrame; + /** + * Constructs and installs a default BreakpointListener. + */ public BreakpointListener() { install(); } @@ -235,8 +241,8 @@ protected void removeBreakpoint(DSLBreakpoint breakpoint) { /** * Notifies Sirius about a change in the given {@link DSLBreakpoint}. * - * @param instructionUri - * the {@link URI} of the instruction to refresh. + * @param instructionUris + * the {@link URI}s of the instructions to refresh. * @param debugModelID * the debug model identifier */ @@ -272,15 +278,32 @@ public void refreshRepresentations(final TransactionalEditingDomain transactiona final RefreshRepresentationsCommand refresh = new RefreshRepresentationsCommand( transactionalEditingDomain, new NullProgressMonitor(), representations); - try { - transactionalEditingDomain.getCommandStack().execute(refresh); - } catch (Exception e) { - String repString = representations.stream().map(r -> r.getName()).collect(Collectors - .joining(", ")); - DebugSiriusIdeUiPlugin.getPlugin().getLog().log(new Status(IStatus.WARNING, - DebugSiriusIdeUiPlugin.ID, "Failed to refresh Sirius representation(s)[" - + repString + "], we hope to be able to do it later", e)); + CommandStack commandStack = transactionalEditingDomain.getCommandStack(); + + // If the command stack is transactionnal, we add a one-shot exception handler. + if (commandStack instanceof AbstractTransactionalCommandStack) { + AbstractTransactionalCommandStack transactionnalCommandStack = (AbstractTransactionalCommandStack)commandStack; + transactionnalCommandStack.setExceptionHandler(new ExceptionHandler() { + + @Override + public void handleException(Exception e) { + // TODO Auto-generated method stub + + String repString = representations.stream().map(r -> r.getName()).collect( + Collectors.joining(", ")); + DebugSiriusIdeUiPlugin.getPlugin().getLog().log(new Status(IStatus.WARNING, + DebugSiriusIdeUiPlugin.ID, "Failed to refresh Sirius representation(s)[" + + repString + "], we hope to be able to do it later", e)); + + // Self-remove from the command stack. + transactionnalCommandStack.setExceptionHandler(null); + + } + }); } + + commandStack.execute(refresh); + } } @@ -444,6 +467,14 @@ public void currentInstructionChanged(String debugModelID, StackFrame frame) { notifySirius(instructionURIs, debugModelID); } + /** + * If possible, adds the MSE of an MSEOccurrence and its caller to instructions URIs. + * + * @param instructionURIs + * The collection of instructions URIS in which to add the MSE and caller. + * @param mseOccurrence + * The MSEOccurrence from which the MSE must be considered. + */ private void addMseOccurenceAndCallerToInstructionsURIs(Set instructionURIs, MSEOccurrence mseOccurrence) { if (mseOccurrence != null) { diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java index 428d11406..8031e087d 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java @@ -65,15 +65,15 @@ public class DSLDebugModelPresentation implements IDebugModelPresentation, IDebu * Constructor. */ public DSLDebugModelPresentation() { - super(); - final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory( - ComposedAdapterFactory.Descriptor.Registry.INSTANCE); - - adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); - CustomDebugItemProviderAdapterFactory debugFactory = new CustomDebugItemProviderAdapterFactory(); - adapterFactory.addAdapterFactory(debugFactory); - adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); - eLabelProvider = new AdapterFactoryLabelProvider(adapterFactory); + super(); + final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory( + ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + + adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); + CustomDebugItemProviderAdapterFactory debugFactory = new CustomDebugItemProviderAdapterFactory(); + adapterFactory.addAdapterFactory(debugFactory); + adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); + eLabelProvider = new AdapterFactoryLabelProvider(adapterFactory); } /** @@ -82,7 +82,7 @@ public DSLDebugModelPresentation() { * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) */ public void addListener(ILabelProviderListener listener) { - eLabelProvider.addListener(listener); + eLabelProvider.addListener(listener); } /** @@ -91,29 +91,28 @@ public void addListener(ILabelProviderListener listener) { * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ public void dispose() { - for (Image cachedImage : imagesCache.values()) { - cachedImage.dispose(); - } - eLabelProvider.dispose(); + for (Image cachedImage : imagesCache.values()) { + cachedImage.dispose(); + } + eLabelProvider.dispose(); } /** * {@inheritDoc} * - * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, - * java.lang.String) + * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) */ public boolean isLabelProperty(Object element, String property) { - final boolean res; + final boolean res; - final Object unwrapped = unwrapp(element); - if (unwrapped instanceof Variable) { - res = isLabelProperty(((Variable)unwrapped).getValue(), property); - } else { - res = eLabelProvider.isLabelProperty(unwrapp(element), property); - } + final Object unwrapped = unwrapp(element); + if (unwrapped instanceof Variable) { + res = isLabelProperty(((Variable)unwrapped).getValue(), property); + } else { + res = eLabelProvider.isLabelProperty(unwrapp(element), property); + } - return res; + return res; } /** @@ -122,7 +121,7 @@ public boolean isLabelProperty(Object element, String property) { * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) */ public void removeListener(ILabelProviderListener listener) { - eLabelProvider.removeListener(listener); + eLabelProvider.removeListener(listener); } /** @@ -131,7 +130,7 @@ public void removeListener(ILabelProviderListener listener) { * @see org.eclipse.debug.ui.ISourcePresentation#getEditorInput(java.lang.Object) */ public IEditorInput getEditorInput(Object element) { - return EMFEditorUtils.getEditorInput(element); + return EMFEditorUtils.getEditorInput(element); } /** @@ -141,16 +140,19 @@ public IEditorInput getEditorInput(Object element) { * java.lang.Object) */ public String getEditorId(IEditorInput input, Object element) { - final String res; + final String res; - res = EMFEditorUtils.getEditorID(input, element); + res = EMFEditorUtils.getEditorID(input, element); - return res; + return res; } + /** + * {@inheritDoc} Unused method. + * + * @see org.eclipse.debug.ui.IDebugModelPresentation#setAttribute(java.lang.String, java.lang.Object) + */ public void setAttribute(String attribute, Object value) { - // TODO Auto-generated method stub - } /** @@ -159,35 +161,35 @@ public void setAttribute(String attribute, Object value) { * @see org.eclipse.debug.ui.IDebugModelPresentation#getImage(java.lang.Object) */ public Image getImage(final Object element) { - final Image res; - - final Object unwrapped = unwrapp(element); - if (unwrapped instanceof Variable) { - res = getImage(((Variable)unwrapped).getValue()); - } else if (element instanceof DSLBreakpoint) { - final Object image = ((DSLBreakpoint)element).getImage(); - if (image instanceof ComposedImage) { - ((ComposedImage)image).getImages().add(DebugIdeUiPlugin.INSTANCE.getImage( - "full/deco16/breakpoint_enabled")); - } - final ImageDescriptor descriptor = ExtendedImageRegistry.getInstance().getImageDescriptor( - image); - Image cachedImage = imagesCache.get(descriptor); - if (cachedImage == null) { - cachedImage = new Image(Display.getDefault(), descriptor.getImageData()); - imagesCache.put(descriptor, cachedImage); - } - res = cachedImage; - } else { - if (unwrapped != null) { - synchronized(unwrapped) { - res = eLabelProvider.getImage(unwrapped); + final Image res; + + final Object unwrapped = unwrapp(element); + if (unwrapped instanceof Variable) { + res = getImage(((Variable)unwrapped).getValue()); + } else if (element instanceof DSLBreakpoint) { + final Object image = ((DSLBreakpoint)element).getImage(); + if (image instanceof ComposedImage) { + ((ComposedImage)image).getImages().add(DebugIdeUiPlugin.INSTANCE.getImage( + "full/deco16/breakpoint_enabled")); + } + final ImageDescriptor descriptor = ExtendedImageRegistry.getInstance().getImageDescriptor(image); + Image cachedImage = imagesCache.get(descriptor); + if (cachedImage == null) { + cachedImage = new Image(Display.getDefault(), descriptor.getImageData()); + imagesCache.put(descriptor, cachedImage); + } + res = cachedImage; + } else { + if (unwrapped != null) { + synchronized(unwrapped) { + res = eLabelProvider.getImage(unwrapped); + } + } else { + res = null; + } } - } else - res = null; - } - return res; + return res; } /** @@ -196,24 +198,29 @@ public Image getImage(final Object element) { * @see org.eclipse.debug.ui.IDebugModelPresentation#getText(java.lang.Object) */ public String getText(Object element) { - final String res; - - final Object unwrapped = unwrapp(element); - if (unwrapped instanceof Variable) { - res = getText(((Variable)unwrapped).getValue()); - } else if (element instanceof DSLBreakpoint) { - res = ((DSLBreakpoint)element).getText(); - } else { - synchronized(unwrapped) { - res = eLabelProvider.getText(unwrapped); + final String res; + + final Object unwrapped = unwrapp(element); + if (unwrapped instanceof Variable) { + res = getText(((Variable)unwrapped).getValue()); + } else if (element instanceof DSLBreakpoint) { + res = ((DSLBreakpoint)element).getText(); + } else { + synchronized(unwrapped) { + res = eLabelProvider.getText(unwrapped); + } } - } - return res; + return res; } + /** + * {@inheritDoc} Unused method. + * + * @see org.eclipse.debug.ui.IDebugModelPresentation#computeDetail(org.eclipse.debug.core.model.IValue, + * org.eclipse.debug.ui.IValueDetailListener) + */ public void computeDetail(IValue value, IValueDetailListener listener) { - // TODO Auto-generated method stub } /** @@ -221,22 +228,22 @@ public void computeDetail(IValue value, IValueDetailListener listener) { * * @param element * the {@link Object element} - * @return the {@link Adapter#getTarget() target} if the given element is an {@link Adapter}, the - * given element itself otherwise + * @return the {@link Adapter#getTarget() target} if the given element is an {@link Adapter}, the given + * element itself otherwise */ private Object unwrapp(Object element) { - final Object res; - - if (element instanceof DSLObjectVariable) { - res = ((DSLObjectVariable)element).getObject(); - } else if (element instanceof DSLObjectValue) { - res = ((DSLObjectValue)element).getValue(); - } else if (element instanceof Adapter) { - res = ((Adapter)element).getTarget(); - } else { - res = element; - } - return res; + final Object res; + + if (element instanceof DSLObjectVariable) { + res = ((DSLObjectVariable)element).getObject(); + } else if (element instanceof DSLObjectValue) { + res = ((DSLObjectValue)element).getValue(); + } else if (element instanceof Adapter) { + res = ((Adapter)element).getTarget(); + } else { + res = element; + } + return res; } /** @@ -246,12 +253,12 @@ private Object unwrapp(Object element) { * org.eclipse.debug.core.model.IStackFrame) */ public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) { - if (frame instanceof DSLStackFrameAdapter) { - final EObject instruction = ((DSLStackFrameAdapter)frame).getCurrentInstruction(); - final URI instructionUri = EcoreUtil.getURI(instruction); - EMFEditorUtils.selectInstruction(editorPart, instructionUri); - } - return true; + if (frame instanceof DSLStackFrameAdapter) { + final EObject instruction = ((DSLStackFrameAdapter)frame).getCurrentInstruction(); + final URI instructionUri = EcoreUtil.getURI(instruction); + EMFEditorUtils.selectInstruction(editorPart, instructionUri); + } + return true; } /** @@ -261,7 +268,7 @@ public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) { * org.eclipse.debug.core.model.IThread) */ public void removeAnnotations(IEditorPart editorPart, IThread thread) { - // nothing to do here + // nothing to do here } } diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/Activator.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/Activator.java index 735eeccdd..f10f106be 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/Activator.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/Activator.java @@ -44,6 +44,9 @@ public class Activator extends Plugin { */ private static Activator plugin; + /** + * The locators used to find source files. + */ private static List locators; /** @@ -52,6 +55,11 @@ public class Activator extends Plugin { public Activator() { } + /** + * Retrieve all the locators registered with the extension point, and additionally store them in a cache. + * + * @return All locators registered with the extension point. + */ public List retrieveLocators() { if (locators == null) { IExtensionRegistry reg = Platform.getExtensionRegistry(); @@ -64,7 +72,7 @@ public List retrieveLocators() { for (int j = 0; j < ce.length; j++) { ILocator locator; try { - locator = (ILocator) ce[j].createExecutableExtension("class"); + locator = (ILocator)ce[j].createExecutableExtension("class"); contributors.add(locator); } catch (CoreException e) { e.printStackTrace(); @@ -199,12 +207,12 @@ public void error(String message, Throwable e) { Throwable t = e; if (e instanceof InvocationTargetException) { - t = ((InvocationTargetException) e).getTargetException(); + t = ((InvocationTargetException)e).getTargetException(); } IStatus status; if (t instanceof CoreException) { - status = ((CoreException) t).getStatus(); + status = ((CoreException)t).getStatus(); } else { status = new Status(IStatus.ERROR, PLUGIN_ID, message, e); } diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLSourceLocator.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLSourceLocator.java index 5b6f39df2..e96ec6ed4 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLSourceLocator.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLSourceLocator.java @@ -25,21 +25,6 @@ */ public class DSLSourceLocator implements IPersistableSourceLocator2 { - public String getMemento() throws CoreException { - // TODO Auto-generated method stub - return ""; - } - - public void initializeFromMemento(String memento) throws CoreException { - // TODO Auto-generated method stub - - } - - public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException { - // TODO Auto-generated method stub - - } - /** * {@inheritDoc} * @@ -61,12 +46,46 @@ public Object getSourceElement(IStackFrame stackFrame) { return res; } + /** + * {@inheritDoc} Unused method of IPersistableSourceLocator2 + * + * @see org.eclipse.debug.core.model.IPersistableSourceLocator#getMemento() + */ + public String getMemento() throws CoreException { + return ""; + } + + /** + * {@inheritDoc} Unused method of IPersistableSourceLocator2 + * + * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeFromMemento(java.lang.String) + */ + public void initializeFromMemento(String memento) throws CoreException { + } + + /** + * {@inheritDoc} Unused method of IPersistableSourceLocator2 + * + * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeDefaults(org.eclipse.debug.core.ILaunchConfiguration) + */ + public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException { + } + + /** + * {@inheritDoc} Unused method of IPersistableSourceLocator2 + * + * @see org.eclipse.debug.core.sourcelookup.IPersistableSourceLocator2#initializeFromMemento(java.lang.String, + * org.eclipse.debug.core.ILaunchConfiguration) + */ public void initializeFromMemento(String memento, ILaunchConfiguration configuration) throws CoreException { - // TODO Auto-generated method stub - } + /** + * {@inheritDoc} Unused method of IPersistableSourceLocator2 + * + * @see org.eclipse.debug.core.sourcelookup.IPersistableSourceLocator2#dispose() + */ public void dispose() { // TODO Auto-generated method stub diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/IDSLDebugger.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/IDSLDebugger.java index ec82f1368..a2646dacc 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/IDSLDebugger.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/IDSLDebugger.java @@ -29,17 +29,20 @@ public interface IDSLDebugger extends IDSLDebugEventProcessor { * * @author Yvan Lussaud */ - static enum Stepping { + enum Stepping { /** * Not stepping. */ - NONE, /** + NONE, + /** * Stepping over. */ - STEP_OVER, /** + STEP_OVER, + /** * Stepping into. */ - STEP_INTO, /** + STEP_INTO, + /** * Stepping return. */ STEP_RETURN; diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java index 1e163ef48..d1ab974e8 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java @@ -202,10 +202,11 @@ public void breakpointAdded(IBreakpoint breakpoint) { URI uri = ((DSLBreakpoint)breakpoint).getURI(); factory.getDebugger().handleEvent(new AddBreakpointRequest(uri)); try { - for (Entry entry : breakpoint.getMarker().getAttributes().entrySet()) { - factory.getDebugger().handleEvent( - new ChangeBreakPointRequest(((DSLBreakpoint)breakpoint).getURI(), entry - .getKey(), (Serializable)entry.getValue())); + for (Entry entry : breakpoint.getMarker().getAttributes() + .entrySet()) { + factory.getDebugger().handleEvent(new ChangeBreakPointRequest( + ((DSLBreakpoint)breakpoint).getURI(), entry.getKey(), (Serializable)entry + .getValue())); } } catch (CoreException e) { Activator.getDefault().error(e); @@ -251,17 +252,14 @@ public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) { for (Entry entry : delta.getAttributes().entrySet()) { final Object markerValue = marker.getAttribute(entry.getKey()); final Object deltaValue = entry.getValue(); - if ((markerValue != null && !markerValue.equals(deltaValue)) - || (deltaValue != null && !deltaValue.equals(markerValue))) { + if ((markerValue != null && !markerValue.equals(deltaValue)) || (deltaValue != null + && !deltaValue.equals(markerValue))) { if (delta.getKind() == IResourceDelta.ADDED) { - factory.getDebugger() - .handleEvent( - new ChangeBreakPointRequest(uri, entry.getKey(), - (Serializable)deltaValue)); + factory.getDebugger().handleEvent(new ChangeBreakPointRequest(uri, entry.getKey(), + (Serializable)deltaValue)); } else { - factory.getDebugger().handleEvent( - new ChangeBreakPointRequest(uri, entry.getKey(), - (Serializable)markerValue)); + factory.getDebugger().handleEvent(new ChangeBreakPointRequest(uri, entry.getKey(), + (Serializable)markerValue)); } } } @@ -299,18 +297,30 @@ public boolean isDisconnected() { return getHost().getState() == DebugTargetState.DISCONNECTED; } + /** + * {@inheritDoc} Unused method. + * + * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#supportsStorageRetrieval() + */ public boolean supportsStorageRetrieval() { - // TODO Auto-generated method stub return false; } + /** + * {@inheritDoc} Unused method. + * + * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long) + */ public IMemoryBlock getMemoryBlock(long startAddress, long length) throws DebugException { - // TODO Auto-generated method stub return null; } + /** + * {@inheritDoc} Unused method. + * + * @see org.eclipse.debug.core.model.IDebugTarget#getProcess() + */ public IProcess getProcess() { - // TODO Auto-generated method stub return null; } @@ -353,9 +363,8 @@ public String getName() throws DebugException { * @see org.eclipse.debug.core.model.IDebugTarget#supportsBreakpoint(org.eclipse.debug.core.model.IBreakpoint) */ public boolean supportsBreakpoint(IBreakpoint breakpoint) { - return breakpoint instanceof DSLBreakpoint - && breakpoint.getModelIdentifier().equals(getModelIdentifier()) - && ((DSLBreakpoint)breakpoint).getURI() != null; + return breakpoint instanceof DSLBreakpoint && breakpoint.getModelIdentifier().equals( + getModelIdentifier()) && ((DSLBreakpoint)breakpoint).getURI() != null; } /** @@ -417,8 +426,8 @@ private void handleSetCurrentInstructionReply(SetCurrentInstructionReply setCurr final Thread eThread = DebugTargetUtils.getThread(getHost(), setCurrentInstructionReply .getThreadName()); // EMF model change - factory.getModelUpdater().setCurrentInstructionReply(eThread, - setCurrentInstructionReply.getInstruction(), setCurrentInstructionReply.isCanStepInto()); + factory.getModelUpdater().setCurrentInstructionReply(eThread, setCurrentInstructionReply + .getInstruction(), setCurrentInstructionReply.isCanStepInto()); // Eclipse change factory.getThread(eThread).fireChangeEvent(DebugEvent.CONTENT); // notify current instruction listeners @@ -450,9 +459,9 @@ private void handlePopStackFrameReply(PopStackFrameReply popStackFrameReply) { private void handlePushStackFrameReply(PushStackFrameReply pushStackFrameReply) { final Thread eThread = DebugTargetUtils.getThread(getHost(), pushStackFrameReply.getThreadName()); // EMF model change - final StackFrame eFrame = factory.getModelUpdater().pushStackFrameReply(eThread, - pushStackFrameReply.getName(), pushStackFrameReply.getContext(), - pushStackFrameReply.getCurrentInstruction(), pushStackFrameReply.isCanStepInto()); + final StackFrame eFrame = factory.getModelUpdater().pushStackFrameReply(eThread, pushStackFrameReply + .getName(), pushStackFrameReply.getContext(), pushStackFrameReply.getCurrentInstruction(), + pushStackFrameReply.isCanStepInto()); // Eclipse change factory.getThread(eThread).fireChangeEvent(DebugEvent.CONTENT); // notify current instruction listeners @@ -484,8 +493,8 @@ private void handleVariableReply(VariableReply variableReply) { final StackFrame eStackFrame = DebugTargetUtils.getStackFrame(eThread, variableReply.getStackName()); // EMF model change factory.getModelUpdater().setVariableReply(eStackFrame, variableReply.getDeclarationTypeName(), - variableReply.getVariableName(), variableReply.getValue(), - variableReply.supportModifications()); + variableReply.getVariableName(), variableReply.getValue(), variableReply + .supportModifications()); // Eclipse change factory.getThread(eThread).fireChangeEvent(DebugEvent.CONTENT); } diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java index 12bda6482..82d88cd1a 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java @@ -45,12 +45,12 @@ public class DSLStackFrameAdapter extends AbstractDSLDebugElementAdapter impleme * the {@link DSLEclipseDebugIntegration} factory */ public DSLStackFrameAdapter(DSLEclipseDebugIntegration factory) { - super(factory); + super(factory); } @Override public boolean isAdapterForType(Object type) { - return super.isAdapterForType(type) || type == IStackFrame.class; + return super.isAdapterForType(type) || type == IStackFrame.class; } /** @@ -59,8 +59,8 @@ public boolean isAdapterForType(Object type) { * @return the {@link StackFrame} */ public StackFrame getHost() { - assert target instanceof StackFrame; - return (StackFrame)target; + assert target instanceof StackFrame; + return (StackFrame)target; } /** @@ -69,7 +69,7 @@ public StackFrame getHost() { * @see org.eclipse.debug.core.model.IStep#canStepInto() */ public boolean canStepInto() { - return getThread().canStepInto(); + return getThread().canStepInto(); } /** @@ -78,7 +78,7 @@ public boolean canStepInto() { * @see org.eclipse.debug.core.model.IStep#canStepOver() */ public boolean canStepOver() { - return getThread().canStepOver(); + return getThread().canStepOver(); } /** @@ -87,11 +87,11 @@ public boolean canStepOver() { * @see org.eclipse.debug.core.model.IStep#canStepReturn() */ public boolean canStepReturn() { - return getThread().canStepReturn(); + return getThread().canStepReturn(); } public boolean isStepping() { - return getThread().isStepping(); + return getThread().isStepping(); } /** @@ -100,7 +100,7 @@ public boolean isStepping() { * @see org.eclipse.debug.core.model.IStep#stepInto() */ public void stepInto() throws DebugException { - getThread().stepInto(); + getThread().stepInto(); } /** @@ -109,7 +109,7 @@ public void stepInto() throws DebugException { * @see org.eclipse.debug.core.model.IStep#stepOver() */ public void stepOver() throws DebugException { - getThread().stepOver(); + getThread().stepOver(); } /** @@ -118,7 +118,7 @@ public void stepOver() throws DebugException { * @see org.eclipse.debug.core.model.IStep#stepReturn() */ public void stepReturn() throws DebugException { - getThread().stepReturn(); + getThread().stepReturn(); } /** @@ -127,7 +127,7 @@ public void stepReturn() throws DebugException { * @see org.eclipse.debug.core.model.ISuspendResume#canResume() */ public boolean canResume() { - return getThread().canResume(); + return getThread().canResume(); } /** @@ -136,11 +136,11 @@ public boolean canResume() { * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend() */ public boolean canSuspend() { - return getThread().canSuspend(); + return getThread().canSuspend(); } public boolean isSuspended() { - return getThread().isSuspended(); + return getThread().isSuspended(); } /** @@ -149,7 +149,7 @@ public boolean isSuspended() { * @see org.eclipse.debug.core.model.ISuspendResume#resume() */ public void resume() throws DebugException { - getThread().resume(); + getThread().resume(); } /** @@ -158,7 +158,7 @@ public void resume() throws DebugException { * @see org.eclipse.debug.core.model.ISuspendResume#suspend() */ public void suspend() throws DebugException { - getThread().suspend(); + getThread().suspend(); } /** @@ -167,11 +167,11 @@ public void suspend() throws DebugException { * @see org.eclipse.debug.core.model.ITerminate#canTerminate() */ public boolean canTerminate() { - return getThread().canTerminate(); + return getThread().canTerminate(); } public boolean isTerminated() { - return getThread().isTerminated(); + return getThread().isTerminated(); } /** @@ -180,7 +180,7 @@ public boolean isTerminated() { * @see org.eclipse.debug.core.model.ITerminate#terminate() */ public void terminate() throws DebugException { - getThread().terminate(); + getThread().terminate(); } /** @@ -189,19 +189,19 @@ public void terminate() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getThread() */ public IThread getThread() { - if (thread == null) { - fr.obeo.dsl.debug.Thread hostThread = ThreadUtils.getThread(getHost()); - if (hostThread == null) { - throw new IllegalStateException("can't addapt Thread to IThread."); - } - synchronized(hostThread) { - thread = (IThread)factory.adapt(hostThread, IThread.class); - } if (thread == null) { - throw new IllegalStateException("can't addapt Thread to IThread."); + fr.obeo.dsl.debug.Thread hostThread = ThreadUtils.getThread(getHost()); + if (hostThread == null) { + throw new IllegalStateException("can't addapt Thread to IThread."); + } + synchronized(hostThread) { + thread = (IThread)factory.adapt(hostThread, IThread.class); + } + if (thread == null) { + throw new IllegalStateException("can't addapt Thread to IThread."); + } } - } - return thread; + return thread; } /** @@ -210,20 +210,20 @@ public IThread getThread() { * @see org.eclipse.debug.core.model.IStackFrame#getVariables() */ public IVariable[] getVariables() throws DebugException { - final List res = new ArrayList(); - - for (Variable variable : getHost().getVariables()) { - synchronized(variable) { - final IVariable var = (IVariable)factory.adapt(variable, IVariable.class); - if (var != null) { - res.add(var); - } else { - throw new IllegalStateException("can't addapt Variable to IVariable."); + final List res = new ArrayList(); + + for (Variable variable : getHost().getVariables()) { + synchronized(variable) { + final IVariable var = (IVariable)factory.adapt(variable, IVariable.class); + if (var != null) { + res.add(var); + } else { + throw new IllegalStateException("can't addapt Variable to IVariable."); + } + } } - } - } - return res.toArray(new IVariable[res.size()]); + return res.toArray(new IVariable[res.size()]); } /** @@ -232,7 +232,7 @@ public IVariable[] getVariables() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#hasVariables() */ public boolean hasVariables() throws DebugException { - return getHost().getVariables().size() > 0; + return getHost().getVariables().size() > 0; } /** @@ -241,23 +241,23 @@ public boolean hasVariables() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber() */ public int getLineNumber() throws DebugException { - final EObject context = getContext(); - int result = -1; - for (ILocator locator : Activator.getDefault().retrieveLocators()) { - final ILocator.Location location = locator.getLocation(context); - switch (location.type) { - case XTEXT_LOCATION: - result = (Integer)location.data; - break; - default: - break; + final EObject context = getContext(); + int result = -1; + for (ILocator locator : Activator.getDefault().retrieveLocators()) { + final ILocator.Location location = locator.getLocation(context); + switch (location.type) { + case XTEXT_LOCATION: + result = (Integer)location.data; + break; + default: + break; + } + if (result != -1) { + break; + } } - if (result != -1) { - break; - } - } - return result; + return result; } /** @@ -266,7 +266,7 @@ public int getLineNumber() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getCharStart() */ public int getCharStart() throws DebugException { - return -1; + return -1; } /** @@ -275,7 +275,7 @@ public int getCharStart() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd() */ public int getCharEnd() throws DebugException { - return -1; + return -1; } /** @@ -284,12 +284,16 @@ public int getCharEnd() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#getName() */ public String getName() throws DebugException { - return getHost().getName(); + return getHost().getName(); } + /** + * {@inheritDoc} Unused method. + * + * @see org.eclipse.debug.core.model.IStackFrame#getRegisterGroups() + */ public IRegisterGroup[] getRegisterGroups() throws DebugException { - // TODO Auto-generated method stub - return null; + return null; } /** @@ -298,7 +302,7 @@ public IRegisterGroup[] getRegisterGroups() throws DebugException { * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups() */ public boolean hasRegisterGroups() throws DebugException { - return getHost().getRegisterGroups().size() > 0; + return getHost().getRegisterGroups().size() > 0; } /** @@ -307,7 +311,7 @@ public boolean hasRegisterGroups() throws DebugException { * @return the {@link StackFrame#getCurrentInstruction() current instruction} */ public EObject getCurrentInstruction() { - return getHost().getCurrentInstruction(); + return getHost().getCurrentInstruction(); } /** @@ -316,7 +320,7 @@ public EObject getCurrentInstruction() { * @return the {@link StackFrame#getContext() context} */ public EObject getContext() { - return getHost().getContext(); + return getHost().getContext(); } } diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/ILocator.java b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/ILocator.java index 2534c86e5..f08c8a30a 100644 --- a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/ILocator.java +++ b/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/ILocator.java @@ -11,26 +11,83 @@ * Contributors: Obeo - initial API and implementation *******************************************************************************/ +/** + * a. + * + * @author Yvan Lussaud + */ public interface ILocator { + /** + * The type locator (either xtext or sirius). + * + * @author Yvan Lussaud + */ enum Type { - XTEXT_LOCATION("Xtext"), SIRIUS_LOCATION("Sirius"); + /** + * Xtext locator type. + */ + XTEXT_LOCATION("Xtext"), - public final String typeName; + /** + * Sirius locator type. + */ + SIRIUS_LOCATION("Sirius"); + /** + * Name of the locator type. + */ + private final String typeName; + + /** + * Constructs a locator type based on a type name. + * + * @param typeName + * The locator type name. + */ Type(final String typeName) { this.typeName = typeName; } + + public String getTypeName() { + return typeName; + } } + /** + * Gets the location of a given model element. + * + * @param eObject + * The model element. + * @return The location (eg. the file and line number). + */ Location getLocation(EObject eObject); + /** + * The location of a model element (eg. in an xmi or xtext file). + * + * @author Yvan Lussaud + */ class Location { + /** + * The location type. + */ final Type type; + /** + * The location data (depends on the type). + */ final Object data; + /** + * Constructs a location based on type anf location data. + * + * @param type + * The location type. + * @param data + * The location data. + */ public Location(final Type type, final Object data) { this.type = type; this.data = data; From 9654b6a2e75c831edb3493811182a8916030aef1 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Wed, 17 May 2017 13:36:03 +0200 Subject: [PATCH 191/267] adding test project for execution.sequential.javaxdsml it is mainly based on the official samples --- .../.classpath | 8 + .../.project | 34 + .../.settings/org.eclipse.jdt.core.prefs | 7 + .../META-INF/MANIFEST.MF | 22 + .../build.properties | 4 + .../pom.xml | 113 ++++ .../javaxdsml/tests/SequentialFsmTest.xtend | 90 +++ .../shared/MelangeUiInjectorProvider.java | 15 + .../eclipse/shared/WorkspaceTestHelper.xtend | 587 ++++++++++++++++++ .../tests-inputs-gen/.gitignore | 5 + .../tests-inputs-gen/readme.md | 9 + pom.xml | 14 + 12 files changed, 908 insertions(+) create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.classpath create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.project create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.settings/org.eclipse.jdt.core.prefs create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/build.properties create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/MelangeUiInjectorProvider.java create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/.gitignore create mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/readme.md diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.classpath b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.classpath new file mode 100644 index 000000000..428337e56 --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.project b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.project new file mode 100644 index 000000000..f4dde2c27 --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.project @@ -0,0 +1,34 @@ + + + org.gemoc.execution.sequential.javaxdsml.tests + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature + + diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.settings/org.eclipse.jdt.core.prefs b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF new file mode 100644 index 000000000..21cca94f1 --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF @@ -0,0 +1,22 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Sequential Java xdsml Tests +Bundle-SymbolicName: org.gemoc.execution.sequential.javaxdsml.tests +Bundle-Version: 2.3.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.gemoc.execution.sequential.javaxdsml.ide.ui;bundle-version="2.3.0", + org.junit;bundle-version="4.12.0", + org.eclipse.xtext.junit4;bundle-version="2.10.0", + org.eclipse.xtext.xbase.lib;bundle-version="2.10.0", + fr.inria.diverse.melange.ui;bundle-version="0.2.0", + org.eclipse.debug.ui;bundle-version="3.11.202", + org.eclipse.emf.compare;bundle-version="3.3.1", + org.eclipse.jdt.core;bundle-version="3.12.3", + org.eclipse.ui.ide;bundle-version="3.12.3", + org.eclipse.jdt.launching;bundle-version="3.8.101", + org.eclipse.jdt.ui;bundle-version="3.12.2", + org.eclipse.xtext.ui;bundle-version="2.10.0", + fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", + org.eclipse.core.expressions;bundle-version="3.5.100", + fr.inria.diverse.trace.gemoc.generator;bundle-version="2.3.0", + fr.inria.diverse.trace.gemoc;bundle-version="2.3.0" diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/build.properties b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml new file mode 100644 index 000000000..8b7954750 --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml @@ -0,0 +1,113 @@ + + + 4.0.0 + + + ../../.. + org.gemoc.execution.sequential.java + org.gemoc.execution.sequential.java.root + 2.3.0-SNAPSHOT + + + org.gemoc.execution.sequential.javaxdsml.tests + eclipse-test-plugin + + + + + ${basedir}/../../../../../gemoc-studio + + ${basedir}/tests-inputs-gen + ${gemoc-studio.repository}/official_samples/LegacyFSM/language_workbench + ${tests-inputs-gen.path}/SequentialFSM + + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + -Xmx2048m + true + true + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + initialize + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + maven-clean-plugin + + + + ${tests-inputs-gen.path} + + **/.gitignore + **/readme.md + + + + + + + + + + diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend new file mode 100644 index 000000000..8331b7d71 --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend @@ -0,0 +1,90 @@ +package org.gemoc.execution.sequential.javaxdsml.tests + +import com.google.inject.Inject +import org.eclipse.core.resources.IProject +import org.eclipse.xtext.junit4.AbstractXtextTests +import org.eclipse.xtext.junit4.InjectWith +import org.eclipse.xtext.junit4.XtextRunner +import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil +import org.gemoc.execution.sequential.javaxdsml.tests.eclipse.shared.MelangeUiInjectorProvider +import org.gemoc.execution.sequential.javaxdsml.tests.eclipse.shared.WorkspaceTestHelper +import org.junit.After +import org.junit.Before +import org.junit.FixMethodOrder +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.MethodSorters + +@RunWith(XtextRunner) +@InjectWith(MelangeUiInjectorProvider) +@FixMethodOrder(MethodSorters::NAME_ASCENDING) +public class SequentialFsmTest extends AbstractXtextTests +{ + @Inject WorkspaceTestHelper helper + IProject melangeProject + IProject melangeProject2 + static final String BASE_FOLDER_NAME = "tests-inputs-gen/SequentialFSM" + static final String BASE_PROJECT_NAME = "org.gemoc.sample.legacyfsm" + static final String PROJECT_NAME = BASE_PROJECT_NAME+".fsm" + static final String MELANGE_FILE = PROJECT_NAME+"/src/org/gemoc/sample/legacyfsm/fsm/FSM.melange" + static final String PROJECT_NAME2 = BASE_PROJECT_NAME+".xsfsm" + static final String MELANGE_FILE2 = PROJECT_NAME2+"/src/org/gemoc/sample/legacyfsm/xsfsm/language/XSFSM.melange" + + @Before + override setUp() { + helper.setTargetPlatform + if (!helper.projectExists(PROJECT_NAME)) { + super.setUp + helper.init + IResourcesSetupUtil::cleanWorkspace + + // try to respect build order in order to ease compilation, this will speed up the test + helper.deployProject(PROJECT_NAME+".model",BASE_FOLDER_NAME+"/"+PROJECT_NAME+".model.zip") + helper.deployProject(PROJECT_NAME+".k3dsa",BASE_FOLDER_NAME+"/"+PROJECT_NAME+".k3dsa.zip") + melangeProject = helper.deployProject(PROJECT_NAME,BASE_FOLDER_NAME+"/"+PROJECT_NAME+".zip") + helper.deployProject(PROJECT_NAME+".design",BASE_FOLDER_NAME+"/"+PROJECT_NAME+".design.zip") + helper.deployProject(PROJECT_NAME+".model.edit",BASE_FOLDER_NAME+"/"+PROJECT_NAME+".model.edit.zip") + helper.deployProject(PROJECT_NAME+".model.editor",BASE_FOLDER_NAME+"/"+PROJECT_NAME+".model.editor.zip") + + + melangeProject2 = helper.deployProject(PROJECT_NAME2,BASE_FOLDER_NAME+"/"+PROJECT_NAME2+".zip") + helper.deployProject(PROJECT_NAME2+".design",BASE_FOLDER_NAME+"/"+PROJECT_NAME2+".design.zip") + + IResourcesSetupUtil::reallyWaitForAutoBuild + helper.cleanAll(MELANGE_FILE) + helper.cleanAll(MELANGE_FILE2) + IResourcesSetupUtil::reallyWaitForAutoBuild + helper.openEditor(MELANGE_FILE) + helper.openEditor(MELANGE_FILE2) + } else { + melangeProject = helper.getProject(PROJECT_NAME) + } + } + + @After + override tearDown() { + // Nope + } + + @Test + def void test01GenerateAllMelange_NoErrorsInWorkspace() { + helper.generateAll(MELANGE_FILE) + helper.generateAll(MELANGE_FILE2) + IResourcesSetupUtil::reallyWaitForAutoBuild + helper.assertNoMarkers + + helper.assertProjectExists(PROJECT_NAME) + helper.assertProjectExists(PROJECT_NAME2) + helper.assertProjectExists(PROJECT_NAME2+".xsfsm") + } + + @Test + def void test03GenerateTrace_NoErrorsInWorkspace() { + helper.generateTrace(MELANGE_FILE2, "XSFSM", PROJECT_NAME2+".trace") + IResourcesSetupUtil::reallyWaitForAutoBuild + helper.assertNoMarkers + + helper.assertProjectExists(PROJECT_NAME2+".trace") + } + +} diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/MelangeUiInjectorProvider.java b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/MelangeUiInjectorProvider.java new file mode 100644 index 000000000..dc225b768 --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/MelangeUiInjectorProvider.java @@ -0,0 +1,15 @@ + +package org.gemoc.execution.sequential.javaxdsml.tests.eclipse.shared; + +import org.eclipse.xtext.junit4.IInjectorProvider; + +import com.google.inject.Injector; + +public class MelangeUiInjectorProvider implements IInjectorProvider { + + @Override + public Injector getInjector() { + return fr.inria.diverse.melange.ui.internal.MelangeActivator.getInstance().getInjector("fr.inria.diverse.melange.Melange"); + } + +} diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend new file mode 100644 index 000000000..e4f9e8e89 --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend @@ -0,0 +1,587 @@ +package org.gemoc.execution.sequential.javaxdsml.tests.eclipse.shared + +import com.google.common.base.Charsets +import com.google.common.io.CharStreams +import com.google.inject.Inject +import fr.inria.diverse.melange.metamodel.melange.ModelTypingSpace +import java.io.ByteArrayInputStream +import java.util.List +import java.util.zip.ZipFile +import org.eclipse.core.expressions.IEvaluationContext +import org.eclipse.core.resources.IMarker +import org.eclipse.core.resources.IProject +import org.eclipse.core.resources.IResource +import org.eclipse.core.resources.ResourcesPlugin +import org.eclipse.core.runtime.NullProgressMonitor +import org.eclipse.core.runtime.Path +import org.eclipse.core.runtime.jobs.Job +import org.eclipse.debug.core.DebugPlugin +import org.eclipse.debug.core.ILaunchManager +import org.eclipse.debug.ui.IDebugUIConstants +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.compare.EMFCompare +import org.eclipse.emf.compare.Match +import org.eclipse.emf.compare.diff.DefaultDiffEngine +import org.eclipse.emf.compare.diff.FeatureFilter +import org.eclipse.emf.compare.scope.DefaultComparisonScope +import org.eclipse.emf.ecore.EClass +import org.eclipse.emf.ecore.EPackage +import org.eclipse.emf.ecore.EReference +import org.eclipse.emf.ecore.EStructuralFeature +import org.eclipse.emf.ecore.EcorePackage +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl +import org.eclipse.jdt.core.JavaCore +import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants +import org.eclipse.jdt.ui.JavaUI +import org.eclipse.jface.viewers.StructuredSelection +import org.eclipse.jface.viewers.TreeViewer +import org.eclipse.pde.internal.core.natures.PDE +import org.eclipse.ui.ISources +import org.eclipse.ui.PlatformUI +import org.eclipse.ui.commands.ICommandService +import org.eclipse.ui.dialogs.IOverwriteQuery +import org.eclipse.ui.handlers.IHandlerService +import org.eclipse.ui.internal.wizards.datatransfer.ZipLeveledStructureProvider +import org.eclipse.ui.part.FileEditorInput +import org.eclipse.ui.views.contentoutline.IContentOutlinePage +import org.eclipse.ui.wizards.datatransfer.ImportOperation +import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil +import org.eclipse.xtext.junit4.ui.util.JavaProjectSetupUtil +import org.eclipse.xtext.resource.DerivedStateAwareResource +import org.eclipse.xtext.ui.XtextProjectHelper +import org.eclipse.xtext.ui.editor.XtextEditor +import org.eclipse.xtext.ui.editor.outline.IOutlineNode +import org.eclipse.xtext.ui.editor.outline.impl.OutlinePage +import org.eclipse.xtext.ui.editor.utils.EditorUtils +import org.eclipse.xtext.ui.resource.XtextResourceSetProvider +import org.junit.Assert +import org.eclipse.swt.widgets.Display +import org.eclipse.pde.core.target.ITargetPlatformService +import org.eclipse.pde.core.target.ITargetDefinition +import org.eclipse.core.runtime.Platform +import java.util.List +import org.eclipse.pde.core.target.ITargetLocation +import java.util.ArrayList +import java.util.Set +import java.io.File +import java.util.HashSet +import org.eclipse.osgi.internal.framework.EquinoxBundle +import org.eclipse.osgi.storage.BundleInfo.Generation +import org.eclipse.core.runtime.jobs.Job +import org.eclipse.pde.core.target.LoadTargetDefinitionJob +import org.eclipse.pde.internal.core.target.TargetPlatformService +import org.osgi.framework.Bundle +import org.eclipse.jdt.core.IJavaProject +import org.eclipse.jdt.launching.JavaRuntime +import java.net.URL +import java.net.URLClassLoader +import fr.inria.diverse.trace.gemoc.generator.TraceAddonGeneratorIntegration +import org.eclipse.core.resources.IFile +import org.eclipse.core.runtime.IProgressMonitor +import org.eclipse.core.runtime.Status + +class WorkspaceTestHelper { + static final String MELANGE_CMD_GENERATE_ALL = "fr.inria.diverse.melange.GenerateAll" + static final String MELANGE_CMD_GENERATE_ADAPTERS = "fr.inria.diverse.melange.GenerateAdapters" + static final String MELANGE_CMD_GENERATE_LANGUAGES = "fr.inria.diverse.melange.GenerateLanguages" + static final String MELANGE_CMD_GENERATE_INTERFACES = "fr.inria.diverse.melange.GenerateInterfaces" + static final String MELANGE_CMD_GENERATE_TRACE = "org.gemoc.execution.sequential.javaxdsml.ide.ui.commands.GenerateTraceAddonPlugin" + static final String MELANGE_CMD_CLEAN_ALL = "fr.inria.diverse.melange.CleanAll" + + static final String MELANGE_EDITOR_ID = "fr.inria.diverse.melange.Melange" + + @Inject XtextResourceSetProvider rsProvider + + def void init() { + Display.^default.syncExec(new Runnable(){ + override run() { + PlatformUI::workbench.showPerspective(JavaUI.ID_PERSPECTIVE, PlatformUI.workbench.activeWorkbenchWindow) + closeWelcomePage + } + }) + } + + def IProject getProject(String projectName) { + return ResourcesPlugin::workspace.root.getProject(projectName) + } + + def boolean projectExists(String projectName) { + return getProject(projectName).exists + } + + def IProject deployProject(String projectName, String zipLocation) { + val newProject = JavaProjectSetupUtil::createSimpleProject(projectName) + + val zip = new ZipFile(zipLocation) + val structureProvider = new ZipLeveledStructureProvider(zip) + val queryOverwrite = new IOverwriteQuery() { + override queryOverwrite(String file) { return ALL } + } + + new ImportOperation( + newProject.project.fullPath, + structureProvider.root, + structureProvider, + queryOverwrite + ).run(new NullProgressMonitor) + + zip.close + return newProject.project + } + + def IProject deployMelangeProject(String projectName, String zipLocation) { + val newProject = JavaProjectSetupUtil::createJavaProject(projectName) + JavaProjectSetupUtil::addSourceFolder(newProject, "src") + JavaProjectSetupUtil::addSourceFolder(newProject, "src-gen") + IResourcesSetupUtil::addNature(newProject.project, XtextProjectHelper::NATURE_ID) + IResourcesSetupUtil::addNature(newProject.project, PDE::PLUGIN_NATURE) + IResourcesSetupUtil::addBuilder(newProject.project, XtextProjectHelper::BUILDER_ID) + IResourcesSetupUtil::addBuilder(newProject.project, PDE::MANIFEST_BUILDER_ID) + IResourcesSetupUtil::addBuilder(newProject.project, PDE::SCHEMA_BUILDER_ID) + JavaProjectSetupUtil::addToClasspath(newProject, + JavaCore::newContainerEntry(new Path("org.eclipse.xtend.XTEND_CONTAINER"))) + JavaProjectSetupUtil::addToClasspath(newProject, + JavaCore::newContainerEntry(new Path("org.eclipse.pde.core.requiredPlugins"))) + + val zip = new ZipFile(zipLocation) + val structureProvider = new ZipLeveledStructureProvider(zip) + val queryOverwrite = new IOverwriteQuery() { + override queryOverwrite(String file) { return ALL } + } + + new ImportOperation( + newProject.project.fullPath, + structureProvider.root, + structureProvider, + queryOverwrite + ).run(new NullProgressMonitor) + + zip.close + return newProject.project + } + + def void generateAll(String melangeFile) { + invokeMelangeCommand(MELANGE_CMD_GENERATE_ALL, melangeFile) + } + + def void generateAdapters(String melangeFile) { + invokeMelangeCommand(MELANGE_CMD_GENERATE_ADAPTERS, melangeFile) + } + + def void generateLanguages(String melangeFile) { + invokeMelangeCommand(MELANGE_CMD_GENERATE_LANGUAGES, melangeFile) + } + + def void generateInterfaces(String melangeFile) { + invokeMelangeCommand(MELANGE_CMD_GENERATE_INTERFACES, melangeFile) + } + + def void generateTrace(String melangeFile, String languageName, String targetProjectName) { + //invokeMelangeCommand(MELANGE_CMD_GENERATE_TRACE, melangeFile) + val mlgFile = ResourcesPlugin::workspace.root.getFile(new Path(melangeFile)) + val Job j = new Job("Generating trace addon plugin for " + melangeFile.toString) { + override protected run(IProgressMonitor monitor) { + + TraceAddonGeneratorIntegration.generateAddon(mlgFile, languageName, targetProjectName, true, + monitor) + + + return new Status(Status.OK, "fr.inria.diverse.trace.gemoc.ui", "Multidimensional Trace addon plugin generated.") + } + } + // And we start the job and wait + j.schedule + j.join + } + + def void cleanAll(String melangeFile) { + invokeMelangeCommand(MELANGE_CMD_CLEAN_ALL, melangeFile) + } + + def void closeWelcomePage() { + if (PlatformUI.workbench.introManager.intro !== null) { + PlatformUI.workbench.introManager.closeIntro(PlatformUI.workbench.introManager.intro) + } + } + + def void assertNoMarkers() { + ResourcesPlugin::workspace.root.projects.forEach[project | + project.findMarkers(IMarker::PROBLEM, true, IResource::DEPTH_INFINITE).forEach[m| + println('''Found marker «m.getAttribute(IMarker::MESSAGE)» («m.getAttribute(IMarker::SEVERITY)»)''') + Assert.assertFalse( + "Unexpected marker: " + m.getAttribute(IMarker::MESSAGE) + " on "+m.resource.fullPath, + m.getAttribute(IMarker::SEVERITY) == IMarker::SEVERITY_ERROR + ) + + ] + ] + } + + def void assertNoMarkers(String filename) { + val mlgFile = ResourcesPlugin::workspace.root.getFile(new Path(filename)) + mlgFile.findMarkers(IMarker::PROBLEM, true, IResource::DEPTH_INFINITE).forEach[ + println('''Found marker «getAttribute(IMarker::MESSAGE)» («getAttribute(IMarker::SEVERITY)»)''') + Assert.assertFalse( + "Unexpected marker: " + getAttribute(IMarker::MESSAGE) + " on file "+filename, + getAttribute(IMarker::SEVERITY) == IMarker::SEVERITY_ERROR + ) + ] + } + + def XtextEditor openEditor(String melangeFile) { + try { + val ws = ResourcesPlugin::workspace + val mlgFile = ws.root.getFile(new Path(melangeFile)) + val wb = PlatformUI::workbench + val openEditor = wb.activeWorkbenchWindow.activePage + .openEditor(new FileEditorInput(mlgFile), MELANGE_EDITOR_ID); + val xtextEditor = EditorUtils::getXtextEditor(openEditor) + if (xtextEditor !== null) { + xtextEditor.selectAndReveal(0, 0) + xtextEditor.internalSourceViewer.setSelectedRange(0, 0) + xtextEditor.internalSourceViewer.textWidget.setFocus + return xtextEditor + } + } catch (Exception e) { + e.printStackTrace + Assert.fail(e.message) + } + + return null + } + + def TreeViewer getOutline(String melangeFile){ + val editor = openEditor(melangeFile) + val outlinePage = editor.getAdapter(typeof(IContentOutlinePage)) as OutlinePage + val treeViewer = outlinePage.treeViewer + return treeViewer + } + + /** + * Usage : projectName/folder/file + */ + def void assertFileExists(String filename) { + val ws = ResourcesPlugin::workspace + Assert.assertTrue( + "Cannot find file " + filename, + ws.root.getFile(new Path(filename)).exists + ) + } + + /** + * Usage : projectName/folder/file + */ + def void assertFileDontExists(String filename) { + val ws = ResourcesPlugin::workspace + Assert.assertFalse( + "Found file " + filename, + ws.root.getFile(new Path(filename)).exists + ) + } + + /** + * Check if {@link project} exist + */ + def void assertProjectExists(String project){ + val ws = ResourcesPlugin::workspace + Assert.assertTrue( + "Cannot find project " + project, + ws.root.getProject(project).exists + ) + } + + /** + * Check if {@link project} doesn't exist + */ + def void assertProjectDoesntExists(String project){ + val ws = ResourcesPlugin::workspace + Assert.assertFalse( + "Can find project " + project, + ws.root.getProject(project).exists + ) + } + + private def void invokeMelangeCommand(String commandId, String melangeFile) { + val ws = ResourcesPlugin::workspace + val wb = PlatformUI::workbench + val mlgFile = ws.root.getFile(new Path(melangeFile)) + val commandService = wb.getService(typeof(ICommandService)) as ICommandService + val handlerService = wb.getService(typeof(IHandlerService)) as IHandlerService + + val command = commandService.getCommand(commandId) + val executionEvent = handlerService.createExecutionEvent(command, null) + val context = executionEvent.applicationContext as IEvaluationContext + + context.parent.addVariable(ISources.ACTIVE_MENU_SELECTION_NAME, + new StructuredSelection(mlgFile)) + + command.executeWithChecks(executionEvent) + + IResourcesSetupUtil::reallyWaitForAutoBuild + } + + /** + * Check for each aspect from {@link aspects} that K3-generated files are inside {@link project} + * + * @param aspects Pairs of [AspectName->AspectedClass] + */ + def void assertK3AspectsExists(List> aspects, String project){ + + val ASPECTS_NS = project+".aspects" + val ASPECTS_FOLDER = ASPECTS_NS.replaceAll("\\.","/") + val SRC_GEN = "src-gen" + + aspects.forEach[asp | + val aspectName = asp.key + val targetClass = asp.value + val aspect = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«aspectName».java''' + val context = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«aspectName»«targetClass»AspectContext.java''' + val properties = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«aspectName»«targetClass»AspectProperties.java''' + assertFileExists(aspect) + assertFileExists(context) + assertFileExists(properties) + ] + } + + /** + * Check for each aspect from {@link aspects} that K3-generated files are NOT inside {@link project} + * + * @param aspects Pairs of [AspectName->AspectedClass] + */ + def void assertK3AspectsDontExists(List> aspects, String project){ + + val ASPECTS_NS = project+".aspects" + val ASPECTS_FOLDER = ASPECTS_NS.replaceAll("\\.","/") + val SRC_GEN = "src-gen" + + aspects.forEach[asp | + val aspectName = asp.key + val targetClass = asp.value + val aspect = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«aspectName».java''' + val context = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«aspectName»«targetClass»AspectContext.java''' + val properties = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«aspectName»«targetClass»AspectProperties.java''' + assertFileDontExists(aspect) + assertFileDontExists(context) + assertFileDontExists(properties) + ] + } + + /** + * Creates and lauches a new run configuration for {@link project} + * using {@link mainClass} as the main Java class. + * + * @return the produced console output + */ + def String runMainClass(IProject project, String mainClass) { + val outputFileName = "output.txt" + val manager = DebugPlugin::getDefault.launchManager + val type = manager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants::ID_JAVA_APPLICATION) + val newLaunchConfig = type.newInstance(project, "RunMainTransfo") + newLaunchConfig.setAttribute(IJavaLaunchConfigurationConstants::ATTR_PROJECT_NAME, project.name) + newLaunchConfig.setAttribute(IJavaLaunchConfigurationConstants::ATTR_MAIN_TYPE_NAME, mainClass) + newLaunchConfig.setAttribute(IDebugUIConstants::ATTR_CAPTURE_IN_FILE, '''${workspace_loc:/«project.name»/«outputFileName»}''') + newLaunchConfig.doSave + + val outputFile = project.getFile(outputFileName) + if (!outputFile.exists) + outputFile.create(new ByteArrayInputStream("".bytes), true, null) + + val launch = newLaunchConfig.launch(ILaunchManager::RUN_MODE, null) + + val long TIMEOUT = 1000 * 60 * 5 // 5 minutes + val long startTime = System.currentTimeMillis(); + while (!launch.isTerminated && System.currentTimeMillis() < (startTime + TIMEOUT)) { + try { + Thread.sleep(50); + } catch (InterruptedException e) { + } + } + + outputFile.refreshLocal(IResource::DEPTH_ONE, null) + + return CharStreams::toString(CharStreams::newReaderSupplier([outputFile.contents], Charsets::UTF_8)) + } + + /** + * Returns the EPackage for generated model type {@link mtName} + * in {@link project} + */ + def EPackage getMT(IProject project, String mtName) { + val rs = new ResourceSetImpl + val res = rs.getResource(URI::createURI('''platform:/resource/«project.name»/model-gen/«mtName».ecore'''), true) + + return res.contents.head as EPackage + } + + def void assertMatch(EPackage pkg, String refEcore) { + val rs = new ResourceSetImpl + val uri = URI::createURI(refEcore) + val res = rs.getResource(uri, true) + val ref = res.contents.head as EPackage + + val scope = new DefaultComparisonScope(pkg, ref, null) + // We don't want to take order into account + // We don't want to take eAnnotations (especially "aspect") into account + val comparison = EMFCompare.builder().setDiffEngine( + new DefaultDiffEngine() { + override def FeatureFilter createFeatureFilter() { + return new FeatureFilter() { + override boolean isIgnoredReference(Match match, EReference ref) { + return ref == EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS + || super.isIgnoredReference(match, ref) + } + + override boolean checkForOrderingChanges(EStructuralFeature f) { + return false + } + } + } + } + ).build.compare(scope) + + if (!comparison.differences.empty) + Assert::fail(comparison.differences.join(", ")) + + Assert::assertTrue(comparison.differences.empty) + } + + /* + * Assert node contains at least pkg + */ + def void assertMatch(EPackage pkg, IOutlineNode node){ + + Assert.assertEquals(pkg.name, node.text.toString) + + val subPack = pkg.ESubpackages + val classes = pkg.EClassifiers + val subNodes = node.children + + subPack.forEach[p | + val n = subNodes.findFirst[text.toString == p.name] + Assert.assertNotNull(n) + assertMatch(p,n) + ] + + classes.forEach[c | + val n = subNodes.findFirst[text.toString == c.name] + Assert.assertNotNull(n) + if(c instanceof EClass){ + assertMatch(c,n) + } + ] + } + + def void assertMatch(EClass cls, IOutlineNode node){ + + Assert.assertEquals(cls.name, node.text.toString) + + val ref = cls.EAllReferences + val att = cls.EAllAttributes + val op = cls.EAllOperations + val subNodes = node.children + + ref.forEach[r | + val n = subNodes.findFirst[text.toString == (r.name +" : "+ r.EType.name)] + Assert.assertNotNull(n) + ] + + att.forEach[a | + val n = subNodes.findFirst[text.toString == a.name +" : "+ a.EType.name] + Assert.assertNotNull(n) + ] + + op.forEach[o | + val n = subNodes.findFirst[text.toString == o.name +" : "+ o.EType.name] + Assert.assertNotNull(n) + ] + } + + def void assertMatch(String refEcore, IOutlineNode node){ + val rs = new ResourceSetImpl + val uri = URI::createURI(refEcore) + val res = rs.getResource(uri, true) + val ref = res.contents.head as EPackage + assertMatch(ref,node) + } + + def ModelTypingSpace getResource(String projectName, String melangeFile){ + val melangeProject = getProject(projectName) + val rs = rsProvider.get(melangeProject) + val uri = URI::createPlatformResourceURI(melangeFile, true) + val res = rs.getResource(uri, true) as DerivedStateAwareResource + res.installDerivedState(false) + return res.contents.head as ModelTypingSpace + } + + def void debug(){ + ResourcesPlugin::workspace.root.projects.forEach[project | + println("Error markers: " + project.name) + project.findMarkers(IMarker::PROBLEM, true, IResource::DEPTH_INFINITE).forEach[ marker | + println(" Resource: " + marker.resource.name) + println(" Location: " + marker.getAttribute(IMarker::LOCATION)) + println(" Message: " + marker.getAttribute(IMarker::MESSAGE) + "\n") + ] + + println("\n") + + println("Classpath: " + project.name) + val jProject = JavaCore.create(project) + val cp = new StringBuffer + jProject.getResolvedClasspath(false).forEach[entry| + cp.append(" "+entry.path.toString+"\n") + ] + val str = cp.toString + println(str) + ] + } + + /** + * Sets a target platform in the test platform to get workspace builds OK + * with PDE + * + * @throws Exception + */ + def void setTargetPlatform() throws Exception { + val ITargetPlatformService tpService = TargetPlatformService.getDefault(); + val ITargetDefinition targetDef = tpService.newTarget(); + targetDef.setName("Tycho platform"); + val Bundle[] bundles = Platform.getBundle("org.eclipse.core.runtime").getBundleContext().getBundles(); + val List bundleContainers = new ArrayList(); + val Set dirs = new HashSet(); + for (Bundle bundle : bundles) { + val EquinoxBundle bundleImpl = bundle as EquinoxBundle; + val Generation generation = bundleImpl.getModule().getCurrentRevision().getRevisionInfo() as Generation; + val File file = generation.getBundleFile().getBaseFile(); + val File folder = file.getParentFile(); + if (!dirs.contains(folder)) { + dirs.add(folder); + bundleContainers.add(tpService.newDirectoryLocation(folder.getAbsolutePath())); + } + } + val ITargetLocation[] bundleContainersArray = bundleContainers + targetDef.setTargetLocations(bundleContainersArray); + targetDef.setArch(Platform.getOSArch()); + targetDef.setOS(Platform.getOS()); + targetDef.setWS(Platform.getWS()); + targetDef.setNL(Platform.getNL()); + // targetDef.setJREContainer() + tpService.saveTargetDefinition(targetDef); + + val Job job = new LoadTargetDefinitionJob(targetDef); + job.schedule(); + job.join(); + } + + def ClassLoader createClassLoader(IJavaProject project) { + val classPathEntries = JavaRuntime.computeDefaultRuntimeClassPath(project); + val urlList = new ArrayList(); + for (var i = 0; i < classPathEntries.length; i++) { + val entry = classPathEntries.get(i); + val path = new Path(entry); + val url = path.toFile().toURI().toURL(); + urlList.add(url); + } + val parentClassLoader = project.getClass().getClassLoader(); + return new URLClassLoader(urlList, parentClassLoader); + } +} diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/.gitignore b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/.gitignore new file mode 100644 index 000000000..133694d08 --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/.gitignore @@ -0,0 +1,5 @@ +# ignore all +* +# but .gitignore and readme +!.gitignore +!readme.md diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/readme.md b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/readme.md new file mode 100644 index 000000000..b6190e792 --- /dev/null +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/readme.md @@ -0,0 +1,9 @@ +This folder contains the tests inputs that'll be used be the tests. +It is generated from other locations using a maven script. + +Use the following command to generate it (and synchronize its content with the real sources) +''' +mvn generate-sources +''' + +Please note that the mvn command supposes that some git repositories exists next to the current one. In particular, it expects a repository "gemoc-studio" diff --git a/pom.xml b/pom.xml index fe811a924..dadef4585 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,21 @@ + + + + maven-clean-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + + From e04c4675ebf13531733e8a4cc6b910a2789b4974 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Wed, 17 May 2017 16:31:43 +0200 Subject: [PATCH 192/267] enable tests from pom.xml --- .travis.yml | 4 ++ .../build.properties | 3 +- .../pom.xml | 59 +++++++++++++++++-- .../eclipse/shared/WorkspaceTestHelper.xtend | 20 +++++-- java_execution/pom.xml | 3 + pom.xml | 3 + 6 files changed, 83 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bc78d279..3d62c85fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,10 @@ cache: before_install: echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc install: - travis_retry mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository +before_script: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" + - sleep 3 # give xvfb some time to start script: # Build update-site - travis_retry mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository clean verify diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/build.properties b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/build.properties index 34d2e4d2d..d8e2f0e92 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/build.properties +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + xtend-gen/ output.. = bin/ bin.includes = META-INF/,\ . diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml index 8b7954750..9ceeaefea 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml @@ -48,7 +48,7 @@ run - + @@ -85,13 +85,64 @@ - - + - + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + + eclipse-feature + org.eclipse.e4.rcp + 1.0.0 + + + eclipse-feature + org.eclipse.sdk + 1.0.0 + + + + eclipse-feature + fr.obeo.dsl.debug.feature + 1.0.0 + + + eclipse-feature + org.gemoc.execution.sequential.javaengine.ui.feature + 1.0.0 + + + eclipse-feature + org.gemoc.modeldebugging.xdsmlframework.feature + 1.0.0 + + + eclipse-feature + org.gemoc.modeldebugging.trace.generator.feature + 1.0.0 + + + eclipse-feature + org.gemoc.modeldebugging.trace.manager.feature + 1.0.0 + + + eclipse-feature + org.gemoc.modeldebugging.framework.commons.feature + 1.0.0 + + + + + maven-clean-plugin diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend index e4f9e8e89..a188a5204 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend @@ -79,6 +79,7 @@ import fr.inria.diverse.trace.gemoc.generator.TraceAddonGeneratorIntegration import org.eclipse.core.resources.IFile import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.core.runtime.Status +import com.google.common.io.ByteStreams class WorkspaceTestHelper { static final String MELANGE_CMD_GENERATE_ALL = "fr.inria.diverse.melange.GenerateAll" @@ -179,12 +180,17 @@ class WorkspaceTestHelper { def void generateTrace(String melangeFile, String languageName, String targetProjectName) { //invokeMelangeCommand(MELANGE_CMD_GENERATE_TRACE, melangeFile) val mlgFile = ResourcesPlugin::workspace.root.getFile(new Path(melangeFile)) - val Job j = new Job("Generating trace addon plugin for " + melangeFile.toString) { + + val j = new Job("Generating trace addon plugin for " + melangeFile.toString) { + public Exception reportedJobException override protected run(IProgressMonitor monitor) { - + try{ TraceAddonGeneratorIntegration.generateAddon(mlgFile, languageName, targetProjectName, true, monitor) - + } + catch (Exception e){ + this.reportedJobException = e + } return new Status(Status.OK, "fr.inria.diverse.trace.gemoc.ui", "Multidimensional Trace addon plugin generated.") } @@ -192,6 +198,7 @@ class WorkspaceTestHelper { // And we start the job and wait j.schedule j.join + if (j.reportedJobException != null) throw j.reportedJobException } def void cleanAll(String melangeFile) { @@ -399,7 +406,12 @@ class WorkspaceTestHelper { outputFile.refreshLocal(IResource::DEPTH_ONE, null) - return CharStreams::toString(CharStreams::newReaderSupplier([outputFile.contents], Charsets::UTF_8)) + val bi = outputFile.contents + + val byte[] buffer = newByteArrayOfSize(bi.available() ) + /*val int bytesRead =*/ bi.read(buffer); + val String out = new String(buffer); + return out } /** diff --git a/java_execution/pom.xml b/java_execution/pom.xml index 8ccc2ff9c..50571db4d 100644 --- a/java_execution/pom.xml +++ b/java_execution/pom.xml @@ -24,6 +24,9 @@ releng/org.gemoc.execution.sequential.javaxdsml.feature releng/org.gemoc.execution.sequential.javaengine.feature releng/org.gemoc.execution.sequential.javaengine.ui.feature + + + java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests diff --git a/pom.xml b/pom.xml index dadef4585..1659113ba 100644 --- a/pom.xml +++ b/pom.xml @@ -255,6 +255,9 @@ compile + xtend-install-debug-info + testCompile + xtend-test-install-debug-info xtend-gen From 3461650f8b8cd6cc24f811093ef2c6d665ba0b94 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 18 May 2017 10:51:20 +0200 Subject: [PATCH 193/267] add a git clone of gemoc-studio repository in travis.yml This should enables tests using its contents --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3d62c85fa..4b0b2741e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,9 @@ jdk: cache: directories: - $HOME/.m2 -before_install: echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc +before_install: + - echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc + - git clone https://github.com/gemoc/gemoc-studio.git ~/builds/gemoc-studio install: - travis_retry mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository before_script: @@ -19,6 +21,7 @@ before_script: - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start script: +- # Build update-site - travis_retry mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository clean verify # Rename the zipped update site to nightly From 280041afe91030c316f4d34c445bc1956c1f3432 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 18 May 2017 11:18:05 +0200 Subject: [PATCH 194/267] fix gemoc-studio git clone target location --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4b0b2741e..dcf0c68c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ cache: - $HOME/.m2 before_install: - echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc - - git clone https://github.com/gemoc/gemoc-studio.git ~/builds/gemoc-studio + - git clone https://github.com/gemoc/gemoc-studio.git ${TRAVIS_BUILD_DIR}/../gemoc-studio install: - travis_retry mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository before_script: From 0d970389bb6e456ed9beef71443af123f3a7f4af Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 18 May 2017 11:56:34 +0200 Subject: [PATCH 195/267] removing mvn install from travis install: phase this seems redundant with the mvn clean verify command in the script: phase --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcf0c68c6..7994122cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,6 @@ cache: before_install: - echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc - git clone https://github.com/gemoc/gemoc-studio.git ${TRAVIS_BUILD_DIR}/../gemoc-studio -install: -- travis_retry mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository before_script: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" From e05085a6ce409c59cfed86800b60bc11f676c415 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 18 May 2017 17:10:21 +0200 Subject: [PATCH 196/267] added a lib for helping language workbench tests --- framework/xdsml_framework/pom.xml | 1 + .../feature.xml | 7 ++++ .../.classpath | 8 +++++ .../.project | 34 +++++++++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 7 ++++ .../META-INF/MANIFEST.MF | 22 ++++++++++++ .../build.properties | 5 +++ .../org.gemoc.xdsmlframework.test.lib/pom.xml | 16 +++++++++ .../test/lib/MelangeUiInjectorProvider.java | 24 +++++++++++++ .../test/lib}/WorkspaceTestHelper.xtend | 32 ++++++++++++----- .../META-INF/MANIFEST.MF | 3 +- .../javaxdsml/tests/SequentialFsmTest.xtend | 14 ++++++-- .../shared/MelangeUiInjectorProvider.java | 15 -------- 13 files changed, 161 insertions(+), 27 deletions(-) create mode 100644 framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.classpath create mode 100644 framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.project create mode 100644 framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.settings/org.eclipse.jdt.core.prefs create mode 100644 framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF create mode 100644 framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/build.properties create mode 100644 framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/pom.xml create mode 100644 framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java rename {java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared => framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib}/WorkspaceTestHelper.xtend (96%) delete mode 100644 java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/MelangeUiInjectorProvider.java diff --git a/framework/xdsml_framework/pom.xml b/framework/xdsml_framework/pom.xml index 82dbf564e..c6387fafa 100644 --- a/framework/xdsml_framework/pom.xml +++ b/framework/xdsml_framework/pom.xml @@ -16,6 +16,7 @@ plugins/org.gemoc.xdsmlframework.ui.utils plugins/org.gemoc.xdsmlframework.ide.ui plugins/org.gemoc.xdsmlframework.extensions.sirius + tests/org.gemoc.xdsmlframework.test.lib releng/org.gemoc.modeldebugging.xdsmlframework.feature diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml index f37f2fc1b..f63924aad 100644 --- a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml +++ b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml @@ -37,5 +37,12 @@ install-size="0" version="0.0.0" unpack="false"/> + + diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.classpath b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.classpath new file mode 100644 index 000000000..428337e56 --- /dev/null +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.project b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.project new file mode 100644 index 000000000..3c0f13688 --- /dev/null +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.project @@ -0,0 +1,34 @@ + + + org.gemoc.xdsmlframework.test.lib + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature + + diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.settings/org.eclipse.jdt.core.prefs b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF new file mode 100644 index 000000000..ebff5b66e --- /dev/null +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF @@ -0,0 +1,22 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: xdsmlframework Test library +Bundle-SymbolicName: org.gemoc.xdsmlframework.test.lib +Bundle-Version: 2.3.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.junit;bundle-version="4.12.0", + org.eclipse.xtext.junit4;bundle-version="2.10.0", + org.eclipse.xtext.xbase.lib;bundle-version="2.10.0", + fr.inria.diverse.melange.ui;bundle-version="0.2.0", + org.eclipse.debug.ui;bundle-version="3.11.202", + org.eclipse.emf.compare;bundle-version="3.3.1", + org.eclipse.jdt.core;bundle-version="3.12.3", + org.eclipse.ui.ide;bundle-version="3.12.3", + org.eclipse.jdt.launching;bundle-version="3.8.101", + org.eclipse.jdt.ui;bundle-version="3.12.2", + org.eclipse.xtext.ui;bundle-version="2.10.0", + fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", + org.eclipse.core.expressions;bundle-version="3.5.100", + fr.inria.diverse.trace.gemoc.generator;bundle-version="2.3.0", + fr.inria.diverse.trace.gemoc;bundle-version="2.3.0" +Export-Package: org.gemoc.xdsmlframework.test.lib diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/build.properties b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/build.properties new file mode 100644 index 000000000..d8e2f0e92 --- /dev/null +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/build.properties @@ -0,0 +1,5 @@ +source.. = src/,\ + xtend-gen/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/pom.xml b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/pom.xml new file mode 100644 index 000000000..9568e5286 --- /dev/null +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + + + ../.. + org.gemoc.modeldebugging.xdsmlframework + org.gemoc.modeldebugging.xdsmlframework.root + 2.3.0-SNAPSHOT + + + org.gemoc.xdsmlframework.test.lib + eclipse-plugin + + + diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java new file mode 100644 index 000000000..218af7c2d --- /dev/null +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2017 Inria. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package org.gemoc.xdsmlframework.test.lib; + +import org.eclipse.xtext.junit4.IInjectorProvider; + +import com.google.inject.Injector; + +public class MelangeUiInjectorProvider implements IInjectorProvider { + + @Override + public Injector getInjector() { + return fr.inria.diverse.melange.ui.internal.MelangeActivator.getInstance().getInjector("fr.inria.diverse.melange.Melange"); + } + +} diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend similarity index 96% rename from java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend rename to framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend index a188a5204..10d58efd6 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/WorkspaceTestHelper.xtend +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend @@ -1,4 +1,14 @@ -package org.gemoc.execution.sequential.javaxdsml.tests.eclipse.shared +/******************************************************************************* + * Copyright (c) 2017 Inria. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ +package org.gemoc.xdsmlframework.test.lib import com.google.common.base.Charsets import com.google.common.io.CharStreams @@ -81,6 +91,10 @@ import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.core.runtime.Status import com.google.common.io.ByteStreams + +/** + * Class containing helper methods for testing a workspace in a GEMOC Language workbench + */ class WorkspaceTestHelper { static final String MELANGE_CMD_GENERATE_ALL = "fr.inria.diverse.melange.GenerateAll" static final String MELANGE_CMD_GENERATE_ADAPTERS = "fr.inria.diverse.melange.GenerateAdapters" @@ -464,8 +478,8 @@ class WorkspaceTestHelper { Assert.assertEquals(pkg.name, node.text.toString) - val subPack = pkg.ESubpackages - val classes = pkg.EClassifiers + val subPack = pkg.getESubpackages + val classes = pkg.getEClassifiers val subNodes = node.children subPack.forEach[p | @@ -487,23 +501,23 @@ class WorkspaceTestHelper { Assert.assertEquals(cls.name, node.text.toString) - val ref = cls.EAllReferences - val att = cls.EAllAttributes - val op = cls.EAllOperations + val ref = cls.getEAllReferences + val att = cls.getEAllAttributes + val op = cls.getEAllOperations val subNodes = node.children ref.forEach[r | - val n = subNodes.findFirst[text.toString == (r.name +" : "+ r.EType.name)] + val n = subNodes.findFirst[text.toString == (r.name +" : "+ r.getEType.name)] Assert.assertNotNull(n) ] att.forEach[a | - val n = subNodes.findFirst[text.toString == a.name +" : "+ a.EType.name] + val n = subNodes.findFirst[text.toString == a.name +" : "+ a.getEType.name] Assert.assertNotNull(n) ] op.forEach[o | - val n = subNodes.findFirst[text.toString == o.name +" : "+ o.EType.name] + val n = subNodes.findFirst[text.toString == o.name +" : "+ o.getEType.name] Assert.assertNotNull(n) ] } diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF index 21cca94f1..98031ffc2 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF @@ -19,4 +19,5 @@ Require-Bundle: org.gemoc.execution.sequential.javaxdsml.ide.ui;bundle-version=" fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", org.eclipse.core.expressions;bundle-version="3.5.100", fr.inria.diverse.trace.gemoc.generator;bundle-version="2.3.0", - fr.inria.diverse.trace.gemoc;bundle-version="2.3.0" + fr.inria.diverse.trace.gemoc;bundle-version="2.3.0", + org.gemoc.xdsmlframework.test.lib;bundle-version="2.3.0" diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend index 8331b7d71..72b459a98 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2017 Inria. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Inria - initial API and implementation + *******************************************************************************/ package org.gemoc.execution.sequential.javaxdsml.tests import com.google.inject.Inject @@ -6,14 +16,14 @@ import org.eclipse.xtext.junit4.AbstractXtextTests import org.eclipse.xtext.junit4.InjectWith import org.eclipse.xtext.junit4.XtextRunner import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil -import org.gemoc.execution.sequential.javaxdsml.tests.eclipse.shared.MelangeUiInjectorProvider -import org.gemoc.execution.sequential.javaxdsml.tests.eclipse.shared.WorkspaceTestHelper import org.junit.After import org.junit.Before import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters +import org.gemoc.xdsmlframework.test.lib.WorkspaceTestHelper +import org.gemoc.xdsmlframework.test.lib.MelangeUiInjectorProvider @RunWith(XtextRunner) @InjectWith(MelangeUiInjectorProvider) diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/MelangeUiInjectorProvider.java b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/MelangeUiInjectorProvider.java deleted file mode 100644 index dc225b768..000000000 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/eclipse/shared/MelangeUiInjectorProvider.java +++ /dev/null @@ -1,15 +0,0 @@ - -package org.gemoc.execution.sequential.javaxdsml.tests.eclipse.shared; - -import org.eclipse.xtext.junit4.IInjectorProvider; - -import com.google.inject.Injector; - -public class MelangeUiInjectorProvider implements IInjectorProvider { - - @Override - public Injector getInjector() { - return fr.inria.diverse.melange.ui.internal.MelangeActivator.getInstance().getInjector("fr.inria.diverse.melange.Melange"); - } - -} From 1dabf8298fb27dab02d945f4c56baf09e830cb99 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 18 May 2017 18:07:48 +0200 Subject: [PATCH 197/267] really optimize travis build travis automatically add a mvn install call in the install: phase makes sure to not do that, everything is done in the script: phase --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7994122cc..0e1acec06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ cache: before_install: - echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc - git clone https://github.com/gemoc/gemoc-studio.git ${TRAVIS_BUILD_DIR}/../gemoc-studio +install: +- before_script: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" @@ -21,7 +23,7 @@ before_script: script: - # Build update-site -- travis_retry mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository clean verify +- travis_retry mvn -P use_CI_repositories,modelanimation,trace_and_framework,java_execution,repository verify # Rename the zipped update site to nightly - mv releng/org.gemoc.siriusanimation.repository/target/org.gemoc.siriusanimation.repository-*-SNAPSHOT.zip releng/org.gemoc.siriusanimation.repository/target/org.gemoc.siriusanimation.repository-nightly.zip From a797a7a739666a860582dabbee6fb277a6b10a16 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Tue, 6 Jun 2017 19:34:28 +0200 Subject: [PATCH 198/267] trying to force a sonar.projectKey --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 1659113ba..6a43d62f2 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ 2.10.0 UTF8 scm:git:https://github.com/SiriusLab/ModelDebugging.git + gemoc:modeldebugging From 6e5d24ce64d156533cf91f36dbea211f57c03149 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Wed, 7 Jun 2017 07:21:44 +0200 Subject: [PATCH 199/267] test of a sonar root pom.xml to enforce sonar.projectKey --- pom.xml | 2 +- releng/gemoc.sonar/pom.xml | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 releng/gemoc.sonar/pom.xml diff --git a/pom.xml b/pom.xml index 6a43d62f2..37ffda9fc 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.10.0 UTF8 scm:git:https://github.com/SiriusLab/ModelDebugging.git - gemoc:modeldebugging + gemoc:${project.groupId}:${project.artifactId} diff --git a/releng/gemoc.sonar/pom.xml b/releng/gemoc.sonar/pom.xml new file mode 100644 index 000000000..ad650e630 --- /dev/null +++ b/releng/gemoc.sonar/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + gemoc + gemoc + pom + + ../../pom.xml + + GEMOC ModelDebugging + From acc734605ea0a973e9cd00723ce6cf197e06d59e Mon Sep 17 00:00:00 2001 From: dvojtise Date: Wed, 7 Jun 2017 09:33:32 +0200 Subject: [PATCH 200/267] removes sonar.projectKey and use only root pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37ffda9fc..cfb8efd1a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.10.0 UTF8 scm:git:https://github.com/SiriusLab/ModelDebugging.git - gemoc:${project.groupId}:${project.artifactId} + From 0bb13cd3099f6a70372ef59044c1d962e517d9e4 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Wed, 7 Jun 2017 11:25:12 +0200 Subject: [PATCH 201/267] fix sonar pom projectname --- releng/gemoc.sonar/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/gemoc.sonar/pom.xml b/releng/gemoc.sonar/pom.xml index ad650e630..3858e92c8 100644 --- a/releng/gemoc.sonar/pom.xml +++ b/releng/gemoc.sonar/pom.xml @@ -9,5 +9,5 @@ ../../pom.xml - GEMOC ModelDebugging + GEMOC ModelDebugging From 1cf53713268df55379ef5e2c5e893cb7a5ad92a0 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Wed, 7 Jun 2017 11:30:22 +0200 Subject: [PATCH 202/267] forgot version :-( --- releng/gemoc.sonar/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/releng/gemoc.sonar/pom.xml b/releng/gemoc.sonar/pom.xml index 3858e92c8..d5018e5d8 100644 --- a/releng/gemoc.sonar/pom.xml +++ b/releng/gemoc.sonar/pom.xml @@ -10,4 +10,5 @@ ../../pom.xml GEMOC ModelDebugging + 2.3.0-SNAPSHOT From 357004621365c1df0e6fd65b529669c08b3c4fad Mon Sep 17 00:00:00 2001 From: dvojtise Date: Wed, 7 Jun 2017 12:32:06 +0200 Subject: [PATCH 203/267] close stream --- .../extensions/sirius/command/AddDebugLayerHandler.java | 4 +++- .../AddRemoveGemocSequentialLanguageNatureHandler.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java index a3dabac91..447467126 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java @@ -824,10 +824,12 @@ public static void setContent(File file, String charsetName, String content) throw new IOException(file.getAbsolutePath() + " is not writable."); } + FileOutputStream fos = new FileOutputStream(file); OutputStreamWriter output = new OutputStreamWriter( - new BufferedOutputStream(new FileOutputStream(file)), + new BufferedOutputStream(fos), charsetName); output.write(content.toString()); + fos.close(); output.close(); } diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java index 4712fca10..44292b946 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java @@ -220,6 +220,7 @@ private void addGemocResourcesToBuildProperties(IProject project){ //now work on the OutputStream e.g. properties.store(out, ""); + in.close(); out.close(); //now you have the OutputStream as InputStream From 4d39b0bee01908bd2c027628c454cb4c47449043 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Wed, 7 Jun 2017 12:32:06 +0200 Subject: [PATCH 204/267] close stream in finalize --- .../sirius/command/AddDebugLayerHandler.java | 21 ++++++++++++------- ...eGemocSequentialLanguageNatureHandler.java | 13 +++++++++--- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java index 447467126..8badbde38 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java @@ -816,6 +816,7 @@ public static String getContent(InputStream inputStream, String charsetName) */ public static void setContent(File file, String charsetName, String content) throws IOException { + if (!file.exists()) { throw new IOException(file.getAbsolutePath() + " doesn't exists."); } else if (file.isDirectory()) { @@ -824,13 +825,19 @@ public static void setContent(File file, String charsetName, String content) throw new IOException(file.getAbsolutePath() + " is not writable."); } - FileOutputStream fos = new FileOutputStream(file); - OutputStreamWriter output = new OutputStreamWriter( - new BufferedOutputStream(fos), - charsetName); - output.write(content.toString()); - fos.close(); - output.close(); + FileOutputStream fos = null; + try { + fos = new FileOutputStream(file); + OutputStreamWriter output = new OutputStreamWriter( + new BufferedOutputStream(fos), + charsetName); + output.write(content.toString()); + } finally{ + if(fos != null) { + fos.close(); + } + } + } } diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java index 44292b946..896e1e1e3 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java @@ -202,7 +202,7 @@ private void addMissingResourcesToNature(IProject project) { private void addGemocResourcesToBuildProperties(IProject project){ - + PipedInputStream in = null; try { Properties properties = new Properties(); InputStream inputStream = project.getFile("build.properties").getContents(); @@ -214,7 +214,7 @@ private void addGemocResourcesToBuildProperties(IProject project){ // } } //create an empty InputStream - PipedInputStream in = new PipedInputStream(); + in = new PipedInputStream(); //create an OutputStream with the InputStream from above as input PipedOutputStream out = new PipedOutputStream(in); @@ -231,8 +231,15 @@ private void addGemocResourcesToBuildProperties(IProject project){ Activator.error(e1.getMessage(), e1); } catch (IOException e) { Activator.error(e.getMessage(), e); + } finally { + if(in != null){ + try { + in.close(); + } catch (IOException e) { + Activator.error(e.getMessage(), e); + } + } } - } } \ No newline at end of file From 2c75c975ff83cd01f2f25ae34fc95a421ee983f6 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 9 Jun 2017 17:17:45 +0200 Subject: [PATCH 205/267] enabling jacoco code coverage for sonar --- pom.xml | 38 ++++++++++++++++++++++++++++++-- simulationmodelanimation/pom.xml | 2 +- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index cfb8efd1a..3a716b911 100644 --- a/pom.xml +++ b/pom.xml @@ -362,6 +362,40 @@ releng/org.gemoc.siriusanimation.repository/pom.xml + + + quality + + false + + + + jacoco + reuseReports + + ./target/jacoco.exec + + + + + org.jacoco + jacoco-maven-plugin + 0.5.6.201201232323 + + + + prepare-agent + + + true + ${sonar.jacoco.reportPath} + + + + + + + @@ -375,7 +409,7 @@ ${xtend.version} - + diff --git a/simulationmodelanimation/pom.xml b/simulationmodelanimation/pom.xml index e4cd7b35e..390ffa48f 100644 --- a/simulationmodelanimation/pom.xml +++ b/simulationmodelanimation/pom.xml @@ -189,7 +189,7 @@ jacoco reuseReports - ../../target/jacoco.exec + ../target/jacoco.exec From c317b30a0eb777b1ad77efc75efbf0ab33b1532e Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 9 Jun 2017 17:17:45 +0200 Subject: [PATCH 206/267] use gemoc commons messagingsystem --- .../META-INF/MANIFEST.MF | 2 +- .../org/gemoc/executionframework/debugger/Activator.java | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../engine/ui/launcher/AbstractSequentialGemocLauncher.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../src/org/gemoc/executionframework/engine/Activator.java | 4 ++-- .../META-INF/MANIFEST.MF | 6 +++--- .../gemoc/execution/sequential/javaengine/ui/Activator.java | 6 +++--- .../sequential/javaengine/ui/launcher/Launcher.java | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF index 6ff6914e4..3ca60f79b 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Require-Bundle: com.google.guava, org.gemoc.commons.eclipse;bundle-version="2.3.0", org.gemoc.commons.eclipse.pde;bundle-version="2.3.0", fr.inria.diverse.commons.eclipse;bundle-version="1.0.0", - fr.inria.diverse.commons.eclipse.messagingsystem.api;bundle-version="1.0.0" + org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0" Export-Package: org.gemoc.executionframework.debugger Bundle-ActivationPolicy: lazy diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java index 48b77af40..049a4913a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java @@ -17,8 +17,8 @@ import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.osgi.framework.BundleContext; -import fr.inria.diverse.commons.eclipse.messagingsystem.api.MessagingSystemManager; -import fr.inria.diverse.commons.messagingsystem.api.MessagingSystem; +import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystemManager; +import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystem; /** * The activator class controls the plug-in life cycle diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF index c055a2b97..5e55918e8 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.gemoc.xdsmlframework.api, org.eclipse.sirius;bundle-version="2.0.7", org.eclipse.xtext, org.gemoc.executionframework.extensions.sirius, - fr.inria.diverse.commons.eclipse.messagingsystem.api, + org.eclipse.gemoc.commons.eclipse.messagingsystem.api, fr.obeo.dsl.debug.ide.ui;bundle-version="1.0.0", fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", fr.obeo.dsl.debug, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java index 45d4d1cd3..fe6e6c892 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java @@ -42,7 +42,7 @@ import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import fr.inria.diverse.commons.messagingsystem.api.MessagingSystem; +import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystem; import fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; abstract public class AbstractSequentialGemocLauncher extends AbstractGemocLauncher { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF index 41969111a..89c8b080d 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.engine.Activator Require-Bundle: org.gemoc.xdsmlframework.api, org.gemoc.commons.eclipse, - fr.inria.diverse.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", + org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", org.gemoc.executionframework.reflectivetrace.model;visibility:=reexport, org.gemoc.commons.eclipse.pde;bundle-version="0.1.0", org.eclipse.xtend.lib, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java index ba4f3eb07..89b3a4757 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java @@ -15,8 +15,8 @@ import org.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; import org.osgi.framework.BundleContext; -import fr.inria.diverse.commons.eclipse.messagingsystem.api.MessagingSystemManager; -import fr.inria.diverse.commons.messagingsystem.api.MessagingSystem; +import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystemManager; +import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystem; /** * The activator class controls the plug-in life cycle diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index 8ea40bd53..5ade2699d 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -13,8 +13,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", org.eclipse.emf.transaction;bundle-version="1.4.0", org.gemoc.commons.eclipse, - fr.inria.diverse.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", - fr.inria.diverse.commons.eclipse.messagingsystem.ui;bundle-version="1.0.0", org.gemoc.commons.eclipse.ui;bundle-version="0.1.0", org.eclipse.sirius.diagram.ui;bundle-version="1.0.0", org.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", @@ -36,7 +34,9 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.xtend.lib, fr.inria.diverse.melange.resource, org.gemoc.executionframework.debugger, - org.gemoc.executionframework.debugger.ui + org.gemoc.executionframework.debugger.ui, + org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="2.3.0", + org.eclipse.gemoc.commons.eclipse.messagingsystem.ui;bundle-version="2.3.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/Activator.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/Activator.java index 18bf81d04..23007737c 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/Activator.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/Activator.java @@ -19,8 +19,8 @@ import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices; import org.osgi.framework.BundleContext; -import fr.inria.diverse.commons.eclipse.messagingsystem.api.MessagingSystemManager; -import fr.inria.diverse.commons.messagingsystem.api.MessagingSystem; +import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystemManager; +import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystem; /** * The activator class controls the plug-in life cycle @@ -56,7 +56,7 @@ public void start(BundleContext context) throws Exception { super.start(context); plugin = this; // start the messagin system ui plugin to load default settings. - fr.inria.diverse.commons.eclipse.messagingsystem.ui.Activator.getDefault(); + org.eclipse.gemoc.commons.eclipse.messagingsystem.ui.Activator.getDefault(); } /* diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java index 99a4411b1..b8c65d586 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java @@ -41,7 +41,7 @@ import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.gemoc.xdsmlframework.api.core.IRunConfiguration; -import fr.inria.diverse.commons.messagingsystem.api.MessagingSystem; +import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystem; import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; From e31600d29784465bea6d17c5a224d6ce07af6048 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 09:30:55 +0200 Subject: [PATCH 207/267] rename org.gemoc.commons.* into org.eclipse.gemoc.commons.* --- .../execution/sequential/javaengine/ui/launcher/Launcher.java | 2 +- .../javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java index b8c65d586..0821347aa 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject; import org.gemoc.executionframework.debugger.AnnotationMutableFieldExtractor; import org.gemoc.executionframework.debugger.IntrospectiveMutableFieldExtractor; -import org.gemoc.commons.eclipse.ui.ViewHelper; +import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; import org.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext; import org.gemoc.execution.sequential.javaengine.ui.Activator; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index 546b16248..c5c25316f 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -46,7 +46,7 @@ import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; import org.gemoc.commons.eclipse.emf.URIHelper; -import org.gemoc.commons.eclipse.ui.dialogs.SelectAnyIFileDialog; +import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectAnyIFileDialog; import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; import org.gemoc.execution.sequential.javaengine.ui.Activator; import org.gemoc.execution.sequential.javaengine.ui.launcher.LauncherMessages; From a43c887ee6b155f57168674cc37b39d8ea84360c Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 09:31:05 +0200 Subject: [PATCH 208/267] rename org.gemoc.commons.* into org.eclipse.gemoc.commons.* --- .../debugger/ui/OpenSemanticsHandler.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org/gemoc/executionframework/debugger/Activator.java | 2 +- .../engine/ui/launcher/AbstractGemocLauncher.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../src/org/gemoc/executionframework/engine/Activator.java | 2 +- .../ui/views/engine/EngineSelectionDependentViewPart.java | 2 +- .../ui/views/engine/EnginesStatusView.java | 2 +- .../engine/actions/DisposeAllStoppedEnginesAction.java | 2 +- .../ui/views/engine/actions/DisposeStoppedEngineAction.java | 2 +- .../ui/views/engine/actions/StopEngineAction.java | 2 +- .../wizards/CreateAnimatorProjectWizardContextAction.java | 2 +- .../xdsml/wizards/CreateDomainModelWizardContextAction.java | 2 +- .../wizards/CreateEditorProjectWizardContextAction.java | 2 +- .../ui/utils/dialogs/SelectAIRDIFileDialog.java | 2 +- .../ui/utils/dialogs/SelectEMFIProjectDialog.java | 2 +- .../ui/utils/dialogs/SelectODesignIProjectDialog.java | 2 +- .../ui/utils/dialogs/SelectXtextIProjectDialog.java | 2 +- .../META-INF/MANIFEST.MF | 3 ++- .../AddRemoveGemocSequentialLanguageNatureHandler.java | 6 +++--- .../ide/ui/builder/GemocSequentialLanguageBuilder.java | 2 +- .../javaxdsml/ide/ui/dialogs/SelectDSAIProjectDialog.java | 2 +- .../javaxdsml/ide/ui/editor/CreateDSAProposal.java | 6 +++--- .../javaxdsml/ide/ui/editor/CreateEcoreProposal.java | 4 ++-- .../javaxdsml/ide/ui/editor/SelectDsaProposal.java | 4 ++-- .../javaxdsml/ide/ui/editor/SelectEcoreProposal.java | 4 ++-- .../javaxdsml/ide/ui/templates/SequentialNewWizard.java | 4 ++-- .../javaxdsml/ide/ui/templates/SequentialTemplate.java | 6 +++--- .../ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java | 4 ++-- .../ide/ui/wizards/CreateDSAWizardContextBase.java | 2 +- .../ui/wizards/CreateNewGemocSequentialLanguageProject.java | 4 ++-- .../org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF | 2 +- 32 files changed, 45 insertions(+), 44 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java index 207c2c32a..ad77f7b1b 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java @@ -27,7 +27,7 @@ import org.eclipse.jface.viewers.TreePath; import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.ui.handlers.HandlerUtil; -import org.gemoc.commons.eclipse.ui.OpenEditor; +import org.eclipse.gemoc.commons.eclipse.ui.OpenEditor; import org.gemoc.executionframework.engine.core.AbstractExecutionEngine; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.osgi.framework.Bundle; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF index 3ca60f79b..002277138 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Require-Bundle: com.google.guava, org.gemoc.xdsmlframework.commons;bundle-version="2.3.0", org.eclipse.xtext;bundle-version="2.10.0", org.gemoc.commons.eclipse;bundle-version="2.3.0", - org.gemoc.commons.eclipse.pde;bundle-version="2.3.0", + org.eclipse.gemoc.commons.eclipse.pde;bundle-version="2.3.0", fr.inria.diverse.commons.eclipse;bundle-version="1.0.0", org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0" Export-Package: org.gemoc.executionframework.debugger diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java index 049a4913a..8b56033db 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java @@ -13,7 +13,7 @@ import java.util.function.Supplier; import org.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend; -import org.gemoc.commons.eclipse.pde.GemocPlugin; +import org.eclipse.gemoc.commons.eclipse.pde.GemocPlugin; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.osgi.framework.BundleContext; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java index 71823b528..24b6b1550 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.Map; -import org.gemoc.commons.eclipse.ui.ViewHelper; +import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; import org.gemoc.xdsmlframework.api.core.IRunConfiguration; import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF index 89c8b080d..b921fb48f 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: org.gemoc.xdsmlframework.api, org.gemoc.commons.eclipse, org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", org.gemoc.executionframework.reflectivetrace.model;visibility:=reexport, - org.gemoc.commons.eclipse.pde;bundle-version="0.1.0", + org.eclipse.gemoc.commons.eclipse.pde;bundle-version="0.1.0", org.eclipse.xtend.lib, org.eclipse.emf.transaction;bundle-version="1.8.0", fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java index 89b3a4757..6eef9fa7d 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java @@ -11,7 +11,7 @@ package org.gemoc.executionframework.engine; import org.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend; -import org.gemoc.commons.eclipse.pde.GemocPlugin; +import org.eclipse.gemoc.commons.eclipse.pde.GemocPlugin; import org.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; import org.osgi.framework.BundleContext; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java index 81674bd27..0c577dc38 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java @@ -13,7 +13,7 @@ import org.eclipse.ui.IViewSite; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.ViewPart; -import org.gemoc.commons.eclipse.ui.ViewHelper; +import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; import org.gemoc.executionframework.ui.Activator; /** diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java index d3533040a..567b1845d 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java @@ -36,7 +36,7 @@ import org.eclipse.ui.IActionBars; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; -import org.gemoc.commons.eclipse.ui.TreeViewerHelper; +import org.eclipse.gemoc.commons.eclipse.ui.TreeViewerHelper; import org.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; import org.gemoc.executionframework.engine.core.IEngineRegistrationListener; import org.gemoc.executionframework.ui.Activator; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java index e868f0f55..2e59e5ad1 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java @@ -13,7 +13,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.ISharedImages; -import org.gemoc.commons.eclipse.ui.ViewHelper; +import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; import org.gemoc.executionframework.ui.Activator; import org.gemoc.executionframework.ui.views.engine.EnginesStatusView; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java index f91727b2f..458ba79f6 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java @@ -12,7 +12,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.ISharedImages; -import org.gemoc.commons.eclipse.ui.ViewHelper; +import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; import org.gemoc.executionframework.ui.Activator; import org.gemoc.executionframework.ui.views.engine.EnginesStatusView; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java index 80b8a47cc..a00fb95bc 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java @@ -12,7 +12,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.ISharedImages; -import org.gemoc.commons.eclipse.ui.ViewHelper; +import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; import org.gemoc.executionframework.ui.Activator; import org.gemoc.executionframework.ui.views.engine.EnginesStatusView; import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java index 98f9113c9..b1c7eee86 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java @@ -19,7 +19,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.wizards.IWizardDescriptor; import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; -import org.gemoc.commons.eclipse.ui.WizardFinder; +import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; import org.gemoc.xdsmlframework.ide.ui.Activator; diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java index 8b14a7ff9..1d58eff00 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java @@ -22,7 +22,7 @@ import org.eclipse.ui.wizards.IWizardDescriptor; import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; -import org.gemoc.commons.eclipse.ui.WizardFinder; +import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.xdsmlframework.ide.ui.Activator; import org.gemoc.xdsmlframework.ui.utils.dialogs.SelectEMFIProjectDialog; diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java index 0004cb43a..2474831d0 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java @@ -27,7 +27,7 @@ import org.eclipse.ui.wizards.IWizardDescriptor; import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; -import org.gemoc.commons.eclipse.ui.WizardFinder; +import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocSiriusProjectWizard; import org.gemoc.xdsmlframework.ide.ui.Activator; diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java index 66175888a..f58229c1c 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java @@ -11,7 +11,7 @@ package org.gemoc.xdsmlframework.ui.utils.dialogs; import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; -import org.gemoc.commons.eclipse.ui.dialogs.SelectSpecificFileDialog; +import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectSpecificFileDialog; diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java index 24c916d3d..3411e0a63 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java @@ -14,7 +14,7 @@ import java.util.Arrays; import org.eclipse.swt.widgets.Shell; -import org.gemoc.commons.eclipse.ui.dialogs.SelectPluginIProjectWithFileExtensionDialog; +import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectPluginIProjectWithFileExtensionDialog; /** * Dialog that allow to select an IProject that can be used as an EMF project diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java index e9d05bb08..1c04754bb 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java @@ -12,7 +12,7 @@ import org.eclipse.swt.widgets.Shell; -import org.gemoc.commons.eclipse.ui.dialogs.SelectPluginIProjectWithFileExtensionDialog; +import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectPluginIProjectWithFileExtensionDialog; /** * Dialog that allow to select an IProject that can be used as a Sirius Viewpoint specification project diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java index 965969ea6..2c5efa245 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java @@ -12,7 +12,7 @@ import org.eclipse.swt.widgets.Shell; -import org.gemoc.commons.eclipse.ui.dialogs.SelectPluginIProjectWithFileExtensionDialog; +import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectPluginIProjectWithFileExtensionDialog; /** * Dialog that allow to select an IProject that can be used as an Xtext project diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF index 01f60988c..bd507b838 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF @@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.xtext, org.eclipse.xtext.ui, org.gemoc.xdsmlframework.ui.utils, - org.eclipse.emf.ecoretools.design.ui + org.eclipse.emf.ecoretools.design.ui, + org.eclipse.gemoc.commons.eclipse.pde Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java index 896e1e1e3..a706687ab 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java @@ -33,13 +33,13 @@ import org.eclipse.ui.handlers.HandlerUtil; import org.gemoc.commons.eclipse.core.resources.NatureToggling; import org.gemoc.commons.eclipse.core.resources.Project; -import org.gemoc.commons.eclipse.pde.JavaProject; -import org.gemoc.commons.eclipse.pde.ui.PluginConverter; +import org.gemoc.commons.eclipse.jdt.JavaProject; +import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; +import org.eclipse.gemoc.commons.eclipse.pde.ui.PluginConverter; import org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator; import org.gemoc.xdsmlframework.ide.ui.builder.pde.PluginXMLHelper; import org.osgi.framework.BundleException; -import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; public class AddRemoveGemocSequentialLanguageNatureHandler extends AbstractHandler { diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java index 08e92de01..285c171cb 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java @@ -26,13 +26,13 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; import org.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtensionPoint; import org.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtensionPoint; import org.gemoc.xdsmlframework.ide.ui.builder.pde.PluginXMLHelper; import org.jdom2.Element; import org.osgi.framework.BundleException; -import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; import fr.inria.diverse.melange.metamodel.melange.Language; import fr.inria.diverse.melange.metamodel.melange.ModelTypingSpace; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/dialogs/SelectDSAIProjectDialog.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/dialogs/SelectDSAIProjectDialog.java index 5049a8e3c..41510b3cf 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/dialogs/SelectDSAIProjectDialog.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/dialogs/SelectDSAIProjectDialog.java @@ -13,7 +13,7 @@ import java.util.Arrays; import org.eclipse.swt.widgets.Shell; -import org.gemoc.commons.eclipse.ui.dialogs.SelectPluginIProjectWithFileExtensionDialog; +import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectPluginIProjectWithFileExtensionDialog; public class SelectDSAIProjectDialog extends SelectPluginIProjectWithFileExtensionDialog { diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java index d0f412882..9ba750bec 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java @@ -33,13 +33,13 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.wizards.IWizardDescriptor; import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; -import org.gemoc.commons.eclipse.ui.WizardFinder; +import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; +import org.eclipse.gemoc.commons.eclipse.pde.wizards.pages.pde.TemplateListSelectionPage; +import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator; import org.gemoc.execution.sequential.javaxdsml.ide.ui.templates.SequentialTemplate; import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper; -import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; -import fr.inria.diverse.commons.eclipse.pde.wizards.pages.pde.TemplateListSelectionPage; import fr.inria.diverse.k3.ui.wizards.NewK3ProjectWizard; import fr.inria.diverse.k3.ui.wizards.pages.NewK3ProjectWizardFields.KindsOfProject; import fr.inria.diverse.melange.metamodel.melange.Language; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java index 495d40149..95c3de77b 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java @@ -22,10 +22,10 @@ import org.eclipse.ui.wizards.IWizardDescriptor; import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; -import org.gemoc.commons.eclipse.ui.WizardFinder; +import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; +import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.xdsmlframework.ide.ui.Activator; -import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; import fr.inria.diverse.melange.metamodel.melange.Language; import fr.inria.diverse.melange.metamodel.melange.ModelTypingSpace; import fr.inria.diverse.melange.ui.contentassist.IProposal; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectDsaProposal.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectDsaProposal.java index 278400c34..6d39990d0 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectDsaProposal.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectDsaProposal.java @@ -16,10 +16,10 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.ui.PlatformUI; -import org.gemoc.commons.eclipse.ui.dialogs.SelectAnyIProjectDialog; +import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; +import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectAnyIProjectDialog; import org.gemoc.execution.sequential.javaxdsml.ide.ui.templates.SequentialTemplate; -import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; import fr.inria.diverse.melange.ui.contentassist.IProposal; public class SelectDsaProposal implements IProposal{ diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java index d63780748..2c9918e7b 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java @@ -16,9 +16,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.dialogs.Dialog; import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; -import org.gemoc.commons.eclipse.ui.dialogs.SelectSpecificFileDialog; +import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; +import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectSpecificFileDialog; -import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; import fr.inria.diverse.melange.ui.contentassist.IProposal; public class SelectEcoreProposal implements IProposal{ diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialNewWizard.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialNewWizard.java index b636ff517..0b18ccf80 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialNewWizard.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialNewWizard.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.gemoc.execution.sequential.javaxdsml.ide.ui.templates; +import org.eclipse.gemoc.commons.eclipse.pde.wizards.pages.pde.ui.BaseProjectWizardFields; +import org.eclipse.gemoc.commons.eclipse.pde.wizards.pages.pde.ui.templates.ITemplateSection; import org.eclipse.xtext.util.Strings; -import fr.inria.diverse.commons.eclipse.pde.wizards.pages.pde.ui.BaseProjectWizardFields; -import fr.inria.diverse.commons.eclipse.pde.wizards.pages.pde.ui.templates.ITemplateSection; import fr.inria.diverse.melange.ui.templates.melange.SimpleMTNewWizard; public class SequentialNewWizard extends SimpleMTNewWizard{ diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java index 67ca2c468..2a99c928f 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java @@ -29,9 +29,9 @@ import org.gemoc.execution.sequential.javaxdsml.ide.ui.dialogs.SelectDSAIProjectDialog; import org.osgi.framework.BundleException; -import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; -import fr.inria.diverse.commons.eclipse.pde.wizards.pages.pde.ui.templates.AbstractStringWithButtonOption; -import fr.inria.diverse.commons.eclipse.pde.wizards.pages.pde.ui.templates.TemplateOption; +import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; +import org.eclipse.gemoc.commons.eclipse.pde.wizards.pages.pde.ui.templates.AbstractStringWithButtonOption; +import org.eclipse.gemoc.commons.eclipse.pde.wizards.pages.pde.ui.templates.TemplateOption; import fr.inria.diverse.melange.ui.templates.melange.SimpleMTTemplate; public class SequentialTemplate extends SimpleMTTemplate{ diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java index c6de3f74e..eada87e59 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java @@ -28,13 +28,13 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.wizards.IWizardDescriptor; import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; -import org.gemoc.commons.eclipse.ui.WizardFinder; +import org.eclipse.gemoc.commons.eclipse.pde.wizards.pages.pde.TemplateListSelectionPage; +import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator; import org.gemoc.executionframework.ui.xdsml.activefile.ActiveFile; import org.gemoc.executionframework.ui.xdsml.activefile.ActiveFileEcore; import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper; -import fr.inria.diverse.commons.eclipse.pde.wizards.pages.pde.TemplateListSelectionPage; import fr.inria.diverse.k3.ui.wizards.NewK3ProjectWizard; import fr.inria.diverse.k3.ui.wizards.pages.NewK3ProjectWizardFields.KindsOfProject; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextBase.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextBase.java index e75d1a00c..0f8174e72 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextBase.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextBase.java @@ -11,8 +11,8 @@ package org.gemoc.execution.sequential.javaxdsml.ide.ui.wizards; import org.eclipse.core.resources.IProject; +import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; -import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; public class CreateDSAWizardContextBase { diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java index 99cba3969..47fb876f7 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java @@ -16,8 +16,8 @@ import org.eclipse.swt.widgets.Composite; import org.gemoc.execution.sequential.javaxdsml.ide.ui.builder.AddRemoveGemocSequentialLanguageNatureHandler; -import fr.inria.diverse.commons.eclipse.pde.wizards.pages.pde.TemplateListSelectionPage; -import fr.inria.diverse.commons.eclipse.pde.wizards.pages.pde.WizardElement; +import org.eclipse.gemoc.commons.eclipse.pde.wizards.pages.pde.TemplateListSelectionPage; +import org.eclipse.gemoc.commons.eclipse.pde.wizards.pages.pde.WizardElement; import fr.inria.diverse.melange.ui.wizards.NewMelangeProjectWizard; import fr.inria.diverse.melange.ui.wizards.pages.NewMelangeProjectWizardPage; diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF index 5c8b79f06..cfe2853f8 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.xtend2.lib;bundle-version="2.4.3", org.eclipse.emf.transaction;bundle-version="1.8.0", org.eclipse.emf.ecore.xmi;bundle-version="2.10.1", org.eclipse.core.expressions;bundle-version="3.4.600", - org.gemoc.commons.eclipse.pde;bundle-version="0.1.0", + org.eclipse.gemoc.commons.eclipse.pde;bundle-version="0.1.0", org.gemoc.commons;bundle-version="0.1.0", org.gemoc.commons.eclipse;bundle-version="0.1.0", org.gemoc.execution.engine;bundle-version="0.1.0", From 34ffaf051227914ddbdfa87ab4de91b3d392a222 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 10:47:29 +0200 Subject: [PATCH 209/267] rename org.gemoc.commons jdt into org.eclipse.gemoc --- .../META-INF/MANIFEST.MF | 2 +- .../builder/AddRemoveGemocSequentialLanguageNatureHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF index bd507b838..82e3f4d6f 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.codegen.ecore.ui;bundle-version="2.8.0", fr.inria.diverse.k3.ui;bundle-version="1.0.0", org.gemoc.commons.eclipse, - org.gemoc.commons.eclipse.jdt, + org.eclipse.gemoc.commons.eclipse.jdt, org.gemoc.commons.eclipse.ui, org.gemoc.executionframework.ui, org.gemoc.xdsmlframework.ide.ui, diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java index a706687ab..06e21ba24 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java @@ -33,7 +33,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import org.gemoc.commons.eclipse.core.resources.NatureToggling; import org.gemoc.commons.eclipse.core.resources.Project; -import org.gemoc.commons.eclipse.jdt.JavaProject; +import org.eclipse.gemoc.commons.eclipse.jdt.JavaProject; import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; import org.eclipse.gemoc.commons.eclipse.pde.ui.PluginConverter; import org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator; From 6dd59fadc16cd6608367a043b7a23fda7da957a6 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 11:02:25 +0200 Subject: [PATCH 210/267] rename org.gemoc.commons.eclipse in org.eclipse.gemoc.commons.eclipse --- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../executionframework/debugger/AbstractGemocDebugger.java | 2 +- .../org/gemoc/executionframework/debugger/Activator.java | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../src/org/gemoc/executionframework/engine/Activator.java | 2 +- .../executionframework/engine/core/ExecutionWorkspace.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../extensions/sirius/modelloader/DefaultModelLoader.java | 2 +- .../org.gemoc.executionframework.ui/META-INF/MANIFEST.MF | 4 ++-- .../ui/xdsml/activefile/ActiveFileEcore.java | 2 +- .../ui/xdsml/activefile/ActiveFileGenmodel.java | 2 +- .../org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF | 2 +- .../modelchangelistener/SimpleModelChangeListenerAddon.java | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF | 4 ++-- .../ide/ui/commands/AbstractMelangeSelectHandler.java | 2 +- .../wizards/CreateAnimatorProjectWizardContextAction.java | 2 +- .../xdsml/wizards/CreateDomainModelWizardContextAction.java | 6 +++--- .../wizards/CreateEditorProjectWizardContextAction.java | 4 ++-- .../org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF | 4 ++-- .../ui/utils/dialogs/SelectAIRDIFileDialog.java | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../ui/launcher/tabs/LaunchConfigurationMainTab.java | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../AddRemoveGemocSequentialLanguageNatureHandler.java | 4 ++-- .../javaxdsml/ide/ui/editor/CreateDSAProposal.java | 2 +- .../javaxdsml/ide/ui/editor/CreateEcoreProposal.java | 4 ++-- .../javaxdsml/ide/ui/editor/SelectEcoreProposal.java | 2 +- .../javaxdsml/ide/ui/templates/SequentialTemplate.java | 2 +- .../ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java | 2 +- .../gemoc/generator/GenericEngineTraceAddonGenerator.xtend | 2 +- .../generator/codegen/TraceConstructorGeneratorJava.xtend | 2 +- .../fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF | 2 +- .../gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend | 2 +- .../fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF | 2 +- .../diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend | 2 +- .../trace/gemoc/traceaddon/GenericTraceConstructor.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF | 2 +- 41 files changed, 53 insertions(+), 53 deletions(-) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF index 9b8f48e8b..72d4648d1 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: com.google.guava, fr.obeo.dsl.debug.ide, org.eclipse.core.runtime;bundle-version="3.12.0", org.gemoc.executionframework.engine, - org.gemoc.commons.eclipse.ui, + org.eclipse.gemoc.commons.eclipse.ui, org.eclipse.equinox.registry, org.eclipse.ui.workbench, org.eclipse.xtext;bundle-version="2.10.0", diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF index 002277138..660d7d685 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: com.google.guava, org.eclipse.emf.transaction;bundle-version="1.9.0", org.gemoc.xdsmlframework.commons;bundle-version="2.3.0", org.eclipse.xtext;bundle-version="2.10.0", - org.gemoc.commons.eclipse;bundle-version="2.3.0", + org.eclipse.gemoc.commons.eclipse;bundle-version="2.3.0", org.eclipse.gemoc.commons.eclipse.pde;bundle-version="2.3.0", fr.inria.diverse.commons.eclipse;bundle-version="1.0.0", org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0" diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java index 99bf0308e..e5659a879 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java @@ -191,7 +191,7 @@ private void initializeMutableDatas() { // We fetch all resources concerned by the execution, // since they may contain mutable fields Resource executedResource = executedModelRoot.eResource(); - Set allResources = org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedResource); + Set allResources = org.eclipse.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedResource); allResources.add(executedResource); allResources.removeIf(r -> r == null); diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java index 8b56033db..91aab1949 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java @@ -12,7 +12,7 @@ import java.util.function.Supplier; -import org.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend; +import org.eclipse.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend; import org.eclipse.gemoc.commons.eclipse.pde.GemocPlugin; import org.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.osgi.framework.BundleContext; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF index 5e55918e8..a657c48ad 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-SymbolicName: org.gemoc.executionframework.engine.ui;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.engine.ui.Activator Require-Bundle: org.gemoc.xdsmlframework.api, - org.gemoc.commons.eclipse, + org.eclipse.gemoc.commons.eclipse, org.eclipse.emf.transaction, fr.obeo.dsl.debug.ide, org.eclipse.debug.ui, org.gemoc.executionframework.engine, org.eclipse.ui, - org.gemoc.commons.eclipse.ui, + org.eclipse.gemoc.commons.eclipse.ui, org.eclipse.xtend.lib, org.gemoc.xdsmlframework.commons, fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF index b921fb48f..94e65219b 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.gemoc.executionframework.engine;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.engine.Activator Require-Bundle: org.gemoc.xdsmlframework.api, - org.gemoc.commons.eclipse, + org.eclipse.gemoc.commons.eclipse, org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", org.gemoc.executionframework.reflectivetrace.model;visibility:=reexport, org.eclipse.gemoc.commons.eclipse.pde;bundle-version="0.1.0", diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java index 6eef9fa7d..e338b4a68 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.gemoc.executionframework.engine; -import org.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend; +import org.eclipse.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend; import org.eclipse.gemoc.commons.eclipse.pde.GemocPlugin; import org.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; import org.osgi.framework.BundleContext; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java index ada513eaa..889121648 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.util.URI; -import org.gemoc.commons.eclipse.emf.URIHelper; +import org.eclipse.gemoc.commons.eclipse.emf.URIHelper; import org.gemoc.xdsmlframework.api.core.IExecutionWorkspace; public class ExecutionWorkspace implements IExecutionWorkspace diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF index ac1cff53e..db079535f 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.gemoc.xdsmlframework.api, org.eclipse.debug.core;bundle-version="3.9.1", fr.obeo.dsl.debug;bundle-version="1.0.0", fr.obeo.dsl.debug.ide;bundle-version="1.0.0", - org.gemoc.commons.eclipse, + org.eclipse.gemoc.commons.eclipse, org.eclipse.emf.codegen.ecore, org.eclipse.emf.edit.ui, org.gemoc.executionframework.engine, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index 5e55a0517..09eed5317 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -68,7 +68,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.xtext.resource.XtextPlatformResourceURIHandler; import org.eclipse.xtext.util.StringInputStream; -import org.gemoc.commons.eclipse.emf.EMFResource; +import org.eclipse.gemoc.commons.eclipse.emf.EMFResource; import org.gemoc.executionframework.engine.core.CommandExecution; import org.gemoc.executionframework.extensions.sirius.Activator; import org.gemoc.executionframework.extensions.sirius.debug.DebugSessionFactory; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF index cddf41171..efcc6b460 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-SymbolicName: org.gemoc.executionframework.ui;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.ui.Activator Require-Bundle: org.gemoc.xdsmlframework.api, - org.gemoc.commons.eclipse, + org.eclipse.gemoc.commons.eclipse, org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.core.resources;bundle-version="3.9.1", org.eclipse.ui.workbench, org.eclipse.jface, org.gemoc.executionframework.engine;bundle-version="0.1.0", - org.gemoc.commons.eclipse.ui;bundle-version="0.1.0", + org.eclipse.gemoc.commons.eclipse.ui;bundle-version="0.1.0", org.eclipse.xtext.util, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java index 321464854..50847e9d5 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java @@ -13,7 +13,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; +import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.gemoc.executionframework.ui.Activator; public class ActiveFileEcore extends ActiveFile { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java index 33d3a39a4..544839abd 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java @@ -13,7 +13,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; +import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.gemoc.executionframework.ui.Activator; public class ActiveFileGenmodel extends ActiveFileEcore { diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF index a4e9bdf42..774569dcc 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.gemoc.xdsmlframework.api.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore, org.gemoc.executionframework.reflectivetrace.model;bundle-version="0.1.0", - org.gemoc.commons.eclipse;bundle-version="0.1.0", + org.eclipse.gemoc.commons.eclipse;bundle-version="0.1.0", org.eclipse.xtend.lib, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java index d82913f29..b2f7b82d8 100644 --- a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java +++ b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java @@ -76,7 +76,7 @@ public void notifyChanged(Notification notification) { } } }; - Set allResources = org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(this.engine + Set allResources = org.eclipse.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(this.engine .getExecutionContext().getResourceModel()); allResources.stream().forEach(r -> { if (r != null) { @@ -105,7 +105,7 @@ public boolean registerAddon(IEngineAddon addon) { @Override public void engineAboutToStop(IExecutionEngine engine) { - Set allResources = org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(this.engine + Set allResources = org.eclipse.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(this.engine .getExecutionContext().getResourceModel()); allResources.stream().forEach(r -> { r.eAdapters().remove(adapter); diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF index 79198e184..119401587 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.gemoc.xdsmlframework.api, org.eclipse.debug.core;bundle-version="3.9.1", fr.obeo.dsl.debug;bundle-version="1.0.0", fr.obeo.dsl.debug.ide;bundle-version="1.0.0", - org.gemoc.commons.eclipse, + org.eclipse.gemoc.commons.eclipse, org.eclipse.emf.codegen.ecore, org.eclipse.ui.ide;bundle-version="3.10.2", org.eclipse.emf.edit.ui, diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF index c22b28cf6..8ebbf6987 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.acceleo.engine;bundle-version="3.3.0", org.gemoc.xdsmlframework.api;bundle-version="0.1.0", fr.inria.diverse.k3.ui;bundle-version="1.0.0", - org.gemoc.commons.eclipse, - org.gemoc.commons.eclipse.ui, + org.eclipse.gemoc.commons.eclipse, + org.eclipse.gemoc.commons.eclipse.ui, org.eclipse.emf.ecore.editor, org.gemoc.xdsmlframework.ui.utils, org.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java index 3a9d4fa95..f84543d1e 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java @@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.wizard.WizardDialog; -import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; +import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.gemoc.xdsmlframework.ide.ui.Activator; import org.gemoc.xdsmlframework.ui.utils.dialogs.SelectAnyMelangeLanguageDialog; diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java index b1c7eee86..115d76e91 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java @@ -18,7 +18,7 @@ import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.wizards.IWizardDescriptor; -import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; +import org.eclipse.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; import org.gemoc.xdsmlframework.ide.ui.Activator; diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java index 1d58eff00..185b143ea 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java @@ -20,13 +20,13 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.wizards.IWizardDescriptor; -import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; -import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; +import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; +import org.eclipse.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.xdsmlframework.ide.ui.Activator; import org.gemoc.xdsmlframework.ui.utils.dialogs.SelectEMFIProjectDialog; -import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; +import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; /** * This class is both a context for the wizard and a Command that will be diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java index 2474831d0..6ef2ef282 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java @@ -25,8 +25,8 @@ import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.wizards.IWizardDescriptor; -import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; -import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; +import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; +import org.eclipse.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocSiriusProjectWizard; import org.gemoc.xdsmlframework.ide.ui.Activator; diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF index fa5fb70cf..1b23c79de 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.xdsmlframework.ui.utils.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.codegen.ecore.ui;bundle-version="2.8.0", - org.gemoc.commons.eclipse, - org.gemoc.commons.eclipse.ui, + org.eclipse.gemoc.commons.eclipse, + org.eclipse.gemoc.commons.eclipse.ui, org.eclipse.emf.ecore.editor, fr.inria.diverse.k3.al.annotationprocessor.plugin, fr.inria.diverse.melange.metamodel diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java index f58229c1c..fec5db35c 100644 --- a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java +++ b/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.gemoc.xdsmlframework.ui.utils.dialogs; -import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; +import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectSpecificFileDialog; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index 5ade2699d..3bf4e4b02 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", fr.obeo.dsl.debug.ide;bundle-version="1.0.0", fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", org.eclipse.emf.transaction;bundle-version="1.4.0", - org.gemoc.commons.eclipse, - org.gemoc.commons.eclipse.ui;bundle-version="0.1.0", + org.eclipse.gemoc.commons.eclipse, + org.eclipse.gemoc.commons.eclipse.ui;bundle-version="0.1.0", org.eclipse.sirius.diagram.ui;bundle-version="1.0.0", org.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", org.eclipse.emf.edit.ui, diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index c5c25316f..a18e87f5d 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -45,7 +45,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; -import org.gemoc.commons.eclipse.emf.URIHelper; +import org.eclipse.gemoc.commons.eclipse.emf.URIHelper; import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectAnyIFileDialog; import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; import org.gemoc.execution.sequential.javaengine.ui.Activator; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF index 82e3f4d6f..8d5cef442 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF @@ -9,9 +9,9 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.emf.codegen.ecore.ui;bundle-version="2.8.0", fr.inria.diverse.k3.ui;bundle-version="1.0.0", - org.gemoc.commons.eclipse, + org.eclipse.gemoc.commons.eclipse, org.eclipse.gemoc.commons.eclipse.jdt, - org.gemoc.commons.eclipse.ui, + org.eclipse.gemoc.commons.eclipse.ui, org.gemoc.executionframework.ui, org.gemoc.xdsmlframework.ide.ui, org.gemoc.xdsmlframework.api, diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java index 06e21ba24..7c16d80b2 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java @@ -31,8 +31,8 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; -import org.gemoc.commons.eclipse.core.resources.NatureToggling; -import org.gemoc.commons.eclipse.core.resources.Project; +import org.eclipse.gemoc.commons.eclipse.core.resources.NatureToggling; +import org.eclipse.gemoc.commons.eclipse.core.resources.Project; import org.eclipse.gemoc.commons.eclipse.jdt.JavaProject; import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; import org.eclipse.gemoc.commons.eclipse.pde.ui.PluginConverter; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java index 9ba750bec..38c157e67 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java @@ -32,7 +32,7 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.wizards.IWizardDescriptor; -import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; +import org.eclipse.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; import org.eclipse.gemoc.commons.eclipse.pde.wizards.pages.pde.TemplateListSelectionPage; import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java index 95c3de77b..c4f0a3058 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java @@ -20,8 +20,8 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.wizards.IWizardDescriptor; -import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; -import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; +import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; +import org.eclipse.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.xdsmlframework.ide.ui.Activator; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java index 2c9918e7b..0626c56ea 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java @@ -15,7 +15,7 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.dialogs.Dialog; -import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; +import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectSpecificFileDialog; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java index 2a99c928f..a995a7434 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java @@ -24,7 +24,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.ui.PlatformUI; -import org.gemoc.commons.eclipse.core.resources.FileFinderVisitor; +import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator; import org.gemoc.execution.sequential.javaxdsml.ide.ui.dialogs.SelectDSAIProjectDialog; import org.osgi.framework.BundleException; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java index eada87e59..15320b429 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java @@ -27,7 +27,7 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.wizards.IWizardDescriptor; -import org.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; +import org.eclipse.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; import org.eclipse.gemoc.commons.eclipse.pde.wizards.pages.pde.TemplateListSelectionPage; import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index aa9550fa0..0d7c46231 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -200,7 +200,7 @@ class GenericEngineTraceAddonGenerator { ManifestUtil.addToPluginManifest(project, m, "org.eclipse.emf.compare") ManifestUtil.addToPluginManifest(project, m, "org.gemoc.executionframework.engine") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.xtext") - ManifestUtil.addToPluginManifest(project, m, "org.gemoc.commons.eclipse") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.commons.eclipse") ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.gemoc") ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.gemoc.api") ManifestUtil.addToPluginManifest(project, m, "org.gemoc.xdsmlframework.api") diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend index e1104225c..bbc789963 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -261,7 +261,7 @@ class TraceConstructorGeneratorJava { private Set getAllExecutedModelResources() { Set allResources = new HashSet<>(); allResources.add(executedModel); - allResources.addAll(org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); + allResources.addAll(org.eclipse.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); allResources.removeIf(r -> r == null || (r != executedModel && executedModel.getContents().contains(r.getContents().get(0)))); return allResources; } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF index 480b5e7ef..9175dd51d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.core.expressions, org.gemoc.xdsmlframework.ide.ui;bundle-version="0.1.0", org.gemoc.xdsmlframework.ui.utils;bundle-version="0.1.0", - org.gemoc.commons.eclipse;bundle-version="0.1.0" + org.eclipse.gemoc.commons.eclipse;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend index 9ccaa9325..79c5eb0a0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.Status import org.eclipse.core.runtime.jobs.Job import org.eclipse.jface.dialogs.InputDialog import org.eclipse.jface.window.Window -import org.gemoc.commons.eclipse.emf.EMFResource +import org.eclipse.gemoc.commons.eclipse.emf.EMFResource import org.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF index 17f050817..c5e2ae353 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", org.eclipse.xtext, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", - org.gemoc.commons.eclipse;bundle-version="0.1.0", + org.eclipse.gemoc.commons.eclipse;bundle-version="0.1.0", org.eclipse.emf.compare, org.gemoc.xdsmlframework.commons Export-Package: fr.inria.diverse.trace.gemoc.traceaddon diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index 70f6e9e10..7302a6b32 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -37,7 +37,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.emf.transaction.RecordingCommand import org.eclipse.emf.transaction.util.TransactionUtil -import org.gemoc.commons.eclipse.emf.EMFResource +import org.eclipse.gemoc.commons.eclipse.emf.EMFResource import org.gemoc.executionframework.engine.core.CommandExecution import org.gemoc.xdsmlframework.api.core.IExecutionContext import org.gemoc.xdsmlframework.api.core.IExecutionEngine diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index 8fea0ef74..7e3c14630 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -76,7 +76,7 @@ public GenericTraceConstructor(Resource executedModel, Resource traceResource, M private Set getAllExecutedModelResources() { Set allResources = new HashSet<>(); allResources.add(executedModel); - allResources.addAll(org.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); + allResources.addAll(org.eclipse.gemoc.commons.eclipse.emf.EMFResource.getRelatedResources(executedModel)); allResources.removeIf(r -> r == null); return allResources; } diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF index deb9cdc72..3a511fda5 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: fr.obeo.timeline;bundle-version="1.0.0", org.gemoc.executionframework.ui, fr.inria.diverse.trace.gemoc;bundle-version="1.0.0", fr.inria.diverse.trace.gemoc.api, - org.gemoc.commons.eclipse.ui, + org.eclipse.gemoc.commons.eclipse.ui, org.eclipse.debug.core, org.eclipse.emf.compare, org.eclipse.debug.ui, diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF index cfe2853f8..2ec3f44bc 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtend2.lib;bundle-version="2.4.3", org.eclipse.core.expressions;bundle-version="3.4.600", org.eclipse.gemoc.commons.eclipse.pde;bundle-version="0.1.0", org.gemoc.commons;bundle-version="0.1.0", - org.gemoc.commons.eclipse;bundle-version="0.1.0", + org.eclipse.gemoc.commons.eclipse;bundle-version="0.1.0", org.gemoc.execution.engine;bundle-version="0.1.0", fr.inria.diverse.k3.al.annotationprocessor.plugin, org.gemoc.sample.tfsm.plaink3.model;bundle-version="0.1.0" From 4d5ee84ec276c8d4fea73cc120cf0a6e582b1379 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 11:15:06 +0200 Subject: [PATCH 211/267] rename org.gemoc.commons.repository and feature in org.eclispe.gemoc --- framework/execution_framework/pom.xml | 2 +- framework/framework_commons/pom.xml | 2 +- framework/xdsml_framework/pom.xml | 2 +- java_execution/pom.xml | 2 +- pom.xml | 2 +- trace/commons/pom.xml | 2 +- trace/generator/pom.xml | 2 +- trace/manager/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/framework/execution_framework/pom.xml b/framework/execution_framework/pom.xml index 2f2cdceb9..7e92a9a50 100644 --- a/framework/execution_framework/pom.xml +++ b/framework/execution_framework/pom.xml @@ -56,7 +56,7 @@ gemoc-studio_commons on CI p2 - https://ci.inria.fr/gemoc/job/gemoc-studio_commons/lastSuccessfulBuild/artifact/commons/releng/org.gemoc.commons.repository/target/repository/ + https://ci.inria.fr/gemoc/job/gemoc-studio_commons/lastSuccessfulBuild/artifact/commons/releng/org.eclipse.gemoc.commons.repository/target/repository/ plugins/org.gemoc.xdsmlframework.api plugins/org.gemoc.executionframework.reflectivetrace.model - plugins/org.gemoc.xdsmlframework.commons + plugins/org.eclipse.gemoc.xdsmlframework.commons plugins/fr.inria.diverse.opsemanticsview.gen plugins/fr.inria.diverse.opsemanticsview.gen.k3 diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml index dd620e644..b89ee8af4 100644 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml +++ b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml @@ -32,7 +32,7 @@ unpack="false"/> Date: Thu, 15 Jun 2017 23:03:14 +0200 Subject: [PATCH 217/267] rename org.gemoc.xdsmlframework.api in org.eclipse.gemoc.xdsmlframework.api --- .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../schema/org.gemoc.gemoc_language_workbench.engine_addon.exsd | 0 .../org.gemoc.gemoc_language_workbench.engine_addon_group.exsd | 0 .../schema/org.gemoc.gemoc_language_workbench.xdsml.exsd | 0 .../src/org/gemoc/xdsmlframework/api/Activator.java | 0 .../src/org/gemoc/xdsmlframework/api/core/EngineStatus.java | 0 .../src/org/gemoc/xdsmlframework/api/core/ExecutionMode.java | 0 .../src/org/gemoc/xdsmlframework/api/core/IDisposable.java | 0 .../org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java | 0 .../src/org/gemoc/xdsmlframework/api/core/IExecutionContext.java | 0 .../src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java | 0 .../src/org/gemoc/xdsmlframework/api/core/IExecutionPlatform.java | 0 .../org/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java | 0 .../src/org/gemoc/xdsmlframework/api/core/IModelLoader.java | 0 .../src/org/gemoc/xdsmlframework/api/core/IRunConfiguration.java | 0 .../gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java | 0 .../org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java | 0 .../modelchangelistener/BatchModelChangeListener.xtend | 0 .../api/engine_addon/modelchangelistener/FieldChange.java | 0 .../modelchangelistener/IModelChangeListenerAddon.java | 0 .../api/engine_addon/modelchangelistener/ModelChange.xtend | 0 .../modelchangelistener/SimpleModelChangeListenerAddon.java | 0 .../src/org/gemoc/xdsmlframework/api/extensions/Extension.java | 0 .../org/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java | 0 .../engine_addon/EngineAddonSpecificationExtension.java | 0 .../engine_addon/EngineAddonSpecificationExtensionPoint.java | 0 .../EngineAddonGroupSpecificationExtension.java | 0 .../EngineAddonGroupSpecificationExtensionPoint.java | 0 .../api/extensions/languages/LanguageDefinitionExtension.java | 0 .../extensions/languages/LanguageDefinitionExtensionPoint.java | 0 39 files changed, 0 insertions(+), 0 deletions(-) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/.checkstyle (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/.classpath (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/.gitignore (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/.project (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/META-INF/MANIFEST.MF (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/about.html (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/build.properties (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/plugin.xml (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/pom.xml (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/schema/org.gemoc.gemoc_language_workbench.engine_addon.exsd (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/schema/org.gemoc.gemoc_language_workbench.engine_addon_group.exsd (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/schema/org.gemoc.gemoc_language_workbench.xdsml.exsd (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/Activator.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/core/ExecutionMode.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/core/IDisposable.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/core/IExecutionContext.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/core/IExecutionPlatform.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/core/IRunConfiguration.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/extensions/Extension.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java (100%) rename framework/framework_commons/plugins/{org.gemoc.xdsmlframework.api => org.eclipse.gemoc.xdsmlframework.api}/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java (100%) diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.checkstyle b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.checkstyle similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.checkstyle rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.checkstyle diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.classpath b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.classpath similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.classpath rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.classpath diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.gitignore b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.gitignore similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.gitignore rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.gitignore diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.project b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.project similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.project rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.project diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.settings/org.eclipse.jdt.core.prefs b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/.settings/org.eclipse.jdt.core.prefs rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/about.html b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/about.html similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/about.html rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/about.html diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/build.properties b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/build.properties similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/build.properties rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/build.properties diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/plugin.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/plugin.xml similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/plugin.xml rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/plugin.xml diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/pom.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/pom.xml similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/pom.xml rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/pom.xml diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.engine_addon.exsd b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.engine_addon.exsd similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.engine_addon.exsd rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.engine_addon.exsd diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.engine_addon_group.exsd b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.engine_addon_group.exsd similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.engine_addon_group.exsd rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.engine_addon_group.exsd diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.xdsml.exsd b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.xdsml.exsd similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.xdsml.exsd rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/schema/org.gemoc.gemoc_language_workbench.xdsml.exsd diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/Activator.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/Activator.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/Activator.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/Activator.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/ExecutionMode.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/ExecutionMode.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/ExecutionMode.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/ExecutionMode.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IDisposable.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IDisposable.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IDisposable.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IDisposable.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionContext.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionContext.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionContext.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionContext.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionPlatform.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionPlatform.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionPlatform.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionPlatform.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IRunConfiguration.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IRunConfiguration.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IRunConfiguration.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IRunConfiguration.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/Extension.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/Extension.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/Extension.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/Extension.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java From a6fc31758b18ab3bfb48212e2efb8a6fbd535597 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 23:03:54 +0200 Subject: [PATCH 218/267] package rename org.gemoc.xdsmlframework.api in org.eclipse.gemoc.xdsmlframework.api --- .../META-INF/MANIFEST.MF | 4 ++-- .../debugger/ui/OpenSemanticsHandler.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../debugger/AbstractGemocDebugger.java | 12 +++++------ .../AbstractGemocDebuggerFactory.java | 2 +- .../debugger/Activator.java | 2 +- .../debugger/IGemocDebugger.java | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../engine/ui/commons/RunConfiguration.java | 6 +++--- .../ui/launcher/AbstractGemocLauncher.java | 4 ++-- .../AbstractSequentialGemocLauncher.java | 8 ++++---- .../META-INF/MANIFEST.MF | 2 +- .../commons/DefaultExecutionPlatform.java | 12 +++++------ .../engine/commons/ModelExecutionContext.java | 12 +++++------ .../engine/core/AbstractExecutionEngine.java | 14 ++++++------- .../AbstractSequentialExecutionEngine.java | 4 ++-- .../engine/core/CommandExecution.java | 2 +- .../engine/core/ExecutionWorkspace.java | 2 +- .../core/GemocRunningEnginesRegistry.java | 2 +- .../core/IEngineRegistrationListener.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../views/EventManagerRenderer.java | 6 +++--- .../views/EventManagerViewPart.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../extensions/sirius/Activator.java | 4 ++-- .../modelloader/DebugPermissionAuthority.java | 2 +- .../modelloader/DebugPermissionProvider.java | 2 +- .../modelloader/DefaultModelLoader.java | 4 ++-- .../AbstractGemocAnimatorServices.java | 8 ++++---- .../sirius/services/IModelAnimator.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../views/engine/EngineSelectionManager.java | 2 +- .../ui/views/engine/EnginesStatusView.java | 6 +++--- .../engine/IEngineSelectionListener.java | 2 +- .../ui/views/engine/ViewContentProvider.java | 2 +- .../engine/actions/AbstractEngineAction.java | 6 +++--- .../actions/DisposeStoppedEngineAction.java | 4 ++-- .../engine/actions/StopEngineAction.java | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../test/lib/IEngineWrapper.xtend | 2 +- .../test/lib/impl/TestEngineAddon.xtend | 6 +++--- .../test/lib/impl/TestRunConfiguration.xtend | 6 +++--- .../test/lib/impl/TestUtil.xtend | 4 ++-- .../.project | 2 +- .../META-INF/MANIFEST.MF | 20 +++++++++---------- .../pom.xml | 2 +- .../gemoc/xdsmlframework/api/Activator.java | 4 ++-- .../xdsmlframework/api/core/EngineStatus.java | 2 +- .../api/core/ExecutionMode.java | 2 +- .../xdsmlframework/api/core/IDisposable.java | 2 +- .../api/core/IExecutionCheckpoint.java | 2 +- .../api/core/IExecutionContext.java | 4 ++-- .../api/core/IExecutionEngine.java | 6 +++--- .../api/core/IExecutionPlatform.java | 4 ++-- .../api/core/IExecutionWorkspace.java | 2 +- .../xdsmlframework/api/core/IModelLoader.java | 2 +- .../api/core/IRunConfiguration.java | 4 ++-- .../api/engine_addon/DefaultEngineAddon.java | 6 +++--- .../api/engine_addon/IEngineAddon.java | 6 +++--- .../BatchModelChangeListener.xtend | 2 +- .../modelchangelistener/FieldChange.java | 2 +- .../IModelChangeListenerAddon.java | 4 ++-- .../modelchangelistener/ModelChange.xtend | 2 +- .../SimpleModelChangeListenerAddon.java | 8 ++++---- .../api/extensions/Extension.java | 4 ++-- .../api/extensions/ExtensionPoint.java | 2 +- .../EngineAddonSpecificationExtension.java | 6 +++--- ...ngineAddonSpecificationExtensionPoint.java | 6 +++--- ...ngineAddonGroupSpecificationExtension.java | 4 ++-- ...AddonGroupSpecificationExtensionPoint.java | 4 ++-- .../LanguageDefinitionExtension.java | 8 ++++---- .../LanguageDefinitionExtensionPoint.java | 4 ++-- framework/framework_commons/pom.xml | 2 +- .../feature.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../ide/ui/builder/pde/PluginXMLHelper.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../debug/GenericSequentialModelDebugger.java | 2 +- ...scientGenericSequentialModelDebugger.xtend | 2 +- .../javaengine/ui/launcher/Launcher.java | 6 +++--- .../tabs/LaunchConfigurationBackendsTab.java | 8 ++++---- .../LaunchConfigurationDataProcessingTab.java | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../javaengine/PlainK3ExecutionEngine.java | 4 ++-- .../SequentialModelExecutionContext.java | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../tests/wrapper/JavaEngineWrapper.xtend | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- ...SequentialLanguageDefinitionExtension.java | 2 +- ...ntialLanguageDefinitionExtensionPoint.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- ...eGemocSequentialLanguageNatureHandler.java | 4 ++-- .../GemocSequentialLanguageBuilder.java | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../api/IMultiDimensionalTraceAddon.java | 2 +- .../trace/gemoc/api/ITraceConstructor.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../GenericEngineTraceAddonGenerator.xtend | 6 +++--- .../TraceConstructorGeneratorJava.xtend | 16 +++++++-------- .../META-INF/MANIFEST.MF | 2 +- .../gemoc/traceaddon/AbstractTraceAddon.xtend | 12 +++++------ .../traceaddon/GenericTraceConstructor.java | 10 +++++----- .../traceaddon/GenericTraceNotifier.java | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../views/TimelineDiffViewerViewPart.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../MultidimensionalTimelineViewPart.java | 8 ++++---- .../META-INF/MANIFEST.MF | 2 +- .../stategraph/views/StateGraphViewPart.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../runconf/BenchmarkRunConfiguration.xtend | 6 +++--- .../BenchmarkExecutionModelContext.xtend | 4 ++-- .../trace/benchmark/utils/EngineHelper.java | 8 ++++---- 114 files changed, 239 insertions(+), 239 deletions(-) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/Activator.java (91%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/core/EngineStatus.java (95%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/core/ExecutionMode.java (91%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/core/IDisposable.java (92%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java (95%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/core/IExecutionContext.java (88%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/core/IExecutionEngine.java (94%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/core/IExecutionPlatform.java (87%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java (94%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/core/IModelLoader.java (95%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/core/IRunConfiguration.java (93%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java (89%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java (91%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend (99%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java (94%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java (82%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend (96%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java (92%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/extensions/Extension.java (93%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java (97%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java (91%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java (92%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java (86%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java (91%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java (93%) rename framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/{ => eclipse}/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java (95%) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF index 72d4648d1..a346da27d 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF @@ -5,14 +5,14 @@ Bundle-SymbolicName: org.gemoc.executionframework.debugger.ui;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.gemoc.executionframework.debugger.ui.Activator -Export-Package: org.gemoc.executionframework.debugger.ui;uses:="org.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", +Export-Package: org.gemoc.executionframework.debugger.ui;uses:="org.eclipse.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", org.gemoc.executionframework.debugger.ui.breakpoints Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, org.eclipse.core.commands, - org.gemoc.xdsmlframework.api, + org.eclipse.gemoc.xdsmlframework.api, org.eclipse.jface, org.eclipse.debug.core, fr.obeo.dsl.debug.ide, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java index ad77f7b1b..dffc626cb 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java @@ -29,7 +29,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.gemoc.commons.eclipse.ui.OpenEditor; import org.gemoc.executionframework.engine.core.AbstractExecutionEngine; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.osgi.framework.Bundle; import fr.obeo.dsl.debug.ide.adapter.DSLThreadAdapter; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF index 58a5bc7a1..303859be4 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: com.google.guava, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, fr.obeo.dsl.debug.ide, - org.gemoc.xdsmlframework.api, + org.eclipse.gemoc.xdsmlframework.api, org.eclipse.emf.ecore, fr.inria.diverse.trace.commons.model, org.eclipse.ui.workbench, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java index e5659a879..1c59d9cb8 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java @@ -46,12 +46,12 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.FieldChange; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.IModelChangeListenerAddon; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.SimpleModelChangeListenerAddon; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.FieldChange; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.IModelChangeListenerAddon; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.SimpleModelChangeListenerAddon; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.inria.diverse.trace.commons.model.trace.Step; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java index e90912681..2c8a8177a 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.gemoc.executionframework.debugger; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java index 91aab1949..db78da562 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java @@ -14,7 +14,7 @@ import org.eclipse.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend; import org.eclipse.gemoc.commons.eclipse.pde.GemocPlugin; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.osgi.framework.BundleContext; import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystemManager; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java index 4bfe31fd8..f8fb49027 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java @@ -12,8 +12,8 @@ import java.util.function.BiPredicate; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF index ec647e32d..42850b305 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Execution Engine UI Bundle-SymbolicName: org.gemoc.executionframework.engine.ui;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.engine.ui.Activator -Require-Bundle: org.gemoc.xdsmlframework.api, +Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.commons.eclipse, org.eclipse.emf.transaction, fr.obeo.dsl.debug.ide, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java index fd7110c78..c3a87fbf1 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.emf.common.util.URI; -import org.gemoc.xdsmlframework.api.core.IRunConfiguration; -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint; +import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration; +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint; import fr.obeo.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java index 24b6b1550..cd7c74dab 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java @@ -14,8 +14,8 @@ import java.util.Map; import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; -import org.gemoc.xdsmlframework.api.core.IRunConfiguration; -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; +import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration; +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java index fe6e6c892..6e52d5312 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java @@ -37,10 +37,10 @@ import org.gemoc.executionframework.engine.ui.commons.RunConfiguration; import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocAnimatorServices; import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.core.ExecutionMode; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystem; import fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF index 94e65219b..7c622b345 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Gemoc Engine Bundle-SymbolicName: org.gemoc.executionframework.engine;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.engine.Activator -Require-Bundle: org.gemoc.xdsmlframework.api, +Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.commons.eclipse, org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", org.gemoc.executionframework.reflectivetrace.model;visibility:=reexport, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java index d8ba7bc34..061667512 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java @@ -15,12 +15,12 @@ import java.util.Collections; import org.eclipse.core.runtime.CoreException; -import org.gemoc.xdsmlframework.api.core.IExecutionPlatform; -import org.gemoc.xdsmlframework.api.core.IModelLoader; -import org.gemoc.xdsmlframework.api.core.IRunConfiguration; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; -import org.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionPlatform; +import org.eclipse.gemoc.xdsmlframework.api.core.IModelLoader; +import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; +import org.eclipse.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension; public class DefaultExecutionPlatform implements IExecutionPlatform { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java index f2070fc58..b13d7e7c9 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java @@ -17,12 +17,12 @@ import org.eclipse.emf.transaction.util.TransactionUtil; import org.gemoc.executionframework.engine.Activator; import org.gemoc.executionframework.engine.core.ExecutionWorkspace; -import org.gemoc.xdsmlframework.api.core.ExecutionMode; -import org.gemoc.xdsmlframework.api.core.IExecutionContext; -import org.gemoc.xdsmlframework.api.core.IExecutionPlatform; -import org.gemoc.xdsmlframework.api.core.IExecutionWorkspace; -import org.gemoc.xdsmlframework.api.core.IRunConfiguration; -import org.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension; +import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionContext; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionPlatform; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionWorkspace; +import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration; +import org.eclipse.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension; import org.osgi.framework.Bundle; public abstract class ModelExecutionContext implements IExecutionContext { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java index 461e7beb1..1acf9d004 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java @@ -24,12 +24,12 @@ import org.eclipse.emf.transaction.impl.EMFCommandTransaction; import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain; import org.gemoc.executionframework.engine.Activator; -import org.gemoc.xdsmlframework.api.core.EngineStatus; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.core.IDisposable; -import org.gemoc.xdsmlframework.api.core.IExecutionContext; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.IDisposable; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionContext; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.inria.diverse.trace.commons.model.trace.Step; @@ -401,7 +401,7 @@ private EMFCommandTransaction createTransaction(InternalTransactionalEditingDoma /* (non-Javadoc) - * @see org.gemoc.xdsmlframework.api.core.IExecutionEngine#getCurrentMSEOccurrence() + * @see org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine#getCurrentMSEOccurrence() */ @Override public final MSEOccurrence getCurrentMSEOccurrence() { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index 53be0fb80..5e86b3c78 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -22,8 +22,8 @@ import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.util.TransactionUtil; import org.gemoc.executionframework.engine.Activator; -import org.gemoc.xdsmlframework.api.core.IExecutionContext; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionContext; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java index e8a3db7c5..524e504b6 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.gemoc.xdsmlframework.api.core.IExecutionCheckpoint; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionCheckpoint; public final class CommandExecution { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java index 889121648..d11af2b0f 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.util.URI; import org.eclipse.gemoc.commons.eclipse.emf.URIHelper; -import org.gemoc.xdsmlframework.api.core.IExecutionWorkspace; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionWorkspace; public class ExecutionWorkspace implements IExecutionWorkspace { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java index 67cffa219..69d4f8a5d 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; public class GemocRunningEnginesRegistry { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java index 52ded04b5..43e5da9bb 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.gemoc.executionframework.engine.core; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; /** * Listener interface used to be notified when engines are registered and unregistered from the Engine registry diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF index 2f31e2855..6285a3905 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.gemoc.executionframework.eventmanager.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.gemoc.executionframework.ui, - org.gemoc.xdsmlframework.api, + org.eclipse.gemoc.xdsmlframework.api, org.eclipse.emf.ecore, fr.inria.diverse.trace.commons.model, org.eclipse.xtext, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java index d36f1cbae..0500294b0 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java @@ -19,9 +19,9 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java index cbf52fd79..598507246 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java @@ -13,7 +13,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import javafx.embed.swt.FXCanvas; import javafx.scene.Scene; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF index db079535f..2d4735204 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Sirius Bundle-SymbolicName: org.gemoc.executionframework.extensions.sirius;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.extensions.sirius.Activator -Require-Bundle: org.gemoc.xdsmlframework.api, +Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.sirius.diagram.ui;bundle-version="4.0.0", org.eclipse.sirius.common;bundle-version="1.0.1", fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0";visibility:=reexport, diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java index 174b788b9..31aac84f3 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java @@ -20,8 +20,8 @@ import org.eclipse.ui.IWorkbenchListener; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.osgi.framework.BundleContext; /** diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java index c8c0628ce..8bb75e1c1 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java @@ -19,7 +19,7 @@ import org.eclipse.sirius.ecore.extender.business.api.permission.IAuthorityListener; import org.eclipse.sirius.ecore.extender.business.api.permission.LockStatus; import org.eclipse.sirius.ecore.extender.business.internal.permission.AbstractPermissionAuthority; -import org.gemoc.xdsmlframework.api.core.IExecutionCheckpoint; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionCheckpoint; public class DebugPermissionAuthority extends AbstractPermissionAuthority implements IExecutionCheckpoint { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java index c305e8dc7..596514112 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java @@ -17,7 +17,7 @@ import org.eclipse.sirius.business.api.session.SessionManager; import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority; import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionProvider; -import org.gemoc.xdsmlframework.api.core.IExecutionCheckpoint; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionCheckpoint; public class DebugPermissionProvider implements IPermissionProvider { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index 09eed5317..e090dcdb0 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -73,8 +73,8 @@ import org.gemoc.executionframework.extensions.sirius.Activator; import org.gemoc.executionframework.extensions.sirius.debug.DebugSessionFactory; import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocAnimatorServices; -import org.gemoc.xdsmlframework.api.core.IExecutionContext; -import org.gemoc.xdsmlframework.api.core.IModelLoader; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionContext; +import org.eclipse.gemoc.xdsmlframework.api.core.IModelLoader; import fr.inria.diverse.melange.adapters.EObjectAdapter; import fr.inria.diverse.melange.resource.MelangeRegistry; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index 535e33ae8..ac8a75147 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -39,10 +39,10 @@ import org.eclipse.sirius.viewpoint.DRepresentation; import org.eclipse.sirius.viewpoint.description.RepresentationDescription; import org.gemoc.executionframework.engine.core.CommandExecution; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.Activator; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.Activator; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.inria.diverse.trace.commons.model.trace.ParallelStep; import fr.inria.diverse.trace.commons.model.trace.Step; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java index d52c23427..0e8e297f9 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.gemoc.executionframework.extensions.sirius.services; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.trace.commons.model.trace.Step; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF index efcc6b460..551e1e1d6 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Execution framework UI Bundle-SymbolicName: org.gemoc.executionframework.ui;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.gemoc.executionframework.ui.Activator -Require-Bundle: org.gemoc.xdsmlframework.api, +Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.commons.eclipse, org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.core.resources;bundle-version="3.9.1", diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java index ec333a820..5001eba4c 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; /** * This class is in charge of knowing what was the last selected engine and keeping the list of all EngineSelectionListener diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java index 567b1845d..ac8de053f 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java @@ -45,10 +45,10 @@ import org.gemoc.executionframework.ui.views.engine.actions.DisposeStoppedEngineAction; //import org.gemoc.executionframework.ui.views.engine.actions.PauseResumeEngineDeciderAction; import org.gemoc.executionframework.ui.views.engine.actions.StopEngineAction; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; //import org.gemoc.executionframework.ui.views.engine.actions.SwitchDeciderAction; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.trace.commons.model.trace.Step; diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java index 57ec03041..1d868ac58 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.gemoc.executionframework.ui.views.engine; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; public interface IEngineSelectionListener { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java index 73b4ae845..ab859b6f4 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java @@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; class ViewContentProvider implements ITreeContentProvider { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java index 128880b64..a0385065e 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java @@ -18,9 +18,9 @@ import org.eclipse.ui.IWorkbenchPartSite; import org.gemoc.executionframework.ui.Activator; import org.gemoc.executionframework.ui.views.engine.IEngineSelectionListener; -import org.gemoc.xdsmlframework.api.core.ExecutionMode; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; public abstract class AbstractEngineAction extends Action implements IMenuCreator, IEngineSelectionListener{ diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java index 458ba79f6..eb4e2f69e 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java @@ -15,8 +15,8 @@ import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; import org.gemoc.executionframework.ui.Activator; import org.gemoc.executionframework.ui.views.engine.EnginesStatusView; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; public class DisposeStoppedEngineAction extends AbstractEngineAction { diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java index a00fb95bc..e271d8e58 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java @@ -15,8 +15,8 @@ import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; import org.gemoc.executionframework.ui.Activator; import org.gemoc.executionframework.ui.views.engine.EnginesStatusView; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; public class StopEngineAction extends AbstractEngineAction { diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF index 142138e5b..eb19874f1 100644 --- a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: com.google.guava, org.junit;bundle-version="4.12.0", org.eclipse.core.runtime;bundle-version="3.12.0", org.eclipse.core.resources;bundle-version="3.11.1", - org.gemoc.xdsmlframework.api;bundle-version="2.3.0", + org.eclipse.gemoc.xdsmlframework.api;bundle-version="2.3.0", org.eclipse.emf.ecore;bundle-version="2.12.0", org.eclipse.swt;bundle-version="3.105.3", org.eclipse.ui;bundle-version="3.108.1", diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend index 90bb9a36b..4df29e044 100644 --- a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend @@ -2,7 +2,7 @@ package org.gemoc.executionframework.test.lib import java.util.Set import org.eclipse.emf.common.util.URI -import org.gemoc.xdsmlframework.api.core.IExecutionEngine +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine interface IEngineWrapper { diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend index d4e87d1c1..66605236e 100644 --- a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend @@ -1,10 +1,10 @@ package org.gemoc.executionframework.test.lib.impl -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon -import org.gemoc.xdsmlframework.api.core.IExecutionEngine +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine import fr.inria.diverse.trace.commons.model.trace.Step import java.util.Collection -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus import java.util.List import org.eclipse.xtend.lib.annotations.Accessors diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend index 67c05bf63..b53909f19 100644 --- a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend @@ -8,9 +8,9 @@ import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.gemoc.executionframework.test.lib.ILanguageWrapper -import org.gemoc.xdsmlframework.api.core.IRunConfiguration -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint +import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint import org.gemoc.executionframework.test.lib.IExecutableModel class TestRunConfiguration implements IRunConfiguration { diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend index 790b0ebe3..5c971cef0 100644 --- a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend +++ b/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend @@ -18,8 +18,8 @@ import org.eclipse.ui.IWindowListener import org.eclipse.ui.IWorkbenchWindow import org.eclipse.ui.PlatformUI import org.gemoc.executionframework.engine.Activator -import org.gemoc.xdsmlframework.api.core.EngineStatus -import org.gemoc.xdsmlframework.api.core.IExecutionEngine +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine import org.osgi.framework.Bundle class TestUtil { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.project b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.project index 1c0f0a1ec..f4f6c455b 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.project +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/.project @@ -1,6 +1,6 @@ - org.gemoc.xdsmlframework.api + org.eclipse.gemoc.xdsmlframework.api diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF index 774569dcc..f765f1a87 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Language Api -Bundle-SymbolicName: org.gemoc.xdsmlframework.api;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.xdsmlframework.api;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.xdsmlframework.api.Activator +Bundle-Activator: org.eclipse.gemoc.xdsmlframework.api.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore, org.gemoc.executionframework.reflectivetrace.model;bundle-version="0.1.0", @@ -12,11 +12,11 @@ Require-Bundle: org.eclipse.core.runtime, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.gemoc.xdsmlframework.api, - org.gemoc.xdsmlframework.api.core, - org.gemoc.xdsmlframework.api.engine_addon, - org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener, - org.gemoc.xdsmlframework.api.extensions, - org.gemoc.xdsmlframework.api.extensions.engine_addon, - org.gemoc.xdsmlframework.api.extensions.engine_addon_group, - org.gemoc.xdsmlframework.api.extensions.languages +Export-Package: org.eclipse.gemoc.xdsmlframework.api, + org.eclipse.gemoc.xdsmlframework.api.core, + org.eclipse.gemoc.xdsmlframework.api.engine_addon, + org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener, + org.eclipse.gemoc.xdsmlframework.api.extensions, + org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon, + org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon_group, + org.eclipse.gemoc.xdsmlframework.api.extensions.languages diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/pom.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/pom.xml index dc2447f6c..0eb27a223 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/pom.xml +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/pom.xml @@ -9,7 +9,7 @@ 2.3.0-SNAPSHOT - org.gemoc.xdsmlframework.api + org.eclipse.gemoc.xdsmlframework.api eclipse-plugin diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/Activator.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/Activator.java similarity index 91% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/Activator.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/Activator.java index 5944524bd..69b8fd823 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/Activator.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api; +package org.eclipse.gemoc.xdsmlframework.api; import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; @@ -21,7 +21,7 @@ public class Activator extends Plugin // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.xdsmlframework.api"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.xdsmlframework.api"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/EngineStatus.java similarity index 95% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/EngineStatus.java index 5532650dd..1f1a59a31 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/EngineStatus.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.core; +package org.eclipse.gemoc.xdsmlframework.api.core; import fr.inria.diverse.trace.commons.model.trace.Step; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/ExecutionMode.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/ExecutionMode.java similarity index 91% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/ExecutionMode.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/ExecutionMode.java index 045c9b2cd..670cd2093 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/ExecutionMode.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/ExecutionMode.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.core; +package org.eclipse.gemoc.xdsmlframework.api.core; public enum ExecutionMode { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IDisposable.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IDisposable.java similarity index 92% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IDisposable.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IDisposable.java index d67992917..ac7efa240 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IDisposable.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IDisposable.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.core; +package org.eclipse.gemoc.xdsmlframework.api.core; public interface IDisposable { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java similarity index 95% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java index da709e81b..2844e43aa 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionCheckpoint.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.core; +package org.eclipse.gemoc.xdsmlframework.api.core; import java.util.HashMap; import java.util.Map; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionContext.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionContext.java similarity index 88% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionContext.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionContext.java index 3bd722c3d..0215f6010 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionContext.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionContext.java @@ -8,10 +8,10 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.core; +package org.eclipse.gemoc.xdsmlframework.api.core; import org.eclipse.emf.ecore.resource.Resource; -import org.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension; +import org.eclipse.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension; import org.osgi.framework.Bundle; import fr.inria.diverse.trace.commons.model.trace.MSEModel; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionEngine.java similarity index 94% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionEngine.java index 54d4160b8..ce8f76ecc 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionEngine.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionEngine.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.core; +package org.eclipse.gemoc.xdsmlframework.api.core; import java.util.Deque; import java.util.Set; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionPlatform.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionPlatform.java similarity index 87% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionPlatform.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionPlatform.java index f684c5384..9991b66e6 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionPlatform.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionPlatform.java @@ -8,9 +8,9 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.core; +package org.eclipse.gemoc.xdsmlframework.api.core; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; public interface IExecutionPlatform extends IDisposable { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java similarity index 94% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java index fc54d82cc..a92b9fad3 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionWorkspace.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.core; +package org.eclipse.gemoc.xdsmlframework.api.core; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IModelLoader.java similarity index 95% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IModelLoader.java index acea5f40f..bf4eda881 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IModelLoader.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IModelLoader.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.core; +package org.eclipse.gemoc.xdsmlframework.api.core; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.emf.ecore.resource.Resource; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IRunConfiguration.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IRunConfiguration.java similarity index 93% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IRunConfiguration.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IRunConfiguration.java index 8ef1f2054..7b4831b6f 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/IRunConfiguration.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IRunConfiguration.java @@ -8,12 +8,12 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.core; +package org.eclipse.gemoc.xdsmlframework.api.core; import java.util.Collection; import org.eclipse.emf.common.util.URI; -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; public interface IRunConfiguration { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java similarity index 89% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java index 2c7327a25..fc984cc18 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java @@ -8,14 +8,14 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.engine_addon; +package org.eclipse.gemoc.xdsmlframework.api.engine_addon; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import fr.inria.diverse.trace.commons.model.trace.Step; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java similarity index 91% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java index 72f057020..917574fa9 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.engine_addon; +package org.eclipse.gemoc.xdsmlframework.api.engine_addon; import java.util.Collection; import java.util.List; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import fr.inria.diverse.trace.commons.model.trace.Step; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend similarity index 99% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend index 0816a1fcc..d486cd966 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/BatchModelChangeListener.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; +package org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; import java.util.ArrayList import java.util.Collection diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java similarity index 94% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java index 24df53cd1..7d9dfef9a 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/FieldChange.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; +package org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java similarity index 82% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java index 71d7971b4..9eb48d28e 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/IModelChangeListenerAddon.java @@ -8,11 +8,11 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; +package org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; import java.util.List; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; public interface IModelChangeListenerAddon { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend similarity index 96% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend index 0d410daf7..3dd413306 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/ModelChange.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener +package org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EStructuralFeature diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java similarity index 92% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java index b2f7b82d8..13cbd2d98 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/modelchangelistener/SimpleModelChangeListenerAddon.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; +package org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener; import java.util.ArrayList; import java.util.HashMap; @@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EContentAdapter; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.engine_addon.DefaultEngineAddon; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.DefaultEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; public class SimpleModelChangeListenerAddon extends DefaultEngineAddon implements IModelChangeListenerAddon { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/Extension.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/Extension.java similarity index 93% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/Extension.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/Extension.java index c4215dc82..ac2bdcf09 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/Extension.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/Extension.java @@ -8,12 +8,12 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.extensions; +package org.eclipse.gemoc.xdsmlframework.api.extensions; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Status; -import org.gemoc.xdsmlframework.api.Activator; +import org.eclipse.gemoc.xdsmlframework.api.Activator; public class Extension { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java similarity index 97% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java index 9119f2072..9bcd15235 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/ExtensionPoint.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.extensions; +package org.eclipse.gemoc.xdsmlframework.api.extensions; import java.util.ArrayList; import java.util.Collection; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java similarity index 91% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java index 66f2cbe66..8ba88ac20 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtension.java @@ -8,14 +8,14 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.extensions.engine_addon; +package org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon; import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.CoreException; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import org.gemoc.xdsmlframework.api.extensions.Extension; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.extensions.Extension; public class EngineAddonSpecificationExtension extends Extension { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java similarity index 92% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java index 1c4d36b96..c15ea11ab 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon/EngineAddonSpecificationExtensionPoint.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.extensions.engine_addon; +package org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon; import java.util.Collection; import org.eclipse.core.runtime.CoreException; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import org.gemoc.xdsmlframework.api.extensions.ExtensionPoint; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.extensions.ExtensionPoint; public class EngineAddonSpecificationExtensionPoint extends ExtensionPoint { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java similarity index 86% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java index 3db571fad..33283622c 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtension.java @@ -8,9 +8,9 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.extensions.engine_addon_group; +package org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon_group; -import org.gemoc.xdsmlframework.api.extensions.Extension; +import org.eclipse.gemoc.xdsmlframework.api.extensions.Extension; public class EngineAddonGroupSpecificationExtension extends Extension { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java similarity index 91% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java index 67c2e2e20..86332ca7f 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/engine_addon_group/EngineAddonGroupSpecificationExtensionPoint.java @@ -8,11 +8,11 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.extensions.engine_addon_group; +package org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon_group; import java.util.Collection; -import org.gemoc.xdsmlframework.api.extensions.ExtensionPoint; +import org.eclipse.gemoc.xdsmlframework.api.extensions.ExtensionPoint; public class EngineAddonGroupSpecificationExtensionPoint extends ExtensionPoint { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java similarity index 93% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java index 0ab24aa9a..698c5dcef 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtension.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.extensions.languages; +package org.eclipse.gemoc.xdsmlframework.api.extensions.languages; //import java.io.IOException; import java.util.ArrayList; @@ -17,9 +17,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; -import org.gemoc.xdsmlframework.api.core.IModelLoader; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import org.gemoc.xdsmlframework.api.extensions.Extension; +import org.eclipse.gemoc.xdsmlframework.api.core.IModelLoader; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.extensions.Extension; public class LanguageDefinitionExtension extends Extension { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java similarity index 95% rename from framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java index a319d7bb9..8c2e28112 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/extensions/languages/LanguageDefinitionExtensionPoint.java @@ -8,9 +8,9 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.api.extensions.languages; +package org.eclipse.gemoc.xdsmlframework.api.extensions.languages; -import org.gemoc.xdsmlframework.api.extensions.ExtensionPoint; +import org.eclipse.gemoc.xdsmlframework.api.extensions.ExtensionPoint; public abstract class LanguageDefinitionExtensionPoint extends ExtensionPoint { diff --git a/framework/framework_commons/pom.xml b/framework/framework_commons/pom.xml index 7cdc7b327..5e381299e 100644 --- a/framework/framework_commons/pom.xml +++ b/framework/framework_commons/pom.xml @@ -13,7 +13,7 @@ - plugins/org.gemoc.xdsmlframework.api + plugins/org.eclipse.gemoc.xdsmlframework.api plugins/org.gemoc.executionframework.reflectivetrace.model plugins/org.eclipse.gemoc.xdsmlframework.commons diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml index b89ee8af4..e091f5cb7 100644 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml +++ b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml @@ -25,7 +25,7 @@ unpack="false"/> { diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF index 8d5cef442..9d8b7eeca 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.gemoc.commons.eclipse.ui, org.gemoc.executionframework.ui, org.gemoc.xdsmlframework.ide.ui, - org.gemoc.xdsmlframework.api, + org.eclipse.gemoc.xdsmlframework.api, org.gemoc.execution.sequential.javaxdsml.api, org.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", org.eclipse.emf.ecore.xmi;bundle-version="2.10.2", diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java index 08de3409d..47cf5e32d 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java @@ -155,9 +155,9 @@ private void updateManifestFile(IProject project){ // complement manifest ManifestChanger changer = new ManifestChanger(project); try { - changer.addPluginDependency(org.gemoc.xdsmlframework.api.Activator.PLUGIN_ID, "0.1.0", true, true); + changer.addPluginDependency(org.eclipse.gemoc.xdsmlframework.api.Activator.PLUGIN_ID, "0.1.0", true, true); changer.addPluginDependency("org.eclipse.emf.ecore.xmi", "2.8.0", true, true); - changer.addPluginDependency("org.gemoc.xdsmlframework.api"); + changer.addPluginDependency("org.eclipse.gemoc.xdsmlframework.api"); changer.addPluginDependency("org.gemoc.execution.sequential.javaxdsml.api"); changer.addPluginDependency("org.gemoc.executionframework.engine"); // changer.addSingleton(); diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java index 285c171cb..b8f79b5a5 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java @@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; import org.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtensionPoint; -import org.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtensionPoint; +import org.eclipse.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtensionPoint; import org.gemoc.xdsmlframework.ide.ui.builder.pde.PluginXMLHelper; import org.jdom2.Element; import org.osgi.framework.BundleException; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF index 8a7200471..843796b3f 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF @@ -7,12 +7,12 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.ecore;bundle-version="2.10.2", org.eclipse.gemoc.timeline;bundle-version="1.0.0", - org.gemoc.xdsmlframework.api;bundle-version="0.1.0", + org.eclipse.gemoc.xdsmlframework.api;bundle-version="0.1.0", fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: fr.inria.diverse.trace.gemoc.api; uses:="org.eclipse.emf.ecore, org.gemoc.executionframework.engine.mse, org.gemoc.xdsmlframework.api.engine_addon, org.eclipse.gemoc.timeline.view" +Export-Package: fr.inria.diverse.trace.gemoc.api; uses:="org.eclipse.emf.ecore, org.gemoc.executionframework.engine.mse, org.eclipse.gemoc.xdsmlframework.api.engine_addon, org.eclipse.gemoc.timeline.view" diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java index b4037783d..64f675c04 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java @@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.State; diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java index b55afd7c9..1d2eb304b 100644 --- a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java +++ b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java @@ -14,7 +14,7 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.Step; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF index ca4f9ac02..ba898bb64 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: com.google.guava, fr.inria.diverse.melange.metamodel, org.eclipse.xtext.ui, org.eclipse.jdt.ui, - org.gemoc.xdsmlframework.api, + org.eclipse.gemoc.xdsmlframework.api, fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", fr.inria.diverse.opsemanticsview.gen;bundle-version="1.0.0" Bundle-ClassPath: . diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index 4d694639c..60a04b90a 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -39,7 +39,7 @@ import org.eclipse.jdt.core.IPackageFragmentRoot import org.eclipse.jdt.core.JavaCore import org.eclipse.ui.PlatformUI import org.eclipse.xtend.lib.annotations.Accessors -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint import org.jdom2.Element import org.jdom2.filter.ElementFilter @@ -203,12 +203,12 @@ class GenericEngineTraceAddonGenerator { ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.commons.eclipse") ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.gemoc") ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.gemoc.api") - ManifestUtil.addToPluginManifest(project, m, "org.gemoc.xdsmlframework.api") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.xdsmlframework.api") ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.commons.model") ManifestUtil.addToPluginManifest(project, m, "org.gemoc.sequential_addons.multidimensional.timeline") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.timeline") ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.commons") - ManifestUtil.addToPluginManifest(project, m, "org.gemoc.xdsmlframework.api") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.xdsmlframework.api") ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.commons.model") ManifestUtil.setRequiredExecutionEnvironmentToPluginManifest(project, m, "JavaSE-1.8") } diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend index bbc789963..c64091bef 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -440,7 +440,7 @@ private def String generateAddStateUsingListenerMethods() { @SuppressWarnings("unchecked") @Override - public void addState(List changes) { + public void addState(List changes) { if (lastState == null) { addInitialState(); }««« end if laststate null @@ -449,12 +449,12 @@ private def String generateAddStateUsingListenerMethods() { // We start by a (shallow) copy of the last state // But we will have to rollback a little by replacing values that changed «stateFQN» newState = copyState(lastState); - for (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) { + for (org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange modelChange : changes) { EObject o = modelChange.getChangedObject(); «IF !newConcreteClassesNotEmpty.empty» // We only look at constructable objects that have mutable fields // Here we have nothing to rollback, just a new object to add - if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange) { + if (modelChange instanceof org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange) { stateChanged = true; ««« Loop over all classes that may be constructed and that have mutable fields «FOR c : partialOrderSort(findTopSuperClasses(newConcreteClassesNotEmpty)).filter[c|shouldHaveAddNewObjectToStateMethod(c)]» @@ -467,7 +467,7 @@ private def String generateAddStateUsingListenerMethods() { // We only look at constructable objects that have mutable fields // Here we must rollback to remove the values of the removed object from the copied state - else if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.RemovedObjectModelChange) { + else if (modelChange instanceof org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.RemovedObjectModelChange) { stateChanged = true; ««« Loop over all classes that may type something constructed and that have mutable fields «FOR c : partialOrderSort(newClassesNotEmpty)» @@ -488,10 +488,10 @@ private def String generateAddStateUsingListenerMethods() { // Here we must look at non-collection mutable fields // We must rollback the last values from the copied state, and add new values as well // ie. mix of remove and new - «IF !newConcreteClassesNotEmpty.empty» else «ENDIF» if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) { + «IF !newConcreteClassesNotEmpty.empty» else «ENDIF» if (modelChange instanceof org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) { stateChanged = true; - org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange; + org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange modelChange_cast = (org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange) modelChange; «EStructuralFeature.canonicalName » p = modelChange_cast.getChangedField(); «FOR c : partialOrderSort(mutableClassesWithNonCollectionMutableFields)» «val nonCollectionMutableFields = traceability.getMutablePropertiesOf(c).filter[p|!p.many]» @@ -544,8 +544,8 @@ private def String generateAddStateUsingListenerMethods() { // Here we look at collection mutable fields // We must first manually find out if the collection changed... // If it changed we must rollback the last values from the copied state, and add new values as well - «IF !newConcreteClassesNotEmpty.empty || !mutableClassesWithNonCollectionMutableFields.empty » else «ENDIF» if (modelChange instanceof org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange) { - org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange modelChange_cast = (org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange) modelChange; + «IF !newConcreteClassesNotEmpty.empty || !mutableClassesWithNonCollectionMutableFields.empty » else «ENDIF» if (modelChange instanceof org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange) { + org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange modelChange_cast = (org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange) modelChange; «EStructuralFeature.canonicalName » p = modelChange_cast.getChangedField(); «FOR c : partialOrderSort(mutableClassesWithCollectionMutableFields) » «val collectionMutableFields = traceability.getMutablePropertiesOf(c).filter[p|p.many]» diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF index d60d957e5..1b55da5a8 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: fr.inria.diverse.trace.gemoc;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.gemoc.timeline;bundle-version="1.0.0", - org.gemoc.xdsmlframework.api;bundle-version="0.1.0", + org.eclipse.gemoc.xdsmlframework.api;bundle-version="0.1.0", org.eclipse.xtend.lib, org.gemoc.executionframework.engine;bundle-version="0.1.0", org.eclipse.emf.transaction;bundle-version="1.8.0", diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index 7302a6b32..5a3bdc17f 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -39,12 +39,12 @@ import org.eclipse.emf.transaction.RecordingCommand import org.eclipse.emf.transaction.util.TransactionUtil import org.eclipse.gemoc.commons.eclipse.emf.EMFResource import org.gemoc.executionframework.engine.core.CommandExecution -import org.gemoc.xdsmlframework.api.core.IExecutionContext -import org.gemoc.xdsmlframework.api.core.IExecutionEngine -import org.gemoc.xdsmlframework.api.engine_addon.DefaultEngineAddon -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionContext +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.DefaultEngineAddon +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDimensionalTraceAddon, State, TracedObject, Dimension, Value> { diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java index c3db21a03..c0c20d7c0 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -28,11 +28,11 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.resource.Resource; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.RemovedObjectModelChange; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NonCollectionFieldModelChange; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.PotentialCollectionFieldModelChange; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.RemovedObjectModelChange; import org.eclipse.gemoc.xdsmlframework.commons.DynamicAnnotationHelper; import fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue; diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java index 6aaa93124..a9e82c5a7 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java @@ -14,9 +14,9 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; -import org.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.BatchModelChangeListener; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange; import fr.inria.diverse.trace.commons.model.trace.Dimension; import fr.inria.diverse.trace.commons.model.trace.State; diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF index 8db5bd70f..f7583c13d 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui, fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", fr.inria.diverse.trace.gemoc;bundle-version="1.0.0", org.gemoc.executionframework.ui, - org.gemoc.xdsmlframework.api;bundle-version="0.1.0", + org.eclipse.gemoc.xdsmlframework.api;bundle-version="0.1.0", org.eclipse.emf.ecore.xmi, org.eclipse.emf.compare, fr.inria.diverse.trace.commons.model;bundle-version="2.3.0" diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java index 2658355ee..2def09798 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java @@ -36,7 +36,7 @@ import org.eclipse.ui.part.ViewPart; import org.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; import org.gemoc.sequential_addons.diffviewer.Activator; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon; diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF index 67b38125d..e9ffc1a3c 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.gemoc.timeline;bundle-version="1.0.0", org.gemoc.executionframework.engine.ui, fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", fr.obeo.dsl.debug.ide, - org.gemoc.xdsmlframework.api, + org.eclipse.gemoc.xdsmlframework.api, org.gemoc.executionframework.debugger Import-Package: javafx.animation;version="2.0.0", javafx.application;version="2.0.0", diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java index 713ef1184..0f56289f6 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java @@ -59,10 +59,10 @@ import org.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; import org.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; import org.gemoc.sequential_addons.multidimensional.timeline.Activator; -import org.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -import org.gemoc.xdsmlframework.api.core.ExecutionMode; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.core.IRunConfiguration; +import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; +import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration; import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; import fr.inria.diverse.trace.commons.model.trace.Dimension; diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF index 02934593a..c6212b3b1 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.fx.ui.workbench3, org.gemoc.executionframework.ui, - org.gemoc.xdsmlframework.api, + org.eclipse.gemoc.xdsmlframework.api, org.eclipse.emf.ecore;visibility:=reexport, fr.inria.diverse.trace.gemoc.api, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java index 082c2ef72..53fab117b 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java +++ b/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java @@ -29,7 +29,7 @@ import org.gemoc.sequential_addons.stategraph.layout.StateGraphLayoutCommand; import org.gemoc.sequential_addons.stategraph.logic.StateGraph; import org.gemoc.sequential_addons.stategraph.logic.StateVertex; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon; diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF index 1f36d89fb..135b5fcab 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: com.google.guava, fr.inria.diverse.trace.commons.testutil;bundle-version="1.0.0", org.eclipse.emf.transaction;bundle-version="1.8.0", fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="1.0.0", - org.gemoc.xdsmlframework.api, + org.eclipse.gemoc.xdsmlframework.api, org.gemoc.executionframework.engine, org.gemoc.execution.sequential.javaengine;bundle-version="2.3.0", org.eclipse.jdt.junit.core, diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend index 5524fd25c..c5397bc8c 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend @@ -8,9 +8,9 @@ import org.eclipse.emf.common.util.URI import org.eclipse.emf.ecore.EObject import org.gemoc.activitydiagram.sequential.xactivitydiagram.activitydiagram.NamedElement; import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine -import org.gemoc.xdsmlframework.api.core.IRunConfiguration -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension -import org.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint +import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension +import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint class BenchmarkRunConfiguration implements IRunConfiguration { diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend index f5b9d9ffd..dc53d5714 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend @@ -2,8 +2,8 @@ package fr.inria.diverse.trace.benchmark.utils import org.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext import org.gemoc.executionframework.engine.commons.EngineContextException -import org.gemoc.xdsmlframework.api.core.ExecutionMode -import org.gemoc.xdsmlframework.api.core.IRunConfiguration +import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode +import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration class BenchmarkExecutionModelContext extends SequentialModelExecutionContext { diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/EngineHelper.java b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/EngineHelper.java index b60f6f470..2fca579c1 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/EngineHelper.java +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/EngineHelper.java @@ -22,10 +22,10 @@ import org.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext; import org.gemoc.executionframework.engine.Activator; import org.gemoc.executionframework.engine.commons.EngineContextException; -import org.gemoc.xdsmlframework.api.core.ExecutionMode; -import org.gemoc.xdsmlframework.api.core.IExecutionContext; -import org.gemoc.xdsmlframework.api.core.IExecutionEngine; -import org.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; +import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionContext; +import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; +import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; import fr.inria.diverse.trace.benchmark.runconf.BenchmarkRunConfiguration; import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; From b940bc0c4d1c87c3cf48e76329327729343912e2 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 23:10:25 +0200 Subject: [PATCH 219/267] rename org.gemoc.executionframework.reflectivetrace.model in org.eclipse.gemoc --- .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../model/GemocExecutionEngineTrace.aird | 0 .../model/GemocExecutionEngineTrace.ecore | 0 .../model/GemocExecutionEngineTrace.genmodel | 0 .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../reflectivetrace/gemoc_execution_trace/Branch.java | 0 .../reflectivetrace/gemoc_execution_trace/Choice.java | 0 .../reflectivetrace/gemoc_execution_trace/ContextState.java | 0 .../gemoc_execution_trace/ExecutionTraceModel.java | 0 .../gemoc_execution_trace/Gemoc_execution_traceFactory.java | 0 .../gemoc_execution_trace/Gemoc_execution_tracePackage.java | 0 .../reflectivetrace/gemoc_execution_trace/ModelState.java | 0 .../reflectivetrace/gemoc_execution_trace/SolverState.java | 0 .../reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java | 0 .../reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java | 0 .../gemoc_execution_trace/impl/ContextStateImpl.java | 0 .../gemoc_execution_trace/impl/ExecutionTraceModelImpl.java | 0 .../impl/Gemoc_execution_traceFactoryImpl.java | 0 .../impl/Gemoc_execution_tracePackageImpl.java | 0 .../gemoc_execution_trace/impl/ModelStateImpl.java | 0 .../gemoc_execution_trace/impl/SolverStateImpl.java | 0 .../util/Gemoc_execution_traceAdapterFactory.java | 0 .../gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java | 0 31 files changed, 0 insertions(+), 0 deletions(-) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/.checkstyle (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/.classpath (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/.gitignore (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/.project (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/META-INF/MANIFEST.MF (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/about.html (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/build.properties (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/model/GemocExecutionEngineTrace.aird (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/model/GemocExecutionEngineTrace.ecore (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/model/GemocExecutionEngineTrace.genmodel (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/plugin.properties (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/plugin.xml (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/pom.xml (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java (100%) rename framework/framework_commons/plugins/{org.gemoc.executionframework.reflectivetrace.model => org.eclipse.gemoc.executionframework.reflectivetrace.model}/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java (100%) diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.checkstyle b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.checkstyle similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.checkstyle rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.checkstyle diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.classpath b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.classpath similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.classpath rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.classpath diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.gitignore b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.gitignore similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.gitignore rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.gitignore diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.project b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.project similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/.project rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.project diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/about.html b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/about.html similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/about.html rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/about.html diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/build.properties b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/build.properties similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/build.properties rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/build.properties diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.aird b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.aird similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.aird rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.aird diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.ecore b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.ecore similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.ecore rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.ecore diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.genmodel b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.genmodel similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.genmodel rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/model/GemocExecutionEngineTrace.genmodel diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/plugin.properties b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/plugin.properties similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/plugin.properties rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/plugin.properties diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/plugin.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/plugin.xml similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/plugin.xml rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/plugin.xml diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/pom.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/pom.xml similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/pom.xml rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/pom.xml diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java diff --git a/framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java similarity index 100% rename from framework/framework_commons/plugins/org.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java From c873d77cc6d1e9cc7ce18bcf1dc71f64c5bf33dd Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 23:11:14 +0200 Subject: [PATCH 220/267] package rename org.gemoc.executionframework.reflectivetrace.model in org.eclipse.gemoc.executionframework.reflectivetrace.model --- .../META-INF/MANIFEST.MF | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 8 +- .../plugin.xml | 2 +- .../pom.xml | 2 +- .../gemoc_execution_trace/Branch.java | 26 +-- .../gemoc_execution_trace/Choice.java | 60 +++--- .../gemoc_execution_trace/ContextState.java | 30 +-- .../ExecutionTraceModel.java | 22 +-- .../Gemoc_execution_traceFactory.java | 6 +- .../Gemoc_execution_tracePackage.java | 186 +++++++++--------- .../gemoc_execution_trace/ModelState.java | 20 +- .../gemoc_execution_trace/SolverState.java | 18 +- .../impl/BranchImpl.java | 14 +- .../impl/ChoiceImpl.java | 24 +-- .../impl/ContextStateImpl.java | 18 +- .../impl/ExecutionTraceModelImpl.java | 18 +- .../Gemoc_execution_traceFactoryImpl.java | 4 +- .../Gemoc_execution_tracePackageImpl.java | 20 +- .../impl/ModelStateImpl.java | 12 +- .../impl/SolverStateImpl.java | 10 +- .../Gemoc_execution_traceAdapterFactory.java | 30 +-- .../util/Gemoc_execution_traceSwitch.java | 6 +- .../META-INF/MANIFEST.MF | 2 +- framework/framework_commons/pom.xml | 2 +- .../feature.xml | 2 +- .../trace/benchmark/BenchmarkData.xtend | 2 +- .../benchmark/BenchmarkMemoryTestSuite.xtend | 2 +- 28 files changed, 275 insertions(+), 275 deletions(-) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java (59%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java (55%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java (58%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java (61%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java (87%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java (64%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java (59%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java (63%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java (90%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java (92%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java (91%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java (85%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java (96%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java (94%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java (90%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java (90%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java (75%) rename framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/{ => eclipse}/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java (96%) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF index 7c622b345..be79ddebe 100644 --- a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.gemoc.executionframework.engine.Activator Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.commons.eclipse, org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", - org.gemoc.executionframework.reflectivetrace.model;visibility:=reexport, + org.eclipse.gemoc.executionframework.reflectivetrace.model;visibility:=reexport, org.eclipse.gemoc.commons.eclipse.pde;bundle-version="0.1.0", org.eclipse.xtend.lib, org.eclipse.emf.transaction;bundle-version="1.8.0", diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.project b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.project index a8e457155..3d13da12d 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.project +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/.project @@ -1,6 +1,6 @@ - org.gemoc.executionframework.reflectivetrace.model + org.eclipse.gemoc.executionframework.reflectivetrace.model diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF index 81593bc43..b3158a973 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.gemoc.executionframework.reflectivetrace.model;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.executionframework.reflectivetrace.model;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: INRIA Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace, - org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl, - org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.util +Export-Package: org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace, + org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl, + org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.util Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/plugin.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/plugin.xml index 1bc90924c..597971062 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/plugin.xml +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/plugin.xml @@ -10,7 +10,7 @@ diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/pom.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/pom.xml index 30f1df078..5be5976f3 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/pom.xml +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/pom.xml @@ -9,7 +9,7 @@ 2.3.0-SNAPSHOT - org.gemoc.executionframework.reflectivetrace.model + org.eclipse.gemoc.executionframework.reflectivetrace.model eclipse-plugin 2.3.0-SNAPSHOT \ No newline at end of file diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java similarity index 59% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java index 0fe4b05da..0553339ab 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Branch.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; import org.eclipse.emf.common.util.EList; @@ -25,12 +25,12 @@ * The following features are supported: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStartIndex Start Index}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStopIndex Stop Index}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getChoices Choices}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStartIndex Start Index}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStopIndex Stop Index}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getChoices Choices}
      • *
    * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch() * @model * @generated */ @@ -45,14 +45,14 @@ public interface Branch extends EObject { * * @return the value of the 'Start Index' attribute. * @see #setStartIndex(int) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch_StartIndex() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch_StartIndex() * @model * @generated */ int getStartIndex(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStartIndex Start Index}' attribute. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStartIndex Start Index}' attribute. * * * @param value the new value of the 'Start Index' attribute. @@ -71,14 +71,14 @@ public interface Branch extends EObject { * * @return the value of the 'Stop Index' attribute. * @see #setStopIndex(int) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch_StopIndex() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch_StopIndex() * @model * @generated */ int getStopIndex(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStopIndex Stop Index}' attribute. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStopIndex Stop Index}' attribute. * * * @param value the new value of the 'Stop Index' attribute. @@ -89,8 +89,8 @@ public interface Branch extends EObject { /** * Returns the value of the 'Choices' reference list. - * The list contents are of type {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice}. - * It is bidirectional and its opposite is '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch Branch}'. + * The list contents are of type {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice}. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch Branch}'. * *

    * If the meaning of the 'Choices' reference list isn't clear, @@ -98,8 +98,8 @@ public interface Branch extends EObject { *

    * * @return the value of the 'Choices' reference list. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch_Choices() - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getBranch_Choices() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch * @model opposite="branch" * @generated */ diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java similarity index 55% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java index 90313de9e..9cd3fddb3 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -25,24 +25,24 @@ * The following features are supported: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getNextChoices Next Choices}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPossibleLogicalSteps Possible Logical Steps}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getChosenLogicalStep Chosen Logical Step}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState Context State}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getSelectedNextChoice Selected Next Choice}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch Branch}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getNextChoices Next Choices}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPossibleLogicalSteps Possible Logical Steps}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getChosenLogicalStep Chosen Logical Step}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState Context State}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getSelectedNextChoice Selected Next Choice}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch Branch}
      • *
    * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice() * @model * @generated */ public interface Choice extends EObject { /** * Returns the value of the 'Next Choices' reference list. - * The list contents are of type {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice}. - * It is bidirectional and its opposite is '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}'. + * The list contents are of type {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice}. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}'. * *

    * If the meaning of the 'Next Choices' reference list isn't clear, @@ -50,8 +50,8 @@ public interface Choice extends EObject { *

    * * @return the value of the 'Next Choices' reference list. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_NextChoices() - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_NextChoices() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice * @model opposite="previousChoice" * @generated */ @@ -67,7 +67,7 @@ public interface Choice extends EObject { *

    * * @return the value of the 'Possible Logical Steps' containment reference list. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_PossibleLogicalSteps() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_PossibleLogicalSteps() * @model containment="true" * @generated */ @@ -83,14 +83,14 @@ public interface Choice extends EObject { * * @return the value of the 'Chosen Logical Step' reference. * @see #setChosenLogicalStep(Step) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_ChosenLogicalStep() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_ChosenLogicalStep() * @model * @generated */ Step getChosenLogicalStep(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getChosenLogicalStep Chosen Logical Step}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getChosenLogicalStep Chosen Logical Step}' reference. * * * @param value the new value of the 'Chosen Logical Step' reference. @@ -101,7 +101,7 @@ public interface Choice extends EObject { /** * Returns the value of the 'Context State' containment reference. - * It is bidirectional and its opposite is '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice Choice}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice Choice}'. * *

    * If the meaning of the 'Context State' containment reference isn't clear, @@ -110,15 +110,15 @@ public interface Choice extends EObject { * * @return the value of the 'Context State' containment reference. * @see #setContextState(ContextState) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_ContextState() - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_ContextState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice * @model opposite="choice" containment="true" * @generated */ ContextState getContextState(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState Context State}' containment reference. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState Context State}' containment reference. * * * @param value the new value of the 'Context State' containment reference. @@ -129,7 +129,7 @@ public interface Choice extends EObject { /** * Returns the value of the 'Previous Choice' reference. - * It is bidirectional and its opposite is '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getNextChoices Next Choices}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getNextChoices Next Choices}'. * *

    * If the meaning of the 'Previous Choice' reference isn't clear, @@ -138,15 +138,15 @@ public interface Choice extends EObject { * * @return the value of the 'Previous Choice' reference. * @see #setPreviousChoice(Choice) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_PreviousChoice() - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getNextChoices + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_PreviousChoice() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getNextChoices * @model opposite="nextChoices" * @generated */ Choice getPreviousChoice(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}' reference. * * * @param value the new value of the 'Previous Choice' reference. @@ -165,14 +165,14 @@ public interface Choice extends EObject { * * @return the value of the 'Selected Next Choice' reference. * @see #setSelectedNextChoice(Choice) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_SelectedNextChoice() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_SelectedNextChoice() * @model * @generated */ Choice getSelectedNextChoice(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getSelectedNextChoice Selected Next Choice}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getSelectedNextChoice Selected Next Choice}' reference. * * * @param value the new value of the 'Selected Next Choice' reference. @@ -183,7 +183,7 @@ public interface Choice extends EObject { /** * Returns the value of the 'Branch' reference. - * It is bidirectional and its opposite is '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getChoices Choices}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getChoices Choices}'. * *

    * If the meaning of the 'Branch' reference isn't clear, @@ -192,15 +192,15 @@ public interface Choice extends EObject { * * @return the value of the 'Branch' reference. * @see #setBranch(Branch) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_Branch() - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getChoices + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getChoice_Branch() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getChoices * @model opposite="choices" required="true" * @generated */ Branch getBranch(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch Branch}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch Branch}' reference. * * * @param value the new value of the 'Branch' reference. diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java similarity index 58% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java index c81e80d4d..230f64cfe 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ContextState.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; import org.eclipse.emf.ecore.EObject; @@ -23,19 +23,19 @@ * The following features are supported: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState Model State}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getSolverState Solver State}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice Choice}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState Model State}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getSolverState Solver State}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice Choice}
      • *
    * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState() * @model * @generated */ public interface ContextState extends EObject { /** * Returns the value of the 'Model State' reference. - * It is bidirectional and its opposite is '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getContextState Context State}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getContextState Context State}'. * *

    * If the meaning of the 'Model State' reference isn't clear, @@ -44,15 +44,15 @@ public interface ContextState extends EObject { * * @return the value of the 'Model State' reference. * @see #setModelState(ModelState) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState_ModelState() - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getContextState + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState_ModelState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getContextState * @model opposite="contextState" required="true" * @generated */ ModelState getModelState(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState Model State}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState Model State}' reference. * * * @param value the new value of the 'Model State' reference. @@ -71,14 +71,14 @@ public interface ContextState extends EObject { * * @return the value of the 'Solver State' containment reference. * @see #setSolverState(SolverState) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState_SolverState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState_SolverState() * @model containment="true" required="true" * @generated */ SolverState getSolverState(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getSolverState Solver State}' containment reference. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getSolverState Solver State}' containment reference. * * * @param value the new value of the 'Solver State' containment reference. @@ -89,7 +89,7 @@ public interface ContextState extends EObject { /** * Returns the value of the 'Choice' container reference. - * It is bidirectional and its opposite is '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState Context State}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState Context State}'. * *

    * If the meaning of the 'Choice' container reference isn't clear, @@ -98,15 +98,15 @@ public interface ContextState extends EObject { * * @return the value of the 'Choice' container reference. * @see #setChoice(Choice) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState_Choice() - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getContextState_Choice() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState * @model opposite="contextState" transient="false" * @generated */ Choice getChoice(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice Choice}' container reference. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice Choice}' container reference. * * * @param value the new value of the 'Choice' container reference. diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java similarity index 61% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java index a89790a0c..3e283d0c8 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ExecutionTraceModel.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; import org.eclipse.emf.common.util.EList; @@ -25,19 +25,19 @@ * The following features are supported: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getChoices Choices}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getBranches Branches}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getReachedStates Reached States}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getChoices Choices}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getBranches Branches}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getReachedStates Reached States}
      • *
    * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel() * @model * @generated */ public interface ExecutionTraceModel extends EObject { /** * Returns the value of the 'Choices' containment reference list. - * The list contents are of type {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice}. + * The list contents are of type {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice}. * *

    * If the meaning of the 'Choices' containment reference list isn't clear, @@ -45,7 +45,7 @@ public interface ExecutionTraceModel extends EObject { *

    * * @return the value of the 'Choices' containment reference list. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel_Choices() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel_Choices() * @model containment="true" * @generated */ @@ -53,7 +53,7 @@ public interface ExecutionTraceModel extends EObject { /** * Returns the value of the 'Branches' containment reference list. - * The list contents are of type {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch}. + * The list contents are of type {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch}. * *

    * If the meaning of the 'Branches' containment reference list isn't clear, @@ -61,7 +61,7 @@ public interface ExecutionTraceModel extends EObject { *

    * * @return the value of the 'Branches' containment reference list. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel_Branches() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel_Branches() * @model containment="true" * @generated */ @@ -69,7 +69,7 @@ public interface ExecutionTraceModel extends EObject { /** * Returns the value of the 'Reached States' containment reference list. - * The list contents are of type {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState}. + * The list contents are of type {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState}. * *

    * If the meaning of the 'Reached States' containment reference list isn't clear, @@ -77,7 +77,7 @@ public interface ExecutionTraceModel extends EObject { *

    * * @return the value of the 'Reached States' containment reference list. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel_ReachedStates() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getExecutionTraceModel_ReachedStates() * @model containment="true" * @generated */ diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java similarity index 87% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java index d18a2260f..b2e2e7261 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_traceFactory.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; import org.eclipse.emf.ecore.EFactory; @@ -19,7 +19,7 @@ * The Factory for the model. * It provides a create method for each non-abstract class of the model. * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage * @generated */ public interface Gemoc_execution_traceFactory extends EFactory { @@ -29,7 +29,7 @@ public interface Gemoc_execution_traceFactory extends EFactory { * * @generated */ - Gemoc_execution_traceFactory eINSTANCE = org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_traceFactoryImpl.init(); + Gemoc_execution_traceFactory eINSTANCE = org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_traceFactoryImpl.init(); /** * Returns a new object of class 'Choice'. diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java similarity index 64% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java index 4ded4758a..0dc30c935 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Gemoc_execution_tracePackage.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -30,7 +30,7 @@ *
  • and each data type
    • * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_traceFactory + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_traceFactory * @model kind="package" * @generated */ @@ -65,14 +65,14 @@ public interface Gemoc_execution_tracePackage extends EPackage { * * @generated */ - Gemoc_execution_tracePackage eINSTANCE = org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl.init(); + Gemoc_execution_tracePackage eINSTANCE = org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl.init(); /** - * The meta object id for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl Choice}' class. + * The meta object id for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl Choice}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getChoice() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getChoice() * @generated */ int CHOICE = 0; @@ -159,11 +159,11 @@ public interface Gemoc_execution_tracePackage extends EPackage { int CHOICE_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl Execution Trace Model}' class. + * The meta object id for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl Execution Trace Model}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getExecutionTraceModel() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getExecutionTraceModel() * @generated */ int EXECUTION_TRACE_MODEL = 1; @@ -214,11 +214,11 @@ public interface Gemoc_execution_tracePackage extends EPackage { int EXECUTION_TRACE_MODEL_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl Solver State}' class. + * The meta object id for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl Solver State}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getSolverState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getSolverState() * @generated */ int SOLVER_STATE = 2; @@ -260,11 +260,11 @@ public interface Gemoc_execution_tracePackage extends EPackage { int SOLVER_STATE_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl Model State}' class. + * The meta object id for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl Model State}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getModelState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getModelState() * @generated */ int MODEL_STATE = 3; @@ -306,11 +306,11 @@ public interface Gemoc_execution_tracePackage extends EPackage { int MODEL_STATE_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl Context State}' class. + * The meta object id for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl Context State}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getContextState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getContextState() * @generated */ int CONTEXT_STATE = 4; @@ -361,11 +361,11 @@ public interface Gemoc_execution_tracePackage extends EPackage { int CONTEXT_STATE_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl Branch}' class. + * The meta object id for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl Branch}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getBranch() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getBranch() * @generated */ int BRANCH = 5; @@ -419,287 +419,287 @@ public interface Gemoc_execution_tracePackage extends EPackage { * The meta object id for the 'ISerializable' data type. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getISerializable() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getISerializable() * @generated */ int ISERIALIZABLE = 6; /** - * Returns the meta object for class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice Choice}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice Choice}'. * * * @return the meta object for class 'Choice'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice * @generated */ EClass getChoice(); /** - * Returns the meta object for the reference list '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getNextChoices Next Choices}'. + * Returns the meta object for the reference list '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getNextChoices Next Choices}'. * * * @return the meta object for the reference list 'Next Choices'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getNextChoices() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getNextChoices() * @see #getChoice() * @generated */ EReference getChoice_NextChoices(); /** - * Returns the meta object for the containment reference list '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPossibleLogicalSteps Possible Logical Steps}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPossibleLogicalSteps Possible Logical Steps}'. * * * @return the meta object for the containment reference list 'Possible Logical Steps'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPossibleLogicalSteps() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPossibleLogicalSteps() * @see #getChoice() * @generated */ EReference getChoice_PossibleLogicalSteps(); /** - * Returns the meta object for the reference '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getChosenLogicalStep Chosen Logical Step}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getChosenLogicalStep Chosen Logical Step}'. * * * @return the meta object for the reference 'Chosen Logical Step'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getChosenLogicalStep() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getChosenLogicalStep() * @see #getChoice() * @generated */ EReference getChoice_ChosenLogicalStep(); /** - * Returns the meta object for the containment reference '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState Context State}'. + * Returns the meta object for the containment reference '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState Context State}'. * * * @return the meta object for the containment reference 'Context State'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getContextState() * @see #getChoice() * @generated */ EReference getChoice_ContextState(); /** - * Returns the meta object for the reference '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice Previous Choice}'. * * * @return the meta object for the reference 'Previous Choice'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getPreviousChoice() * @see #getChoice() * @generated */ EReference getChoice_PreviousChoice(); /** - * Returns the meta object for the reference '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getSelectedNextChoice Selected Next Choice}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getSelectedNextChoice Selected Next Choice}'. * * * @return the meta object for the reference 'Selected Next Choice'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getSelectedNextChoice() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getSelectedNextChoice() * @see #getChoice() * @generated */ EReference getChoice_SelectedNextChoice(); /** - * Returns the meta object for the reference '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch Branch}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch Branch}'. * * * @return the meta object for the reference 'Branch'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice#getBranch() * @see #getChoice() * @generated */ EReference getChoice_Branch(); /** - * Returns the meta object for class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel Execution Trace Model}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel Execution Trace Model}'. * * * @return the meta object for class 'Execution Trace Model'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel * @generated */ EClass getExecutionTraceModel(); /** - * Returns the meta object for the containment reference list '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getChoices Choices}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getChoices Choices}'. * * * @return the meta object for the containment reference list 'Choices'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getChoices() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getChoices() * @see #getExecutionTraceModel() * @generated */ EReference getExecutionTraceModel_Choices(); /** - * Returns the meta object for the containment reference list '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getBranches Branches}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getBranches Branches}'. * * * @return the meta object for the containment reference list 'Branches'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getBranches() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getBranches() * @see #getExecutionTraceModel() * @generated */ EReference getExecutionTraceModel_Branches(); /** - * Returns the meta object for the containment reference list '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getReachedStates Reached States}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getReachedStates Reached States}'. * * * @return the meta object for the containment reference list 'Reached States'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getReachedStates() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel#getReachedStates() * @see #getExecutionTraceModel() * @generated */ EReference getExecutionTraceModel_ReachedStates(); /** - * Returns the meta object for class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState Solver State}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState Solver State}'. * * * @return the meta object for class 'Solver State'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState * @generated */ EClass getSolverState(); /** - * Returns the meta object for the reference '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getModel Model}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getModel Model}'. * * * @return the meta object for the reference 'Model'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getModel() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getModel() * @see #getSolverState() * @generated */ EReference getSolverState_Model(); /** - * Returns the meta object for the attribute '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getSerializableModel Serializable Model}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getSerializableModel Serializable Model}'. * * * @return the meta object for the attribute 'Serializable Model'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getSerializableModel() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getSerializableModel() * @see #getSolverState() * @generated */ EAttribute getSolverState_SerializableModel(); /** - * Returns the meta object for class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState Model State}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState Model State}'. * * * @return the meta object for class 'Model State'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState * @generated */ EClass getModelState(); /** - * Returns the meta object for the reference '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getModel Model}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getModel Model}'. * * * @return the meta object for the reference 'Model'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getModel() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getModel() * @see #getModelState() * @generated */ EReference getModelState_Model(); /** - * Returns the meta object for the reference list '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getContextState Context State}'. + * Returns the meta object for the reference list '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getContextState Context State}'. * * * @return the meta object for the reference list 'Context State'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getContextState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getContextState() * @see #getModelState() * @generated */ EReference getModelState_ContextState(); /** - * Returns the meta object for class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState Context State}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState Context State}'. * * * @return the meta object for class 'Context State'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState * @generated */ EClass getContextState(); /** - * Returns the meta object for the reference '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState Model State}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState Model State}'. * * * @return the meta object for the reference 'Model State'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState() * @see #getContextState() * @generated */ EReference getContextState_ModelState(); /** - * Returns the meta object for the containment reference '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getSolverState Solver State}'. + * Returns the meta object for the containment reference '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getSolverState Solver State}'. * * * @return the meta object for the containment reference 'Solver State'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getSolverState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getSolverState() * @see #getContextState() * @generated */ EReference getContextState_SolverState(); /** - * Returns the meta object for the container reference '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice Choice}'. + * Returns the meta object for the container reference '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice Choice}'. * * * @return the meta object for the container reference 'Choice'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getChoice() * @see #getContextState() * @generated */ EReference getContextState_Choice(); /** - * Returns the meta object for class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch Branch}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch Branch}'. * * * @return the meta object for class 'Branch'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch * @generated */ EClass getBranch(); /** - * Returns the meta object for the attribute '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStartIndex Start Index}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStartIndex Start Index}'. * * * @return the meta object for the attribute 'Start Index'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStartIndex() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStartIndex() * @see #getBranch() * @generated */ EAttribute getBranch_StartIndex(); /** - * Returns the meta object for the attribute '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStopIndex Stop Index}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStopIndex Stop Index}'. * * * @return the meta object for the attribute 'Stop Index'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStopIndex() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getStopIndex() * @see #getBranch() * @generated */ EAttribute getBranch_StopIndex(); /** - * Returns the meta object for the reference list '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getChoices Choices}'. + * Returns the meta object for the reference list '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getChoices Choices}'. * * * @return the meta object for the reference list 'Choices'. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getChoices() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch#getChoices() * @see #getBranch() * @generated */ @@ -739,11 +739,11 @@ public interface Gemoc_execution_tracePackage extends EPackage { */ interface Literals { /** - * The meta object literal for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl Choice}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl Choice}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getChoice() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getChoice() * @generated */ EClass CHOICE = eINSTANCE.getChoice(); @@ -805,11 +805,11 @@ interface Literals { EReference CHOICE__BRANCH = eINSTANCE.getChoice_Branch(); /** - * The meta object literal for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl Execution Trace Model}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl Execution Trace Model}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getExecutionTraceModel() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getExecutionTraceModel() * @generated */ EClass EXECUTION_TRACE_MODEL = eINSTANCE.getExecutionTraceModel(); @@ -839,11 +839,11 @@ interface Literals { EReference EXECUTION_TRACE_MODEL__REACHED_STATES = eINSTANCE.getExecutionTraceModel_ReachedStates(); /** - * The meta object literal for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl Solver State}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl Solver State}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getSolverState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getSolverState() * @generated */ EClass SOLVER_STATE = eINSTANCE.getSolverState(); @@ -865,11 +865,11 @@ interface Literals { EAttribute SOLVER_STATE__SERIALIZABLE_MODEL = eINSTANCE.getSolverState_SerializableModel(); /** - * The meta object literal for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl Model State}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl Model State}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getModelState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getModelState() * @generated */ EClass MODEL_STATE = eINSTANCE.getModelState(); @@ -891,11 +891,11 @@ interface Literals { EReference MODEL_STATE__CONTEXT_STATE = eINSTANCE.getModelState_ContextState(); /** - * The meta object literal for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl Context State}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl Context State}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getContextState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getContextState() * @generated */ EClass CONTEXT_STATE = eINSTANCE.getContextState(); @@ -925,11 +925,11 @@ interface Literals { EReference CONTEXT_STATE__CHOICE = eINSTANCE.getContextState_Choice(); /** - * The meta object literal for the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl Branch}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl Branch}' class. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getBranch() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getBranch() * @generated */ EClass BRANCH = eINSTANCE.getBranch(); @@ -962,7 +962,7 @@ interface Literals { * The meta object literal for the 'ISerializable' data type. * * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getISerializable() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.Gemoc_execution_tracePackageImpl#getISerializable() * @generated */ EDataType ISERIALIZABLE = eINSTANCE.getISerializable(); diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java similarity index 59% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java index f2661287d..296b3dcb2 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/ModelState.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; import org.eclipse.emf.common.util.EList; @@ -25,11 +25,11 @@ * The following features are supported: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getModel Model}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getContextState Context State}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getModel Model}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getContextState Context State}
      • *
    * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getModelState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getModelState() * @model * @generated */ @@ -44,14 +44,14 @@ public interface ModelState extends EObject { * * @return the value of the 'Model' reference. * @see #setModel(EObject) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getModelState_Model() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getModelState_Model() * @model required="true" * @generated */ EObject getModel(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getModel Model}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState#getModel Model}' reference. * * * @param value the new value of the 'Model' reference. @@ -62,8 +62,8 @@ public interface ModelState extends EObject { /** * Returns the value of the 'Context State' reference list. - * The list contents are of type {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState}. - * It is bidirectional and its opposite is '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState Model State}'. + * The list contents are of type {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState}. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState Model State}'. * *

    * If the meaning of the 'Context State' reference list isn't clear, @@ -71,8 +71,8 @@ public interface ModelState extends EObject { *

    * * @return the value of the 'Context State' reference list. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getModelState_ContextState() - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getModelState_ContextState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState#getModelState * @model opposite="modelState" * @generated */ diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java similarity index 63% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java index 196f1d2e1..7c621eb39 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/SolverState.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace; import org.eclipse.emf.ecore.EObject; @@ -23,11 +23,11 @@ * The following features are supported: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getModel Model}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getSerializableModel Serializable Model}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getModel Model}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getSerializableModel Serializable Model}
      • *
    * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getSolverState() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getSolverState() * @model * @generated */ @@ -42,14 +42,14 @@ public interface SolverState extends EObject { * * @return the value of the 'Model' reference. * @see #setModel(EObject) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getSolverState_Model() + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getSolverState_Model() * @model required="true" * @generated */ EObject getModel(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getModel Model}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getModel Model}' reference. * * * @param value the new value of the 'Model' reference. @@ -68,14 +68,14 @@ public interface SolverState extends EObject { * * @return the value of the 'Serializable Model' attribute. * @see #setSerializableModel(byte[]) - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getSolverState_SerializableModel() - * @model dataType="org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ISerializable" + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#getSolverState_SerializableModel() + * @model dataType="org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ISerializable" * @generated */ byte[] getSerializableModel(); /** - * Sets the value of the '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getSerializableModel Serializable Model}' attribute. + * Sets the value of the '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState#getSerializableModel Serializable Model}' attribute. * * * @param value the new value of the 'Serializable Model' attribute. diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java similarity index 90% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java index 64ffd691d..bff132226 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/BranchImpl.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; import java.util.Collection; @@ -28,9 +28,9 @@ import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; /** * @@ -40,9 +40,9 @@ * The following features are implemented: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl#getStartIndex Start Index}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl#getStopIndex Stop Index}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl#getChoices Choices}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl#getStartIndex Start Index}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl#getStopIndex Stop Index}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.BranchImpl#getChoices Choices}
      • *
    * * @generated diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java similarity index 92% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java index fbb19a894..62282a797 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; import java.util.Collection; @@ -24,10 +24,10 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; import fr.inria.diverse.trace.commons.model.trace.Step; /** @@ -38,13 +38,13 @@ * The following features are implemented: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getNextChoices Next Choices}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getPossibleLogicalSteps Possible Logical Steps}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getChosenLogicalStep Chosen Logical Step}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getContextState Context State}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getPreviousChoice Previous Choice}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getSelectedNextChoice Selected Next Choice}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getBranch Branch}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getNextChoices Next Choices}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getPossibleLogicalSteps Possible Logical Steps}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getChosenLogicalStep Chosen Logical Step}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getContextState Context State}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getPreviousChoice Previous Choice}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getSelectedNextChoice Selected Next Choice}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ChoiceImpl#getBranch Branch}
      • *
    * * @generated diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java similarity index 91% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java index 8fa24baa2..560f49778 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ContextStateImpl.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -23,11 +23,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState; /** * @@ -37,9 +37,9 @@ * The following features are implemented: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl#getModelState Model State}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl#getSolverState Solver State}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl#getChoice Choice}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl#getModelState Model State}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl#getSolverState Solver State}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ContextStateImpl#getChoice Choice}
      • *
    * * @generated diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java similarity index 85% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java index 78cd855d6..2bba7c5ad 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ExecutionTraceModelImpl.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; import java.util.Collection; @@ -26,11 +26,11 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState; /** * @@ -40,9 +40,9 @@ * The following features are implemented: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl#getChoices Choices}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl#getBranches Branches}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl#getReachedStates Reached States}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl#getChoices Choices}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl#getBranches Branches}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ExecutionTraceModelImpl#getReachedStates Reached States}
      • *
    * * @generated diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java similarity index 96% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java index b079e6fa2..9c9004175 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_traceFactoryImpl.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.*; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.*; /** * diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java similarity index 94% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java index f40e2f7dd..847f9d947 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; import fr.inria.diverse.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EAttribute; @@ -20,14 +20,14 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_traceFactory; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_traceFactory; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState; /** * @@ -96,7 +96,7 @@ public class Gemoc_execution_tracePackageImpl extends EPackageImpl implements Ge * * * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#eNS_URI + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage#eNS_URI * @see #init() * @generated */ diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java similarity index 90% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java index ffdcdec59..8f991aa7c 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ModelStateImpl.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; import java.util.Collection; @@ -29,9 +29,9 @@ import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState; /** * @@ -41,8 +41,8 @@ * The following features are implemented: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl#getModel Model}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl#getContextState Context State}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl#getModel Model}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.ModelStateImpl#getContextState Context State}
      • *
    * * @generated diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java similarity index 90% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java index 3e46c5a33..ed96ddae7 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/SolverStateImpl.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; import org.eclipse.emf.common.notify.Notification; @@ -21,8 +21,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState; /** * @@ -32,8 +32,8 @@ * The following features are implemented: *

    *
      - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl#getModel Model}
      • - *
    • {@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl#getSerializableModel Serializable Model}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl#getModel Model}
      • + *
    • {@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl.SolverStateImpl#getSerializableModel Serializable Model}
      • *
    * * @generated diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java similarity index 75% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java index c214aa446..4c296106f 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceAdapterFactory.java @@ -10,7 +10,7 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.util; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -19,14 +19,14 @@ import org.eclipse.emf.ecore.EObject; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.*; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.*; /** * * The Adapter Factory for the model. * It provides an adapter createXXX method for each class of the model. * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage * @generated */ public class Gemoc_execution_traceAdapterFactory extends AdapterFactoryImpl { @@ -122,13 +122,13 @@ public Adapter createAdapter(Notifier target) { /** - * Creates a new adapter for an object of class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice Choice}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice Choice}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice * @generated */ public Adapter createChoiceAdapter() { @@ -136,13 +136,13 @@ public Adapter createChoiceAdapter() { } /** - * Creates a new adapter for an object of class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel Execution Trace Model}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel Execution Trace Model}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel * @generated */ public Adapter createExecutionTraceModelAdapter() { @@ -150,13 +150,13 @@ public Adapter createExecutionTraceModelAdapter() { } /** - * Creates a new adapter for an object of class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState Solver State}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState Solver State}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.SolverState * @generated */ public Adapter createSolverStateAdapter() { @@ -164,13 +164,13 @@ public Adapter createSolverStateAdapter() { } /** - * Creates a new adapter for an object of class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState Model State}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState Model State}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ModelState * @generated */ public Adapter createModelStateAdapter() { @@ -178,13 +178,13 @@ public Adapter createModelStateAdapter() { } /** - * Creates a new adapter for an object of class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState Context State}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState Context State}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState * @generated */ public Adapter createContextStateAdapter() { @@ -192,13 +192,13 @@ public Adapter createContextStateAdapter() { } /** - * Creates a new adapter for an object of class '{@link org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch Branch}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch Branch}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Branch * @generated */ public Adapter createBranchAdapter() { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java similarity index 96% rename from framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java index 733536b87..4f090db6d 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/util/Gemoc_execution_traceSwitch.java @@ -10,14 +10,14 @@ *******************************************************************************/ /** */ -package org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.util; +package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.util; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.Switch; -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.*; +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.*; /** * @@ -29,7 +29,7 @@ * until a non-null result is returned, * which is the result of the switch. * - * @see org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage + * @see org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage * @generated */ public class Gemoc_execution_traceSwitch extends Switch { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF index f765f1a87..4802f915d 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.eclipse.gemoc.xdsmlframework.api.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore, - org.gemoc.executionframework.reflectivetrace.model;bundle-version="0.1.0", + org.eclipse.gemoc.executionframework.reflectivetrace.model;bundle-version="0.1.0", org.eclipse.gemoc.commons.eclipse;bundle-version="0.1.0", org.eclipse.xtend.lib, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" diff --git a/framework/framework_commons/pom.xml b/framework/framework_commons/pom.xml index 5e381299e..20361db6d 100644 --- a/framework/framework_commons/pom.xml +++ b/framework/framework_commons/pom.xml @@ -14,7 +14,7 @@ plugins/org.eclipse.gemoc.xdsmlframework.api - plugins/org.gemoc.executionframework.reflectivetrace.model + plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model plugins/org.eclipse.gemoc.xdsmlframework.commons plugins/fr.inria.diverse.opsemanticsview.gen diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml index e091f5cb7..f72009e1f 100644 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml +++ b/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml @@ -18,7 +18,7 @@ #["generictrace.impl"], - "ExecutionTraceModelImpl" -> #["org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl", + "ExecutionTraceModelImpl" -> #["org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl", "org.gemoc.activitydiagram.sequential.xactivitydiagram.activitydiagram.impl"] } } diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkMemoryTestSuite.xtend b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkMemoryTestSuite.xtend index a5c64fb6d..472aa2c50 100644 --- a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkMemoryTestSuite.xtend +++ b/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkMemoryTestSuite.xtend @@ -31,7 +31,7 @@ import org.junit.runner.RunWith import org.junit.runners.Parameterized import org.junit.runners.Parameterized.Parameters import fr.inria.diverse.trace.commons.model.generictrace.GenericTrace -import org.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel +import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ExecutionTraceModel @RunWith(Parameterized) class BenchmarkMemoryTestSuite { From 1364ef2c484b32dbf3200e9a75a9887e14352a88 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 23:21:50 +0200 Subject: [PATCH 221/267] rename org.gemoc.modeldebugging.framework.commons.feature with org.eclipse --- framework/framework_commons/pom.xml | 2 +- .../.gitignore | 0 .../build.properties | 0 .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.gemoc.execution.sequential.javaxdsml.tests/pom.xml | 2 +- releng/org.gemoc.siriusanimation.repository/category.xml | 4 ++-- 7 files changed, 6 insertions(+), 6 deletions(-) rename framework/framework_commons/releng/{org.gemoc.modeldebugging.framework.commons.feature => org.eclipse.gemoc.modeldebugging.framework.commons.feature}/.gitignore (100%) rename framework/framework_commons/releng/{org.gemoc.modeldebugging.framework.commons.feature => org.eclipse.gemoc.modeldebugging.framework.commons.feature}/build.properties (100%) rename framework/framework_commons/releng/{org.gemoc.modeldebugging.framework.commons.feature => org.eclipse.gemoc.modeldebugging.framework.commons.feature}/feature.xml (95%) rename framework/framework_commons/releng/{org.gemoc.modeldebugging.framework.commons.feature => org.eclipse.gemoc.modeldebugging.framework.commons.feature}/pom.xml (82%) diff --git a/framework/framework_commons/pom.xml b/framework/framework_commons/pom.xml index 20361db6d..607b836b7 100644 --- a/framework/framework_commons/pom.xml +++ b/framework/framework_commons/pom.xml @@ -22,7 +22,7 @@ plugins/fr.inria.diverse.opsemanticsview.model - releng/org.gemoc.modeldebugging.framework.commons.feature + releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/.gitignore b/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/.gitignore similarity index 100% rename from framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/.gitignore rename to framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/.gitignore diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/build.properties b/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/build.properties similarity index 100% rename from framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/build.properties rename to framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/build.properties diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml b/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml similarity index 95% rename from framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml rename to framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml index f72009e1f..7feb2b67f 100644 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/feature.xml +++ b/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml @@ -1,6 +1,6 @@ diff --git a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/pom.xml b/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/pom.xml similarity index 82% rename from framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/pom.xml rename to framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/pom.xml index d6f87dd02..b71a9a848 100644 --- a/framework/framework_commons/releng/org.gemoc.modeldebugging.framework.commons.feature/pom.xml +++ b/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/pom.xml @@ -9,7 +9,7 @@ 2.3.0-SNAPSHOT - org.gemoc.modeldebugging.framework.commons.feature + org.eclipse.gemoc.modeldebugging.framework.commons.feature eclipse-feature \ No newline at end of file diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml index 9ceeaefea..b8fb17abd 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml @@ -136,7 +136,7 @@ eclipse-feature - org.gemoc.modeldebugging.framework.commons.feature + org.eclipse.gemoc.modeldebugging.framework.commons.feature 1.0.0 diff --git a/releng/org.gemoc.siriusanimation.repository/category.xml b/releng/org.gemoc.siriusanimation.repository/category.xml index a60ca6c51..eaa99da6f 100644 --- a/releng/org.gemoc.siriusanimation.repository/category.xml +++ b/releng/org.gemoc.siriusanimation.repository/category.xml @@ -30,10 +30,10 @@ - + - + From f69f0ee472c43d8a2280b355a97379459cebca13 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 23:26:47 +0200 Subject: [PATCH 222/267] rename fr.inria.diverse.opsemanticsview.gen in org.eclipse.gemoc --- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../schema/fr.inria.diverse.opsemanticsview.gen.exsd | 0 .../opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen => org.eclipse.gemoc.opsemanticsview.gen}/.classpath (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen => org.eclipse.gemoc.opsemanticsview.gen}/.project (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen => org.eclipse.gemoc.opsemanticsview.gen}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen => org.eclipse.gemoc.opsemanticsview.gen}/META-INF/MANIFEST.MF (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen => org.eclipse.gemoc.opsemanticsview.gen}/build.properties (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen => org.eclipse.gemoc.opsemanticsview.gen}/plugin.xml (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen => org.eclipse.gemoc.opsemanticsview.gen}/pom.xml (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen => org.eclipse.gemoc.opsemanticsview.gen}/schema/fr.inria.diverse.opsemanticsview.gen.exsd (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen => org.eclipse.gemoc.opsemanticsview.gen}/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend (100%) diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.classpath b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/.classpath similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.classpath rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/.classpath diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.project b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/.project similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.project rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/.project diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.settings/org.eclipse.jdt.core.prefs b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/.settings/org.eclipse.jdt.core.prefs rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/META-INF/MANIFEST.MF rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/build.properties b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/build.properties similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/build.properties rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/build.properties diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/plugin.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/plugin.xml similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/plugin.xml rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/plugin.xml diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/pom.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/pom.xml similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/pom.xml rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/pom.xml diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/schema/fr.inria.diverse.opsemanticsview.gen.exsd b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/schema/fr.inria.diverse.opsemanticsview.gen.exsd similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/schema/fr.inria.diverse.opsemanticsview.gen.exsd rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/schema/fr.inria.diverse.opsemanticsview.gen.exsd diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend From fe9e3c417e4e5cbf987ac339eb98a90ae8180830 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 23:27:35 +0200 Subject: [PATCH 223/267] rename fr.inria.diverse.opsemanticsview.gen.k3 in org.eclipse.gemoc --- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend | 0 .../gen/k3/K3OperationalSemanticsViewGenerator.xtend | 0 .../fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen.k3 => org.eclipse.gemoc.opsemanticsview.gen.k3}/.classpath (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen.k3 => org.eclipse.gemoc.opsemanticsview.gen.k3}/.project (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen.k3 => org.eclipse.gemoc.opsemanticsview.gen.k3}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen.k3 => org.eclipse.gemoc.opsemanticsview.gen.k3}/META-INF/MANIFEST.MF (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen.k3 => org.eclipse.gemoc.opsemanticsview.gen.k3}/build.properties (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen.k3 => org.eclipse.gemoc.opsemanticsview.gen.k3}/plugin.xml (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen.k3 => org.eclipse.gemoc.opsemanticsview.gen.k3}/pom.xml (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen.k3 => org.eclipse.gemoc.opsemanticsview.gen.k3}/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen.k3 => org.eclipse.gemoc.opsemanticsview.gen.k3}/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.gen.k3 => org.eclipse.gemoc.opsemanticsview.gen.k3}/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend (100%) diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.classpath b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/.classpath similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.classpath rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/.classpath diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.project b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/.project similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.project rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/.project diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.settings/org.eclipse.jdt.core.prefs b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/.settings/org.eclipse.jdt.core.prefs rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/META-INF/MANIFEST.MF similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/META-INF/MANIFEST.MF rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/META-INF/MANIFEST.MF diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/build.properties similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/build.properties rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/build.properties diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/plugin.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/plugin.xml similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/plugin.xml rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/plugin.xml diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/pom.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/pom.xml similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/pom.xml rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/pom.xml diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend From 2da60b4da06bdebd261e67dc98b84bc609688ceb Mon Sep 17 00:00:00 2001 From: dvojtise Date: Thu, 15 Jun 2017 23:29:35 +0200 Subject: [PATCH 224/267] rename fr.inria.diverse.opsemanticsview.gen* in org.eclipse.gemoc --- .../org.eclipse.gemoc.opsemanticsview.gen.k3/.project | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../org.eclipse.gemoc.opsemanticsview.gen.k3/plugin.xml | 8 ++++---- .../org.eclipse.gemoc.opsemanticsview.gen.k3/pom.xml | 2 +- .../opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend | 2 +- .../gen/k3/K3OperationalSemanticsViewGenerator.xtend | 4 ++-- .../gemoc}/opsemanticsview/gen/k3/K3StepExtractor.xtend | 2 +- .../org.eclipse.gemoc.opsemanticsview.gen/.project | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../org.eclipse.gemoc.opsemanticsview.gen/plugin.xml | 2 +- .../plugins/org.eclipse.gemoc.opsemanticsview.gen/pom.xml | 2 +- .../gen/OperationalSemanticsViewGenerator.xtend | 2 +- framework/framework_commons/pom.xml | 4 ++-- .../feature.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../gemoc/generator/TraceAddonGeneratorIntegration.xtend | 4 ++-- 16 files changed, 25 insertions(+), 25 deletions(-) rename framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/{fr/inria/diverse => org/eclipse/gemoc}/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend (97%) rename framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/{fr/inria/diverse => org/eclipse/gemoc}/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend (94%) rename framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/{fr/inria/diverse => org/eclipse/gemoc}/opsemanticsview/gen/k3/K3StepExtractor.xtend (99%) rename framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/src/{fr/inria/diverse => org/eclipse/gemoc}/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend (88%) diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/.project b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/.project index e4f0b0cdf..88e7a45b7 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/.project +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.opsemanticsview.gen.k3 + org.eclipse.gemoc.opsemanticsview.gen.k3 diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/META-INF/MANIFEST.MF index 3f796315e..df37c6980 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: K3 -Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen.k3;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.opsemanticsview.gen.k3;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: fr.inria.diverse.opsemanticsview.gen;bundle-version="1.0.0", +Require-Bundle: org.eclipse.gemoc.opsemanticsview.gen;bundle-version="1.0.0", fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", org.eclipse.jdt.core, diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/plugin.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/plugin.xml index e0b3b1fdf..b93247cdf 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/plugin.xml +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/plugin.xml @@ -2,10 +2,10 @@ - - + point="org.eclipse.gemoc.opsemanticsview.gen"> + + diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/pom.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/pom.xml index 9734db20c..741b5ae2a 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/pom.xml +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.modeldebugging.framework.commons - fr.inria.diverse.opsemanticsview.gen.k3 + org.eclipse.gemoc.opsemanticsview.gen.k3 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/org/eclipse/gemoc/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend similarity index 97% rename from framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/org/eclipse/gemoc/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend index f6cd1ca94..a0a0fa3a6 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/org/eclipse/gemoc/opsemanticsview/gen/k3/K3DynamicElementsFinder.xtend @@ -1,4 +1,4 @@ -package fr.inria.diverse.opsemanticsview.gen.k3 +package org.eclipse.gemoc.opsemanticsview.gen.k3 import opsemanticsview.OperationalSemanticsView import opsemanticsview.OpsemanticsviewFactory diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/org/eclipse/gemoc/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend similarity index 94% rename from framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/org/eclipse/gemoc/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend index 4db56fd17..126873a8e 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/org/eclipse/gemoc/opsemanticsview/gen/k3/K3OperationalSemanticsViewGenerator.xtend @@ -1,6 +1,6 @@ -package fr.inria.diverse.opsemanticsview.gen.k3 +package org.eclipse.gemoc.opsemanticsview.gen.k3 -import fr.inria.diverse.opsemanticsview.gen.OperationalSemanticsViewGenerator +import org.eclipse.gemoc.opsemanticsview.gen.OperationalSemanticsViewGenerator import fr.inria.diverse.melange.metamodel.melange.Language import java.util.Set import org.eclipse.jdt.core.IType diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/org/eclipse/gemoc/opsemanticsview/gen/k3/K3StepExtractor.xtend similarity index 99% rename from framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/org/eclipse/gemoc/opsemanticsview/gen/k3/K3StepExtractor.xtend index 96fb645d0..398367035 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/fr/inria/diverse/opsemanticsview/gen/k3/K3StepExtractor.xtend +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/src/org/eclipse/gemoc/opsemanticsview/gen/k3/K3StepExtractor.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.opsemanticsview.gen.k3 +package org.eclipse.gemoc.opsemanticsview.gen.k3 import fr.inria.diverse.commons.eclipse.callgraph.CallHierarchyHelper import java.util.ArrayList diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/.project b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/.project index da25b1615..8d46562ab 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/.project +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.opsemanticsview.gen + org.eclipse.gemoc.opsemanticsview.gen diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF index ede5e32ca..b6c89aab5 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Opsemanticsviewgen -Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.gen;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.opsemanticsview.gen;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.google.guava, @@ -11,5 +11,5 @@ Require-Bundle: com.google.guava, fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", org.eclipse.core.resources;bundle-version="3.11.1" -Export-Package: fr.inria.diverse.opsemanticsview.gen +Export-Package: org.eclipse.gemoc.opsemanticsview.gen diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/plugin.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/plugin.xml index b842e39a4..2688a0b29 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/plugin.xml +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/plugin.xml @@ -1,6 +1,6 @@ - + diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/pom.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/pom.xml index 29128f624..abf06cc34 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/pom.xml +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.modeldebugging.framework.commons - fr.inria.diverse.opsemanticsview.gen + org.eclipse.gemoc.opsemanticsview.gen 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/src/org/eclipse/gemoc/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend similarity index 88% rename from framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/src/org/eclipse/gemoc/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend index ced57f115..fa815bfb0 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/src/fr/inria/diverse/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/src/org/eclipse/gemoc/opsemanticsview/gen/OperationalSemanticsViewGenerator.xtend @@ -1,4 +1,4 @@ -package fr.inria.diverse.opsemanticsview.gen +package org.eclipse.gemoc.opsemanticsview.gen import opsemanticsview.OperationalSemanticsView import fr.inria.diverse.melange.metamodel.melange.Language diff --git a/framework/framework_commons/pom.xml b/framework/framework_commons/pom.xml index 607b836b7..de063ccb1 100644 --- a/framework/framework_commons/pom.xml +++ b/framework/framework_commons/pom.xml @@ -17,8 +17,8 @@ plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model plugins/org.eclipse.gemoc.xdsmlframework.commons - plugins/fr.inria.diverse.opsemanticsview.gen - plugins/fr.inria.diverse.opsemanticsview.gen.k3 + plugins/org.eclipse.gemoc.opsemanticsview.gen + plugins/org.eclipse.gemoc.opsemanticsview.gen.k3 plugins/fr.inria.diverse.opsemanticsview.model diff --git a/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml b/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml index 7feb2b67f..e0efbb183 100644 --- a/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml +++ b/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml @@ -39,14 +39,14 @@ unpack="false"/> Date: Thu, 15 Jun 2017 23:32:27 +0200 Subject: [PATCH 225/267] rename into org.eclipse.gemoc.opsemanticsview.model --- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF | 2 +- .../.classpath | 0 .../.project | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 0 .../model/opsemanticsview.ecore | 0 .../model/opsemanticsview.genmodel | 0 .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 2 +- .../src/opsemanticsview/ExecutionToASEntry.java | 0 .../src/opsemanticsview/OperationalSemanticsView.java | 0 .../src/opsemanticsview/OpsemanticsviewFactory.java | 0 .../src/opsemanticsview/OpsemanticsviewPackage.java | 0 .../src/opsemanticsview/Rule.java | 0 .../src/opsemanticsview/impl/ExecutionToASEntryImpl.java | 0 .../src/opsemanticsview/impl/OperationalSemanticsViewImpl.java | 0 .../src/opsemanticsview/impl/OpsemanticsviewFactoryImpl.java | 0 .../src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java | 0 .../src/opsemanticsview/impl/RuleImpl.java | 0 .../src/opsemanticsview/util/OpsemanticsviewAdapterFactory.java | 0 .../src/opsemanticsview/util/OpsemanticsviewSwitch.java | 0 framework/framework_commons/pom.xml | 2 +- .../feature.xml | 2 +- .../fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- 27 files changed, 9 insertions(+), 9 deletions(-) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/.classpath (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/.project (91%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/META-INF/MANIFEST.MF (84%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/build.properties (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/model/opsemanticsview.ecore (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/model/opsemanticsview.genmodel (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/plugin.properties (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/plugin.xml (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/pom.xml (90%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/ExecutionToASEntry.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/OperationalSemanticsView.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/OpsemanticsviewFactory.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/OpsemanticsviewPackage.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/Rule.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/impl/ExecutionToASEntryImpl.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/impl/OpsemanticsviewFactoryImpl.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/impl/RuleImpl.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/util/OpsemanticsviewAdapterFactory.java (100%) rename framework/framework_commons/plugins/{fr.inria.diverse.opsemanticsview.model => org.eclipse.gemoc.opsemanticsview.model}/src/opsemanticsview/util/OpsemanticsviewSwitch.java (100%) diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/META-INF/MANIFEST.MF index df37c6980..de5f682b6 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen.k3/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.gemoc.opsemanticsview.gen;bundle-version="1.0.0", fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", - fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", + org.eclipse.gemoc.opsemanticsview.model;bundle-version="0.1.0", org.eclipse.jdt.core, org.eclipse.core.runtime, org.eclipse.jdt.ui, diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF index b6c89aab5..d6d9efc44 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.gen/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, - fr.inria.diverse.opsemanticsview.model;bundle-version="0.1.0", + org.eclipse.gemoc.opsemanticsview.model;bundle-version="0.1.0", fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", org.eclipse.core.resources;bundle-version="3.11.1" Export-Package: org.eclipse.gemoc.opsemanticsview.gen diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.classpath b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/.classpath similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.classpath rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/.classpath diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.project b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/.project similarity index 91% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.project rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/.project index d3e09505e..c25c7201d 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/.project +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.opsemanticsview.model + org.eclipse.gemoc.opsemanticsview.model diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/META-INF/MANIFEST.MF similarity index 84% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/META-INF/MANIFEST.MF index 165889683..3cf28990b 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.inria.diverse.opsemanticsview.model;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.opsemanticsview.model;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/build.properties b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/build.properties similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/build.properties rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/build.properties diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.ecore b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/model/opsemanticsview.ecore similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.ecore rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/model/opsemanticsview.ecore diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.genmodel b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/model/opsemanticsview.genmodel similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/model/opsemanticsview.genmodel rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/model/opsemanticsview.genmodel diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.properties b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/plugin.properties similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.properties rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/plugin.properties diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/plugin.xml similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/plugin.xml rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/plugin.xml diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/pom.xml b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/pom.xml similarity index 90% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/pom.xml rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/pom.xml index e415f09d2..502aae1d0 100644 --- a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/pom.xml +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.modeldebugging.framework.commons - fr.inria.diverse.opsemanticsview.model + org.eclipse.gemoc.opsemanticsview.model 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/ExecutionToASEntry.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/ExecutionToASEntry.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/ExecutionToASEntry.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/ExecutionToASEntry.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/OperationalSemanticsView.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewFactory.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewFactory.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewFactory.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewFactory.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/OpsemanticsviewPackage.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/Rule.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/Rule.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/Rule.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/Rule.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/ExecutionToASEntryImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/impl/ExecutionToASEntryImpl.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/ExecutionToASEntryImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/impl/ExecutionToASEntryImpl.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/impl/OperationalSemanticsViewImpl.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewFactoryImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewFactoryImpl.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewFactoryImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewFactoryImpl.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/impl/OpsemanticsviewPackageImpl.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/RuleImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/impl/RuleImpl.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/impl/RuleImpl.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/impl/RuleImpl.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewAdapterFactory.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewAdapterFactory.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewAdapterFactory.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewAdapterFactory.java diff --git a/framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewSwitch.java b/framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewSwitch.java similarity index 100% rename from framework/framework_commons/plugins/fr.inria.diverse.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewSwitch.java rename to framework/framework_commons/plugins/org.eclipse.gemoc.opsemanticsview.model/src/opsemanticsview/util/OpsemanticsviewSwitch.java diff --git a/framework/framework_commons/pom.xml b/framework/framework_commons/pom.xml index de063ccb1..7d34a53eb 100644 --- a/framework/framework_commons/pom.xml +++ b/framework/framework_commons/pom.xml @@ -19,7 +19,7 @@ plugins/org.eclipse.gemoc.opsemanticsview.gen plugins/org.eclipse.gemoc.opsemanticsview.gen.k3 - plugins/fr.inria.diverse.opsemanticsview.model + plugins/org.eclipse.gemoc.opsemanticsview.model releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature diff --git a/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml b/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml index e0efbb183..adaf7409c 100644 --- a/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml +++ b/framework/framework_commons/releng/org.eclipse.gemoc.modeldebugging.framework.commons.feature/feature.xml @@ -53,7 +53,7 @@ unpack="false"/> Date: Fri, 16 Jun 2017 09:30:32 +0200 Subject: [PATCH 226/267] rename org.gemoc.xdsmlframework.* in org.eclipse.gemoc.xdsmlframework.* --- .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../icons/IconeGemocLanguage-16.png | Bin .../plugin.xml | 0 .../pom.xml | 0 .../xdsmlframework/extensions/sirius/Activator.java | 0 .../sirius/command/AddDebugLayerHandler.java | 0 .../sirius/command/debug_services_template.txt | 0 .../wizards/NewGemocDebugRepresentationWizard.java | 0 .../NewGemocModelingProjectCreationWizardPage.java | 0 .../sirius/wizards/NewGemocSiriusProjectWizard.java | 0 .../wizards/pages/AddDebugRepresentationPage.java | 0 .../pages/DebugRepresentationSelectionPage.java | 0 .../wizards/pages/NewViewPointProjectPage.java | 0 .../wizards/pages/SelectDiagramDefinitionPage.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../icons/IconeGemocLanguage-16.png | Bin .../lib/jaxen-1.1.6.LICENSE.txt | 0 .../lib/jaxen-1.1.6.jar | Bin .../lib/jdom-2.0.5-sources.jar | Bin .../lib/jdom-2.0.5.LICENSE | 0 .../lib/jdom-2.0.5.jar | Bin .../lib/xerces.2.11.LICENSE | 0 .../lib/xerces.2.11.NOTICE | 0 .../lib/xercesImpl.jar | Bin .../lib/xml-apis.jar | Bin .../plugin.xml | 0 .../pom.xml | 0 .../org/gemoc/xdsmlframework/ide/ui/Activator.java | 0 .../ide/ui/builder/pde/PluginXMLHelper.java | 0 .../AbstractGemocLanguageProjectHandler.java | 0 .../ui/commands/AbstractMelangeSelectHandler.java | 0 .../ide/ui/perspective/XDSMLPerspectiveFactory.java | 0 .../AbstractCreateNewGemocLanguageProject.java | 0 .../xdsml/wizards/CreateAnimatorProjectWizard.java | 0 .../CreateAnimatorProjectWizardContextAction.java | 0 .../wizards/CreateAnimatorProjectWizardPage.java | 0 .../ui/xdsml/wizards/CreateDomainModelWizard.java | 0 .../CreateDomainModelWizardContextAction.java | 0 .../xdsml/wizards/CreateDomainModelWizardPage.java | 0 .../ui/xdsml/wizards/CreateEditorProjectWizard.java | 0 .../CreateEditorProjectWizardContextAction.java | 0 .../wizards/CreateEditorProjectWizardPage.java | 0 .../ui/xdsml/wizards/MelangeXDSMLProjectHelper.java | 0 .../wizards/pages/AskLanguageNameWizardPage.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../pom.xml | 0 .../gemoc/xdsmlframework/ui/utils/Activator.java | 0 .../ui/utils/dialogs/SelectAIRDIFileDialog.java | 0 .../dialogs/SelectAnyConcreteEClassDialog.java | 0 .../ui/utils/dialogs/SelectAnyEObjectDialog.java | 0 .../dialogs/SelectAnyMelangeLanguageDialog.java | 0 .../ui/utils/dialogs/SelectEMFIProjectDialog.java | 0 .../ui/utils/dialogs/SelectMainMethodDialog.java | 0 .../utils/dialogs/SelectODesignIProjectDialog.java | 0 .../ui/utils/dialogs/SelectXtextIProjectDialog.java | 0 74 files changed, 0 insertions(+), 0 deletions(-) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/.checkstyle (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/.classpath (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/.project (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/META-INF/MANIFEST.MF (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/about.html (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/build.properties (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/icons/IconeGemocLanguage-16.png (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/plugin.xml (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/pom.xml (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/Activator.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.extensions.sirius => org.eclipse.gemoc.xdsmlframework.extensions.sirius}/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/.checkstyle (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/.classpath (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/.gitignore (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/.project (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/META-INF/MANIFEST.MF (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/about.html (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/build.properties (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/icons/IconeGemocLanguage-16.png (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/lib/jaxen-1.1.6.LICENSE.txt (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/lib/jaxen-1.1.6.jar (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/lib/jdom-2.0.5-sources.jar (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/lib/jdom-2.0.5.LICENSE (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/lib/jdom-2.0.5.jar (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/lib/xerces.2.11.LICENSE (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/lib/xerces.2.11.NOTICE (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/lib/xercesImpl.jar (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/lib/xml-apis.jar (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/plugin.xml (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/pom.xml (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/Activator.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ide.ui => org.eclipse.gemoc.xdsmlframework.ide.ui}/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/.checkstyle (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/.classpath (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/.project (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/META-INF/MANIFEST.MF (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/about.html (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/build.properties (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/pom.xml (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/src/org/gemoc/xdsmlframework/ui/utils/Activator.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java (100%) rename framework/xdsml_framework/plugins/{org.gemoc.xdsmlframework.ui.utils => org.eclipse.gemoc.xdsmlframework.ui.utils}/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java (100%) diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.checkstyle b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.checkstyle similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.checkstyle rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.checkstyle diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.classpath b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.classpath similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.classpath rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.classpath diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.project b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.project similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.project rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.project diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.settings/org.eclipse.jdt.core.prefs b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/.settings/org.eclipse.jdt.core.prefs rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/about.html b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/about.html similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/about.html rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/about.html diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/build.properties b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/build.properties similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/build.properties rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/build.properties diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/icons/IconeGemocLanguage-16.png b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/icons/IconeGemocLanguage-16.png similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/icons/IconeGemocLanguage-16.png rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/icons/IconeGemocLanguage-16.png diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/plugin.xml b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/plugin.xml similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/plugin.xml rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/plugin.xml diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/pom.xml b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/pom.xml similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/pom.xml rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/pom.xml diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/Activator.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/Activator.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/Activator.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/Activator.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.checkstyle b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.checkstyle similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.checkstyle rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.checkstyle diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.classpath b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.classpath similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.classpath rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.classpath diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.gitignore b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.gitignore similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.gitignore rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.gitignore diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.project b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.project similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.project rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.project diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.settings/org.eclipse.jdt.core.prefs b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/.settings/org.eclipse.jdt.core.prefs rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/about.html b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/about.html similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/about.html rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/about.html diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/build.properties b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/build.properties similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/build.properties rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/build.properties diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/icons/IconeGemocLanguage-16.png b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/icons/IconeGemocLanguage-16.png similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/icons/IconeGemocLanguage-16.png rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/icons/IconeGemocLanguage-16.png diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/jaxen-1.1.6.LICENSE.txt b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/jaxen-1.1.6.LICENSE.txt similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/jaxen-1.1.6.LICENSE.txt rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/jaxen-1.1.6.LICENSE.txt diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/jaxen-1.1.6.jar b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/jaxen-1.1.6.jar similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/jaxen-1.1.6.jar rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/jaxen-1.1.6.jar diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5-sources.jar b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5-sources.jar similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5-sources.jar rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5-sources.jar diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5.LICENSE b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5.LICENSE similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5.LICENSE rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5.LICENSE diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5.jar b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5.jar similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5.jar rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/jdom-2.0.5.jar diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/xerces.2.11.LICENSE b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/xerces.2.11.LICENSE similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/xerces.2.11.LICENSE rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/xerces.2.11.LICENSE diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/xerces.2.11.NOTICE b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/xerces.2.11.NOTICE similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/xerces.2.11.NOTICE rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/xerces.2.11.NOTICE diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/xercesImpl.jar b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/xercesImpl.jar similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/xercesImpl.jar rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/xercesImpl.jar diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/xml-apis.jar b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/xml-apis.jar similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/lib/xml-apis.jar rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/lib/xml-apis.jar diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/plugin.xml b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/plugin.xml similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/plugin.xml rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/plugin.xml diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/pom.xml b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/pom.xml similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/pom.xml rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/pom.xml diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/Activator.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/Activator.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/Activator.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/Activator.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.checkstyle b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.checkstyle similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.checkstyle rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.checkstyle diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.classpath b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.classpath similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.classpath rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.classpath diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.project b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.project similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.project rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.project diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.settings/org.eclipse.jdt.core.prefs b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/.settings/org.eclipse.jdt.core.prefs rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/about.html b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/about.html similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/about.html rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/about.html diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/build.properties b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/build.properties similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/build.properties rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/build.properties diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/pom.xml b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/pom.xml similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/pom.xml rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/pom.xml diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/Activator.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/Activator.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/Activator.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/Activator.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java diff --git a/framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java From d21e3791e2509f24746f4f967be681e68965cec9 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 09:32:27 +0200 Subject: [PATCH 227/267] package rename org.gemoc.xdsmlframework.* in org.eclipse.gemoc.xdsmlframework.* --- .../gemoc/xdsmlframework/extensions/sirius/Activator.java | 0 .../extensions/sirius/command/AddDebugLayerHandler.java | 0 .../extensions/sirius/command/debug_services_template.txt | 0 .../sirius/wizards/NewGemocDebugRepresentationWizard.java | 0 .../sirius/wizards/NewGemocModelingProjectCreationWizardPage.java | 0 .../extensions/sirius/wizards/NewGemocSiriusProjectWizard.java | 0 .../sirius/wizards/pages/AddDebugRepresentationPage.java | 0 .../sirius/wizards/pages/DebugRepresentationSelectionPage.java | 0 .../extensions/sirius/wizards/pages/NewViewPointProjectPage.java | 0 .../sirius/wizards/pages/SelectDiagramDefinitionPage.java | 0 .../org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/Activator.java | 0 .../gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java | 0 .../ide/ui/commands/AbstractGemocLanguageProjectHandler.java | 0 .../ide/ui/commands/AbstractMelangeSelectHandler.java | 0 .../ide/ui/perspective/XDSMLPerspectiveFactory.java | 0 .../ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java | 0 .../ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java | 0 .../xdsml/wizards/CreateAnimatorProjectWizardContextAction.java | 0 .../ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java | 0 .../ide/ui/xdsml/wizards/CreateDomainModelWizard.java | 0 .../ui/xdsml/wizards/CreateDomainModelWizardContextAction.java | 0 .../ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java | 0 .../ide/ui/xdsml/wizards/CreateEditorProjectWizard.java | 0 .../ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java | 0 .../ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java | 0 .../ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java | 0 .../ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java | 0 .../{ => eclipse}/gemoc/xdsmlframework/ui/utils/Activator.java | 0 .../xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java | 0 .../ui/utils/dialogs/SelectAnyConcreteEClassDialog.java | 0 .../xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java | 0 .../ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java | 0 .../xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java | 0 .../xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java | 0 .../ui/utils/dialogs/SelectODesignIProjectDialog.java | 0 .../ui/utils/dialogs/SelectXtextIProjectDialog.java | 0 36 files changed, 0 insertions(+), 0 deletions(-) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/{ => eclipse}/gemoc/xdsmlframework/extensions/sirius/Activator.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/{ => eclipse}/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/{ => eclipse}/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/{ => eclipse}/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/{ => eclipse}/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/{ => eclipse}/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/{ => eclipse}/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/{ => eclipse}/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/{ => eclipse}/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/{ => eclipse}/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/Activator.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/{ => eclipse}/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/{ => eclipse}/gemoc/xdsmlframework/ui/utils/Activator.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/{ => eclipse}/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/{ => eclipse}/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/{ => eclipse}/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/{ => eclipse}/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/{ => eclipse}/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/{ => eclipse}/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/{ => eclipse}/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java (100%) rename framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/{ => eclipse}/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java (100%) diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/Activator.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/Activator.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/Activator.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/Activator.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/debug_services_template.txt diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/Activator.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/Activator.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/Activator.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/Activator.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/Activator.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/Activator.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/Activator.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/Activator.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java similarity index 100% rename from framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java rename to framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java From 5eda53f085370f41f16a07114eb45213aeca41cd Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 10:15:26 +0200 Subject: [PATCH 228/267] rename org.gemoc.xdsmlframework.* in org.eclipse.gemoc.xdsmlframework.* --- .../.project | 2 +- .../META-INF/MANIFEST.MF | 12 ++++++------ .../plugin.xml | 8 ++++---- .../pom.xml | 2 +- .../extensions/sirius/Activator.java | 4 ++-- .../sirius/command/AddDebugLayerHandler.java | 4 ++-- .../NewGemocDebugRepresentationWizard.java | 14 +++++++------- ...GemocModelingProjectCreationWizardPage.java | 2 +- .../wizards/NewGemocSiriusProjectWizard.java | 4 ++-- .../pages/AddDebugRepresentationPage.java | 4 ++-- .../DebugRepresentationSelectionPage.java | 4 ++-- .../wizards/pages/NewViewPointProjectPage.java | 4 ++-- .../pages/SelectDiagramDefinitionPage.java | 4 ++-- .../.project | 2 +- .../META-INF/MANIFEST.MF | 18 +++++++++--------- .../plugin.xml | 6 +++--- .../pom.xml | 2 +- .../gemoc/xdsmlframework/ide/ui/Activator.java | 4 ++-- .../ide/ui/builder/pde/PluginXMLHelper.java | 4 ++-- .../AbstractGemocLanguageProjectHandler.java | 2 +- .../commands/AbstractMelangeSelectHandler.java | 6 +++--- .../perspective/XDSMLPerspectiveFactory.java | 2 +- .../AbstractCreateNewGemocLanguageProject.java | 6 +++--- .../wizards/CreateAnimatorProjectWizard.java | 2 +- ...eateAnimatorProjectWizardContextAction.java | 10 +++++----- .../CreateAnimatorProjectWizardPage.java | 4 ++-- .../xdsml/wizards/CreateDomainModelWizard.java | 2 +- .../CreateDomainModelWizardContextAction.java | 6 +++--- .../wizards/CreateDomainModelWizardPage.java | 4 ++-- .../wizards/CreateEditorProjectWizard.java | 2 +- ...CreateEditorProjectWizardContextAction.java | 8 ++++---- .../wizards/CreateEditorProjectWizardPage.java | 4 ++-- .../wizards/MelangeXDSMLProjectHelper.java | 2 +- .../pages/AskLanguageNameWizardPage.java | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 8 ++++---- .../pom.xml | 2 +- .../xdsmlframework/ui/utils/Activator.java | 4 ++-- .../utils/dialogs/SelectAIRDIFileDialog.java | 2 +- .../dialogs/SelectAnyConcreteEClassDialog.java | 2 +- .../utils/dialogs/SelectAnyEObjectDialog.java | 2 +- .../SelectAnyMelangeLanguageDialog.java | 2 +- .../utils/dialogs/SelectEMFIProjectDialog.java | 2 +- .../utils/dialogs/SelectMainMethodDialog.java | 2 +- .../dialogs/SelectODesignIProjectDialog.java | 2 +- .../dialogs/SelectXtextIProjectDialog.java | 2 +- framework/xdsml_framework/pom.xml | 8 ++++---- .../feature.xml | 8 ++++---- .../org.gemoc.xdsmlframework.test.lib/.project | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../org.gemoc.xdsmlframework.test.lib/pom.xml | 2 +- .../test/lib/MelangeUiInjectorProvider.java | 2 +- .../test/lib/WorkspaceTestHelper.xtend | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../tabs/LaunchConfigurationMainTab.java | 6 +++--- .../META-INF/MANIFEST.MF | 6 +++--- .../plugin.xml | 12 ++++++------ ...veGemocSequentialLanguageNatureHandler.java | 2 +- .../GemocSequentialLanguageBuilder.java | 2 +- .../commands/CreateAnimatorProjectHandler.java | 6 +++--- .../ui/commands/CreateDSAProjectHandler.java | 4 ++-- .../CreateDomainModelProjectHandler.java | 6 +++--- .../CreateSiriusEditorProjectHandler.java | 6 +++--- .../CreateXtextEditorProjectHandler.java | 6 +++--- .../ide/ui/editor/CreateDSAProposal.java | 2 +- .../ide/ui/editor/CreateEcoreProposal.java | 2 +- .../CreateDSAWizardContextActionDSAK3.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../javaxdsml/tests/SequentialFsmTest.xtend | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../TraceAddonGeneratorIntegration.xtend | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../diverse/trace/gemoc/ui/Activator.java | 2 +- .../XDSMLProject2TraceAddonHandler.xtend | 4 ++-- 74 files changed, 156 insertions(+), 156 deletions(-) diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.project b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.project index 2eed44cc9..8342ee142 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.project +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/.project @@ -1,6 +1,6 @@ - org.gemoc.xdsmlframework.extensions.sirius + org.eclipse.gemoc.xdsmlframework.extensions.sirius diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF index e93eb275c..57b6f0053 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc extension for Sirius -Bundle-SymbolicName: org.gemoc.xdsmlframework.extensions.sirius;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.xdsmlframework.extensions.sirius;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.xdsmlframework.extensions.sirius.Activator +Bundle-Activator: org.eclipse.gemoc.xdsmlframework.extensions.sirius.Activator Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, fr.inria.diverse.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", fr.inria.diverse.commons.eclipse.messagingsystem.ui;bundle-version="1.0.0", @@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.sirius.editor;bundle-version="2.0.7" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.gemoc.xdsmlframework.extensions.sirius, - org.gemoc.xdsmlframework.extensions.sirius.command, - org.gemoc.xdsmlframework.extensions.sirius.wizards, - org.gemoc.xdsmlframework.extensions.sirius.wizards.pages +Export-Package: org.eclipse.gemoc.xdsmlframework.extensions.sirius, + org.eclipse.gemoc.xdsmlframework.extensions.sirius.command, + org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards, + org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.pages diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/plugin.xml b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/plugin.xml index ea8919166..38bb25099 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/plugin.xml +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/plugin.xml @@ -4,11 +4,11 @@ Create a debug/animation representation for a GEMOC language. May create a new project, or modify or extend an existing Viewpoint Specification. @@ -18,7 +18,7 @@ diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/pom.xml b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/pom.xml index cdbf49052..784cebaea 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/pom.xml +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/pom.xml @@ -9,6 +9,6 @@ 2.3.0-SNAPSHOT - org.gemoc.xdsmlframework.extensions.sirius + org.eclipse.gemoc.xdsmlframework.extensions.sirius eclipse-plugin \ No newline at end of file diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/Activator.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/Activator.java index 2a767494a..20927fbad 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/Activator.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.extensions.sirius; +package org.eclipse.gemoc.xdsmlframework.extensions.sirius; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -26,7 +26,7 @@ public static BundleContext getContext() { return context; } - public static final String PLUGIN_ID = "org.gemoc.xdsmlframework.extensions.sirius"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.xdsmlframework.extensions.sirius"; //$NON-NLS-1$ protected static MessagingSystem messagingSystem = null; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java index 8badbde38..a4fb27613 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.extensions.sirius.command; +package org.eclipse.gemoc.xdsmlframework.extensions.sirius.command; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -66,7 +66,7 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolPackage; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.handlers.HandlerUtil; -import org.gemoc.xdsmlframework.extensions.sirius.Activator; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.Activator; import org.osgi.framework.BundleException; import fr.inria.diverse.commons.eclipse.pde.manifest.ManifestChanger; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java index 543c4e978..3e45e977d 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocDebugRepresentationWizard.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.extensions.sirius.wizards; +package org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -44,12 +44,12 @@ import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; -import org.gemoc.xdsmlframework.extensions.sirius.Activator; -import org.gemoc.xdsmlframework.extensions.sirius.command.AddDebugLayerHandler; -import org.gemoc.xdsmlframework.extensions.sirius.wizards.pages.AddDebugRepresentationPage; -import org.gemoc.xdsmlframework.extensions.sirius.wizards.pages.DebugRepresentationSelectionPage; -import org.gemoc.xdsmlframework.extensions.sirius.wizards.pages.NewViewPointProjectPage; -import org.gemoc.xdsmlframework.extensions.sirius.wizards.pages.SelectDiagramDefinitionPage; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.Activator; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.command.AddDebugLayerHandler; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.pages.AddDebugRepresentationPage; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.pages.DebugRepresentationSelectionPage; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.pages.NewViewPointProjectPage; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.pages.SelectDiagramDefinitionPage; /** * Wizard to create a new debug representation. diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java index 24232a957..e887ab681 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocModelingProjectCreationWizardPage.java @@ -10,7 +10,7 @@ * Gemoc - Copy the initial {@link ViewpointSpecificationProjectWizard} to set an initial project name *******************************************************************************/ -package org.gemoc.xdsmlframework.extensions.sirius.wizards; +package org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards; import java.io.File; import java.text.MessageFormat; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java index b60dba9de..3ffc7ee66 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/NewGemocSiriusProjectWizard.java @@ -10,7 +10,7 @@ * Gemoc - Copy the initial {@link ViewpointSpecificationProjectWizard} to set an initial project name *******************************************************************************/ -package org.gemoc.xdsmlframework.extensions.sirius.wizards; +package org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards; import java.util.ArrayList; import java.util.Collection; @@ -48,7 +48,7 @@ public class NewGemocSiriusProjectWizard extends Wizard implements INewWizard { /** * Wizard id. */ - public static final String ID = "org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocSiriusProjectWizard"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocSiriusProjectWizard"; //$NON-NLS-1$ private IProject project; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java index 178569822..f5afd188a 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/AddDebugRepresentationPage.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.extensions.sirius.wizards.pages; +package org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.pages; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.sirius.diagram.description.DiagramDescription; @@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; public class AddDebugRepresentationPage extends WizardPage { diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java index b50023f3a..093bd2279 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/DebugRepresentationSelectionPage.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.extensions.sirius.wizards.pages; +package org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.pages; import java.util.ArrayList; import java.util.List; @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; /** * The representation selection page. diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java index 0e884d4e3..ba975175a 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/NewViewPointProjectPage.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.extensions.sirius.wizards.pages; +package org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.pages; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; @@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; public class NewViewPointProjectPage extends WizardPage { diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java index 7ae91ec3d..2132cbe13 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/wizards/pages/SelectDiagramDefinitionPage.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.extensions.sirius.wizards.pages; +package org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.pages; import java.util.List; @@ -28,7 +28,7 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; /** * The diagram selection page. diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.project b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.project index 475e1e5fb..5a0286865 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.project +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/.project @@ -1,6 +1,6 @@ - org.gemoc.xdsmlframework.ide.ui + org.eclipse.gemoc.xdsmlframework.ide.ui diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF index c8292d364..e039afc3d 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ExecutionFrmaework Language Workbench UI -Bundle-SymbolicName: org.gemoc.xdsmlframework.ide.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.xdsmlframework.ide.ui;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.xdsmlframework.ide.ui.Activator +Bundle-Activator: org.eclipse.gemoc.xdsmlframework.ide.ui.Activator Bundle-Vendor: INRIA Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.codegen.ecore.ui;bundle-version="2.8.0", @@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.gemoc.commons.eclipse, org.eclipse.gemoc.commons.eclipse.ui, org.eclipse.emf.ecore.editor, - org.gemoc.xdsmlframework.ui.utils, - org.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", + org.eclipse.gemoc.xdsmlframework.ui.utils, + org.eclipse.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", fr.inria.diverse.melange.metamodel, org.eclipse.xtext.ui, org.eclipse.xtext, @@ -29,10 +29,10 @@ Bundle-ClassPath: lib/jaxen-1.1.6.jar, lib/jdom-2.0.5.jar, lib/xercesImpl.jar, . -Export-Package: org.gemoc.xdsmlframework.ide.ui, - org.gemoc.xdsmlframework.ide.ui.builder.pde, - org.gemoc.xdsmlframework.ide.ui.commands, - org.gemoc.xdsmlframework.ide.ui.xdsml.wizards, - org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.pages, +Export-Package: org.eclipse.gemoc.xdsmlframework.ide.ui, + org.eclipse.gemoc.xdsmlframework.ide.ui.builder.pde, + org.eclipse.gemoc.xdsmlframework.ide.ui.commands, + org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards, + org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.pages, org.jdom2 diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/plugin.xml b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/plugin.xml index 095b5ba6d..b2b330d13 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/plugin.xml +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/plugin.xml @@ -4,16 +4,16 @@ + targetID="org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.perspective"> diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/pom.xml b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/pom.xml index 3726d63b2..a9bb07318 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/pom.xml +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/pom.xml @@ -9,6 +9,6 @@ 2.3.0-SNAPSHOT - org.gemoc.xdsmlframework.ide.ui + org.eclipse.gemoc.xdsmlframework.ide.ui eclipse-plugin \ No newline at end of file diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/Activator.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/Activator.java index b897dbcfd..f9d4fca9d 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/Activator.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui; +package org.eclipse.gemoc.xdsmlframework.ide.ui; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; @@ -21,7 +21,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.xdsmlframework.ide.ui"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.xdsmlframework.ide.ui"; //$NON-NLS-1$ public static final String GEMOC_PROJECT_CONFIGURATION_FILE_EXTENSION = "xdsml"; public static final String GEMOC_PROJECT_CONFIGURATION_FILE = "project." diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java index c32a68ee0..779f65b6b 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/builder/pde/PluginXMLHelper.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.builder.pde; +package org.eclipse.gemoc.xdsmlframework.ide.ui.builder.pde; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtensionPoint; -import org.gemoc.xdsmlframework.ide.ui.Activator; +import org.eclipse.gemoc.xdsmlframework.ide.ui.Activator; import org.jdom2.Attribute; import org.jdom2.Document; import org.jdom2.Element; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java index 6bfef938c..7dec757a5 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractGemocLanguageProjectHandler.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.commands; +package org.eclipse.gemoc.xdsmlframework.ide.ui.commands; import java.util.Iterator; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java index f84543d1e..05f572ba4 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/commands/AbstractMelangeSelectHandler.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.commands; +package org.eclipse.gemoc.xdsmlframework.ide.ui.commands; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -21,8 +21,8 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; -import org.gemoc.xdsmlframework.ide.ui.Activator; -import org.gemoc.xdsmlframework.ui.utils.dialogs.SelectAnyMelangeLanguageDialog; +import org.eclipse.gemoc.xdsmlframework.ide.ui.Activator; +import org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs.SelectAnyMelangeLanguageDialog; import fr.inria.diverse.melange.metamodel.melange.Language; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java index 1a5587831..8a9dcbfa8 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/perspective/XDSMLPerspectiveFactory.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.perspective; +package org.eclipse.gemoc.xdsmlframework.ide.ui.perspective; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jdt.ui.JavaUI; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java index 9f710bfed..1bad629c3 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/AbstractCreateNewGemocLanguageProject.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -25,8 +25,8 @@ import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; -import org.gemoc.xdsmlframework.ide.ui.Activator; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.pages.AskLanguageNameWizardPage; +import org.eclipse.gemoc.xdsmlframework.ide.ui.Activator; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.pages.AskLanguageNameWizardPage; public abstract class AbstractCreateNewGemocLanguageProject extends Wizard implements INewWizard { diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java index 36922bfa5..f3419803b 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizard.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import org.eclipse.core.resources.IProject; import org.eclipse.jface.wizard.Wizard; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java index 115d76e91..ecfed7ec5 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardContextAction.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -20,8 +20,8 @@ import org.eclipse.ui.wizards.IWizardDescriptor; import org.eclipse.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; -import org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; -import org.gemoc.xdsmlframework.ide.ui.Activator; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard; +import org.eclipse.gemoc.xdsmlframework.ide.ui.Activator; import fr.inria.diverse.melange.metamodel.melange.Language; @@ -80,7 +80,7 @@ public void execute() { protected void createNewODProject() { final IWizardDescriptor descriptor = WizardFinder - .findNewWizardDescriptor(org.gemoc.xdsmlframework.extensions.sirius.Activator.PLUGIN_ID + .findNewWizardDescriptor(org.eclipse.gemoc.xdsmlframework.extensions.sirius.Activator.PLUGIN_ID + ".wizards.NewGemocDebugRepresentationWizard"); // Then if we have a wizard, open it. if (descriptor != null) { @@ -129,7 +129,7 @@ protected void createNewODProject() { } } else { Activator - .error("wizard with id=org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard not found", + .error("wizard with id=org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocDebugRepresentationWizard not found", null); } } diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java index ed3bd9018..6a6671dfc 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateAnimatorProjectWizardPage.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.PlatformUI; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateAnimatorProjectWizardContextAction.CreateAnimatorProjectAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateAnimatorProjectWizardContextAction.CreateAnimatorProjectAction; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java index 622f6e413..1b48faf33 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizard.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import org.eclipse.core.resources.IProject; import org.eclipse.jface.wizard.Wizard; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java index 185b143ea..84bdc0492 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardContextAction.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -23,8 +23,8 @@ import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.eclipse.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; -import org.gemoc.xdsmlframework.ide.ui.Activator; -import org.gemoc.xdsmlframework.ui.utils.dialogs.SelectEMFIProjectDialog; +import org.eclipse.gemoc.xdsmlframework.ide.ui.Activator; +import org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs.SelectEMFIProjectDialog; import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java index 9d54b2cb9..83e4bf481 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateDomainModelWizardPage.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.PlatformUI; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateDomainModelWizardContextAction.CreateDomainModelAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateDomainModelWizardContextAction.CreateDomainModelAction; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java index d04f36abe..04b34c88c 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizard.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import org.eclipse.core.resources.IProject; import org.eclipse.jface.wizard.Wizard; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java index 6ef2ef282..e1a7f202d 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardContextAction.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import java.util.ArrayList; import java.util.Iterator; @@ -28,8 +28,8 @@ import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.eclipse.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; -import org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocSiriusProjectWizard; -import org.gemoc.xdsmlframework.ide.ui.Activator; +import org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocSiriusProjectWizard; +import org.eclipse.gemoc.xdsmlframework.ide.ui.Activator; //import org.eclipse.emf.ecoretools.design.wizard.EcoreModelerWizard; @@ -209,7 +209,7 @@ protected void createNewXTextProject() { protected void createNewODProject() { final IWizardDescriptor descriptor = WizardFinder - .findNewWizardDescriptor("org.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocSiriusProjectWizard"); + .findNewWizardDescriptor("org.eclipse.gemoc.xdsmlframework.extensions.sirius.wizards.NewGemocSiriusProjectWizard"); // Then if we have a wizard, open it. if (descriptor != null) { NewProjectWorkspaceListener workspaceListener = new NewProjectWorkspaceListener(); diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java index 203b7ae55..3f14a0423 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/CreateEditorProjectWizardPage.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.PlatformUI; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateEditorProjectWizardContextAction.CreateEditorProjectAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateEditorProjectWizardContextAction.CreateEditorProjectAction; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java index 4fba44326..cc64043a3 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/MelangeXDSMLProjectHelper.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java index 3e601a70c..f5e56f18f 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/src/org/eclipse/gemoc/xdsmlframework/ide/ui/xdsml/wizards/pages/AskLanguageNameWizardPage.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.pages; +package org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.pages; import org.eclipse.jface.util.BidiUtils; import org.eclipse.jface.wizard.WizardPage; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.project b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.project index 471ceba53..fb0a0de72 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.project +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/.project @@ -1,6 +1,6 @@ - org.gemoc.xdsmlframework.ui.utils + org.eclipse.gemoc.xdsmlframework.ui.utils diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF index 1b23c79de..562e567f4 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Utils -Bundle-SymbolicName: org.gemoc.xdsmlframework.ui.utils +Bundle-SymbolicName: org.eclipse.gemoc.xdsmlframework.ui.utils Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.xdsmlframework.ui.utils.Activator +Bundle-Activator: org.eclipse.gemoc.xdsmlframework.ui.utils.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.codegen.ecore.ui;bundle-version="2.8.0", org.eclipse.gemoc.commons.eclipse, @@ -13,5 +13,5 @@ Require-Bundle: org.eclipse.core.runtime, fr.inria.diverse.melange.metamodel Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Export-Package: org.gemoc.xdsmlframework.ui.utils, - org.gemoc.xdsmlframework.ui.utils.dialogs +Export-Package: org.eclipse.gemoc.xdsmlframework.ui.utils, + org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/pom.xml b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/pom.xml index 9ccef865a..f6d2f69e9 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/pom.xml +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/pom.xml @@ -9,6 +9,6 @@ 2.3.0-SNAPSHOT - org.gemoc.xdsmlframework.ui.utils + org.eclipse.gemoc.xdsmlframework.ui.utils eclipse-plugin \ No newline at end of file diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/Activator.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/Activator.java index 15ca90e22..d3490ef77 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/Activator.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ui.utils; +package org.eclipse.gemoc.xdsmlframework.ui.utils; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -19,7 +19,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.xdsmlframework.ui.utils"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.xdsmlframework.ui.utils"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java index fec5db35c..4c2645d73 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAIRDIFileDialog.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ui.utils.dialogs; +package org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs; import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectSpecificFileDialog; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java index e32b04c73..b932cb21d 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyConcreteEClassDialog.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ui.utils.dialogs; +package org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java index cdb6da118..55ebdba8d 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyEObjectDialog.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ui.utils.dialogs; +package org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs; import java.util.ArrayList; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java index 083457d47..230875914 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectAnyMelangeLanguageDialog.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ui.utils.dialogs; +package org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java index 3411e0a63..e54f1da47 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectEMFIProjectDialog.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ui.utils.dialogs; +package org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs; import java.util.Arrays; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java index 6e981f2ec..e34f32544 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectMainMethodDialog.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ui.utils.dialogs; +package org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java index 1c04754bb..6c36967df 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectODesignIProjectDialog.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ui.utils.dialogs; +package org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs; import org.eclipse.swt.widgets.Shell; diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java index 2c5efa245..0e906c35c 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ui.utils/src/org/eclipse/gemoc/xdsmlframework/ui/utils/dialogs/SelectXtextIProjectDialog.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.ui.utils.dialogs; +package org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs; import org.eclipse.swt.widgets.Shell; diff --git a/framework/xdsml_framework/pom.xml b/framework/xdsml_framework/pom.xml index 476c9e0c7..61e7f13e6 100644 --- a/framework/xdsml_framework/pom.xml +++ b/framework/xdsml_framework/pom.xml @@ -13,10 +13,10 @@ - plugins/org.gemoc.xdsmlframework.ui.utils - plugins/org.gemoc.xdsmlframework.ide.ui - plugins/org.gemoc.xdsmlframework.extensions.sirius - tests/org.gemoc.xdsmlframework.test.lib + plugins/org.eclipse.gemoc.xdsmlframework.ui.utils + plugins/org.eclipse.gemoc.xdsmlframework.ide.ui + plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius + tests/org.eclipse.gemoc.xdsmlframework.test.lib releng/org.gemoc.modeldebugging.xdsmlframework.feature diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml index f63924aad..eaa437235 100644 --- a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml +++ b/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml @@ -18,28 +18,28 @@ - org.gemoc.xdsmlframework.test.lib + org.eclipse.gemoc.xdsmlframework.test.lib diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF index ebff5b66e..530eeac43 100644 --- a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: xdsmlframework Test library -Bundle-SymbolicName: org.gemoc.xdsmlframework.test.lib +Bundle-SymbolicName: org.eclipse.gemoc.xdsmlframework.test.lib Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.12.0", @@ -19,4 +19,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.core.expressions;bundle-version="3.5.100", fr.inria.diverse.trace.gemoc.generator;bundle-version="2.3.0", fr.inria.diverse.trace.gemoc;bundle-version="2.3.0" -Export-Package: org.gemoc.xdsmlframework.test.lib +Export-Package: org.eclipse.gemoc.xdsmlframework.test.lib diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/pom.xml b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/pom.xml index 9568e5286..2e2218003 100644 --- a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/pom.xml +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/pom.xml @@ -9,7 +9,7 @@ 2.3.0-SNAPSHOT - org.gemoc.xdsmlframework.test.lib + org.eclipse.gemoc.xdsmlframework.test.lib eclipse-plugin diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java index 218af7c2d..429b3bccd 100644 --- a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.test.lib; +package org.eclipse.gemoc.xdsmlframework.test.lib; import org.eclipse.xtext.junit4.IInjectorProvider; diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend index 10d58efd6..78e009087 100644 --- a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend +++ b/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.xdsmlframework.test.lib +package org.eclipse.gemoc.xdsmlframework.test.lib import com.google.common.base.Charsets import com.google.common.io.CharStreams diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index dee589a05..00176f241 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.gemoc.commons.eclipse, org.eclipse.gemoc.commons.eclipse.ui;bundle-version="0.1.0", org.eclipse.sirius.diagram.ui;bundle-version="1.0.0", - org.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", + org.eclipse.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", org.eclipse.emf.edit.ui, org.gemoc.execution.sequential.javaxdsml.api;bundle-version="0.1.0", org.gemoc.executionframework.ui, @@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", fr.obeo.dsl.debug.ide.ui;bundle-version="1.0.0", org.eclipse.gemoc.timeline;bundle-version="1.0.0", org.gemoc.executionframework.extensions.sirius, - org.gemoc.xdsmlframework.ui.utils, + org.eclipse.gemoc.xdsmlframework.ui.utils, org.eclipse.xtext, org.eclipse.xtend.lib, fr.inria.diverse.melange.resource, diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index a18e87f5d..260586043 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -53,9 +53,9 @@ import org.gemoc.executionframework.engine.commons.MelangeHelper; import org.gemoc.executionframework.engine.ui.commons.RunConfiguration; import org.gemoc.executionframework.ui.utils.ENamedElementQualifiedNameLabelProvider; -import org.gemoc.xdsmlframework.ui.utils.dialogs.SelectAIRDIFileDialog; -import org.gemoc.xdsmlframework.ui.utils.dialogs.SelectAnyEObjectDialog; -import org.gemoc.xdsmlframework.ui.utils.dialogs.SelectMainMethodDialog; +import org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs.SelectAIRDIFileDialog; +import org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs.SelectAnyEObjectDialog; +import org.eclipse.gemoc.xdsmlframework.ui.utils.dialogs.SelectMainMethodDialog; import org.osgi.framework.Bundle; import fr.obeo.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF index 9d8b7eeca..528cbd8c7 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF @@ -13,10 +13,10 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.gemoc.commons.eclipse.jdt, org.eclipse.gemoc.commons.eclipse.ui, org.gemoc.executionframework.ui, - org.gemoc.xdsmlframework.ide.ui, + org.eclipse.gemoc.xdsmlframework.ide.ui, org.eclipse.gemoc.xdsmlframework.api, org.gemoc.execution.sequential.javaxdsml.api, - org.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", + org.eclipse.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", org.eclipse.emf.ecore.xmi;bundle-version="2.10.2", org.gemoc.executionframework.extensions.sirius;bundle-version="0.1.0", fr.inria.diverse.melange.metamodel, @@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.expressions, org.eclipse.xtext, org.eclipse.xtext.ui, - org.gemoc.xdsmlframework.ui.utils, + org.eclipse.gemoc.xdsmlframework.ui.utils, org.eclipse.emf.ecoretools.design.ui, org.eclipse.gemoc.commons.eclipse.pde Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml index d2a28d030..2e71bdb4f 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml @@ -257,19 +257,19 @@ + parentCategory="org.eclipse.gemoc.xdsmlframework.category"> @@ -281,7 +281,7 @@ + targetID="org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.perspective"> diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java index 47cf5e32d..88ea29b82 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java @@ -37,7 +37,7 @@ import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; import org.eclipse.gemoc.commons.eclipse.pde.ui.PluginConverter; import org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator; -import org.gemoc.xdsmlframework.ide.ui.builder.pde.PluginXMLHelper; +import org.eclipse.gemoc.xdsmlframework.ide.ui.builder.pde.PluginXMLHelper; import org.osgi.framework.BundleException; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java index b8f79b5a5..2c43534c6 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java @@ -29,7 +29,7 @@ import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; import org.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtensionPoint; import org.eclipse.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtensionPoint; -import org.gemoc.xdsmlframework.ide.ui.builder.pde.PluginXMLHelper; +import org.eclipse.gemoc.xdsmlframework.ide.ui.builder.pde.PluginXMLHelper; import org.jdom2.Element; import org.osgi.framework.BundleException; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateAnimatorProjectHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateAnimatorProjectHandler.java index 8bc0c01ab..7b11d6a13 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateAnimatorProjectHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateAnimatorProjectHandler.java @@ -14,9 +14,9 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.IHandler; import org.eclipse.core.resources.IProject; -import org.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateAnimatorProjectWizardContextAction; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateAnimatorProjectWizardContextAction.CreateAnimatorProjectAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateAnimatorProjectWizardContextAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateAnimatorProjectWizardContextAction.CreateAnimatorProjectAction; import fr.inria.diverse.melange.metamodel.melange.Language; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDSAProjectHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDSAProjectHandler.java index 05f28801d..97fd97585 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDSAProjectHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDSAProjectHandler.java @@ -32,8 +32,8 @@ import org.eclipse.xtext.ui.editor.utils.EditorUtils; import org.gemoc.execution.sequential.javaxdsml.ide.ui.templates.SequentialTemplate; import org.gemoc.execution.sequential.javaxdsml.ide.ui.wizards.CreateDSAWizardContextActionDSAK3; -import org.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper; +import org.eclipse.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper; import fr.inria.diverse.melange.metamodel.melange.Language; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDomainModelProjectHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDomainModelProjectHandler.java index 2351bdfe6..97b8b5f7d 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDomainModelProjectHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDomainModelProjectHandler.java @@ -30,9 +30,9 @@ import org.eclipse.xtext.ui.editor.XtextEditor; import org.eclipse.xtext.ui.editor.model.IXtextDocument; import org.eclipse.xtext.ui.editor.utils.EditorUtils; -import org.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateDomainModelWizardContextAction; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateDomainModelWizardContextAction.CreateDomainModelAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateDomainModelWizardContextAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateDomainModelWizardContextAction.CreateDomainModelAction; //import org.eclipse.jface.dialogs.MessageDialog; import fr.inria.diverse.melange.metamodel.melange.Language; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateSiriusEditorProjectHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateSiriusEditorProjectHandler.java index 93eb58433..a15c457a5 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateSiriusEditorProjectHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateSiriusEditorProjectHandler.java @@ -30,9 +30,9 @@ import org.eclipse.xtext.ui.editor.XtextEditor; import org.eclipse.xtext.ui.editor.model.IXtextDocument; import org.eclipse.xtext.ui.editor.utils.EditorUtils; -import org.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateEditorProjectWizardContextAction; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateEditorProjectWizardContextAction.CreateEditorProjectAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateEditorProjectWizardContextAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateEditorProjectWizardContextAction.CreateEditorProjectAction; import fr.inria.diverse.melange.metamodel.melange.Language; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateXtextEditorProjectHandler.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateXtextEditorProjectHandler.java index 020cb58f9..265c6a54c 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateXtextEditorProjectHandler.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateXtextEditorProjectHandler.java @@ -30,9 +30,9 @@ import org.eclipse.xtext.ui.editor.XtextEditor; import org.eclipse.xtext.ui.editor.model.IXtextDocument; import org.eclipse.xtext.ui.editor.utils.EditorUtils; -import org.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateEditorProjectWizardContextAction; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateEditorProjectWizardContextAction.CreateEditorProjectAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateEditorProjectWizardContextAction; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.CreateEditorProjectWizardContextAction.CreateEditorProjectAction; import fr.inria.diverse.melange.metamodel.melange.Language; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java index 38c157e67..e8585302b 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java @@ -38,7 +38,7 @@ import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; import org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator; import org.gemoc.execution.sequential.javaxdsml.ide.ui.templates.SequentialTemplate; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper; import fr.inria.diverse.k3.ui.wizards.NewK3ProjectWizard; import fr.inria.diverse.k3.ui.wizards.pages.NewK3ProjectWizardFields.KindsOfProject; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java index c4f0a3058..5a8fa9b2d 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java @@ -24,7 +24,7 @@ import org.eclipse.gemoc.commons.eclipse.core.resources.NewProjectWorkspaceListener; import org.eclipse.gemoc.commons.eclipse.pde.manifest.ManifestChanger; import org.eclipse.gemoc.commons.eclipse.ui.WizardFinder; -import org.gemoc.xdsmlframework.ide.ui.Activator; +import org.eclipse.gemoc.xdsmlframework.ide.ui.Activator; import fr.inria.diverse.melange.metamodel.melange.Language; import fr.inria.diverse.melange.metamodel.melange.ModelTypingSpace; diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java index 15320b429..11eb8b15b 100644 --- a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java +++ b/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java @@ -33,7 +33,7 @@ import org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator; import org.gemoc.executionframework.ui.xdsml.activefile.ActiveFile; import org.gemoc.executionframework.ui.xdsml.activefile.ActiveFileEcore; -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper; +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper; import fr.inria.diverse.k3.ui.wizards.NewK3ProjectWizard; import fr.inria.diverse.k3.ui.wizards.pages.NewK3ProjectWizardFields.KindsOfProject; diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF index 98031ffc2..610e621e4 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF @@ -20,4 +20,4 @@ Require-Bundle: org.gemoc.execution.sequential.javaxdsml.ide.ui;bundle-version=" org.eclipse.core.expressions;bundle-version="3.5.100", fr.inria.diverse.trace.gemoc.generator;bundle-version="2.3.0", fr.inria.diverse.trace.gemoc;bundle-version="2.3.0", - org.gemoc.xdsmlframework.test.lib;bundle-version="2.3.0" + org.eclipse.gemoc.xdsmlframework.test.lib;bundle-version="2.3.0" diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend index 72b459a98..e1e440305 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend @@ -22,8 +22,8 @@ import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.gemoc.xdsmlframework.test.lib.WorkspaceTestHelper -import org.gemoc.xdsmlframework.test.lib.MelangeUiInjectorProvider +import org.eclipse.gemoc.xdsmlframework.test.lib.WorkspaceTestHelper +import org.eclipse.gemoc.xdsmlframework.test.lib.MelangeUiInjectorProvider @RunWith(XtextRunner) @InjectWith(MelangeUiInjectorProvider) diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF index 64c87a60b..23a1fa5d1 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: com.google.guava, org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.core.resources;bundle-version="3.9.1", org.gemoc.executionframework.ui;bundle-version="0.1.0", - org.gemoc.xdsmlframework.ide.ui;bundle-version="0.1.0", + org.eclipse.gemoc.xdsmlframework.ide.ui;bundle-version="0.1.0", fr.inria.diverse.trace.metamodel.generator;bundle-version="1.0.0", fr.inria.diverse.melange.ui, fr.inria.diverse.melange.metamodel, diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend index 5c778c331..8c8f6f635 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend @@ -30,7 +30,7 @@ import org.eclipse.emf.common.util.URI import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.xtext.ui.resource.IResourceSetProvider -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper /** * Plenty of ways to call the generator in an eclipse context. diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF index 9175dd51d..a1a7f4b0d 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.ui.navigator, fr.inria.diverse.melange.metamodel, org.eclipse.core.expressions, - org.gemoc.xdsmlframework.ide.ui;bundle-version="0.1.0", - org.gemoc.xdsmlframework.ui.utils;bundle-version="0.1.0", + org.eclipse.gemoc.xdsmlframework.ide.ui;bundle-version="0.1.0", + org.eclipse.gemoc.xdsmlframework.ui.utils;bundle-version="0.1.0", org.eclipse.gemoc.commons.eclipse;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/Activator.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/Activator.java index 62520d76f..865f62baf 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/Activator.java +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/Activator.java @@ -20,7 +20,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.xdsmlframework.ide.ui"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.xdsmlframework.ide.ui"; //$NON-NLS-1$ // The shared instance diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend index 79c5eb0a0..b33100bd2 100644 --- a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend +++ b/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend @@ -23,8 +23,8 @@ import org.eclipse.core.runtime.jobs.Job import org.eclipse.jface.dialogs.InputDialog import org.eclipse.jface.window.Window import org.eclipse.gemoc.commons.eclipse.emf.EMFResource -import org.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler -import org.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper +import org.eclipse.gemoc.xdsmlframework.ide.ui.commands.AbstractMelangeSelectHandler +import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProjectHelper /** * Handler that allows to get an XDSML project (containing a melange file) From 655d5861704cb8c2a56020222572987d4794ea08 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 10:18:29 +0200 Subject: [PATCH 229/267] rename org.eclipse.gemoc.xdsmlframework.test.lib --- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../pom.xml | 0 .../gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java | 0 .../gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename framework/xdsml_framework/tests/{org.gemoc.xdsmlframework.test.lib => org.eclipse.gemoc.xdsmlframework.test.lib}/.classpath (100%) rename framework/xdsml_framework/tests/{org.gemoc.xdsmlframework.test.lib => org.eclipse.gemoc.xdsmlframework.test.lib}/.project (100%) rename framework/xdsml_framework/tests/{org.gemoc.xdsmlframework.test.lib => org.eclipse.gemoc.xdsmlframework.test.lib}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/xdsml_framework/tests/{org.gemoc.xdsmlframework.test.lib => org.eclipse.gemoc.xdsmlframework.test.lib}/META-INF/MANIFEST.MF (100%) rename framework/xdsml_framework/tests/{org.gemoc.xdsmlframework.test.lib => org.eclipse.gemoc.xdsmlframework.test.lib}/build.properties (100%) rename framework/xdsml_framework/tests/{org.gemoc.xdsmlframework.test.lib => org.eclipse.gemoc.xdsmlframework.test.lib}/pom.xml (100%) rename framework/xdsml_framework/tests/{org.gemoc.xdsmlframework.test.lib/src/org => org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse}/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java (100%) rename framework/xdsml_framework/tests/{org.gemoc.xdsmlframework.test.lib/src/org => org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse}/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend (100%) diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.classpath b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/.classpath similarity index 100% rename from framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.classpath rename to framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/.classpath diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.project b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/.project similarity index 100% rename from framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.project rename to framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/.project diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.settings/org.eclipse.jdt.core.prefs b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/.settings/org.eclipse.jdt.core.prefs rename to framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF similarity index 100% rename from framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF rename to framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/build.properties b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/build.properties similarity index 100% rename from framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/build.properties rename to framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/build.properties diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/pom.xml b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/pom.xml similarity index 100% rename from framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/pom.xml rename to framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/pom.xml diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java similarity index 100% rename from framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java rename to framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java diff --git a/framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend similarity index 100% rename from framework/xdsml_framework/tests/org.gemoc.xdsmlframework.test.lib/src/org/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend rename to framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend From 2fd6a14485a3304e1e616bf3a7ee7d939ec32082 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 10:26:27 +0200 Subject: [PATCH 230/267] rename org.gemoc.modeldebugging.xdsmlframework.feature in org.eclipse.gemoc.xdsmlframework.feature --- framework/xdsml_framework/pom.xml | 2 +- .../.gitignore | 0 .../build.properties | 0 .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.gemoc.execution.sequential.javaxdsml.tests/pom.xml | 2 +- releng/org.gemoc.siriusanimation.repository/category.xml | 4 ++-- 7 files changed, 6 insertions(+), 6 deletions(-) rename framework/xdsml_framework/releng/{org.gemoc.modeldebugging.xdsmlframework.feature => org.eclipse.gemoc.xdsmlframework.feature}/.gitignore (100%) rename framework/xdsml_framework/releng/{org.gemoc.modeldebugging.xdsmlframework.feature => org.eclipse.gemoc.xdsmlframework.feature}/build.properties (100%) rename framework/xdsml_framework/releng/{org.gemoc.modeldebugging.xdsmlframework.feature => org.eclipse.gemoc.xdsmlframework.feature}/feature.xml (95%) rename framework/xdsml_framework/releng/{org.gemoc.modeldebugging.xdsmlframework.feature => org.eclipse.gemoc.xdsmlframework.feature}/pom.xml (83%) diff --git a/framework/xdsml_framework/pom.xml b/framework/xdsml_framework/pom.xml index 61e7f13e6..b5b00b205 100644 --- a/framework/xdsml_framework/pom.xml +++ b/framework/xdsml_framework/pom.xml @@ -19,7 +19,7 @@ tests/org.eclipse.gemoc.xdsmlframework.test.lib - releng/org.gemoc.modeldebugging.xdsmlframework.feature + releng/org.eclipse.gemoc.xdsmlframework.feature diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/.gitignore b/framework/xdsml_framework/releng/org.eclipse.gemoc.xdsmlframework.feature/.gitignore similarity index 100% rename from framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/.gitignore rename to framework/xdsml_framework/releng/org.eclipse.gemoc.xdsmlframework.feature/.gitignore diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/build.properties b/framework/xdsml_framework/releng/org.eclipse.gemoc.xdsmlframework.feature/build.properties similarity index 100% rename from framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/build.properties rename to framework/xdsml_framework/releng/org.eclipse.gemoc.xdsmlframework.feature/build.properties diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml b/framework/xdsml_framework/releng/org.eclipse.gemoc.xdsmlframework.feature/feature.xml similarity index 95% rename from framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml rename to framework/xdsml_framework/releng/org.eclipse.gemoc.xdsmlframework.feature/feature.xml index eaa437235..a1170b012 100644 --- a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/feature.xml +++ b/framework/xdsml_framework/releng/org.eclipse.gemoc.xdsmlframework.feature/feature.xml @@ -1,6 +1,6 @@ diff --git a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/pom.xml b/framework/xdsml_framework/releng/org.eclipse.gemoc.xdsmlframework.feature/pom.xml similarity index 83% rename from framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/pom.xml rename to framework/xdsml_framework/releng/org.eclipse.gemoc.xdsmlframework.feature/pom.xml index 88f58a745..51dcbbec1 100644 --- a/framework/xdsml_framework/releng/org.gemoc.modeldebugging.xdsmlframework.feature/pom.xml +++ b/framework/xdsml_framework/releng/org.eclipse.gemoc.xdsmlframework.feature/pom.xml @@ -9,7 +9,7 @@ 2.3.0-SNAPSHOT - org.gemoc.modeldebugging.xdsmlframework.feature + org.eclipse.gemoc.xdsmlframework.feature eclipse-feature \ No newline at end of file diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml index b8fb17abd..1854942dc 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml @@ -121,7 +121,7 @@ eclipse-feature - org.gemoc.modeldebugging.xdsmlframework.feature + org.eclipse.gemoc.xdsmlframework.feature 1.0.0 diff --git a/releng/org.gemoc.siriusanimation.repository/category.xml b/releng/org.gemoc.siriusanimation.repository/category.xml index eaa99da6f..6ea41fb08 100644 --- a/releng/org.gemoc.siriusanimation.repository/category.xml +++ b/releng/org.gemoc.siriusanimation.repository/category.xml @@ -18,10 +18,10 @@ - + - + From 6434856bd0d4655f2f751aef186f29ca092f6585 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 10:34:11 +0200 Subject: [PATCH 231/267] rename org.gemoc.executionframework.* in org.eclipse.gemoc.executionframework.* --- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../executionframework/debugger/ui/Activator.java | 0 .../debugger/ui/MutableFieldNameProvider.xtend | 0 .../debugger/ui/OpenSemanticsHandler.java | 0 .../ui/breakpoints/BreakpointDetailPaneFactory.java | 0 .../ui/breakpoints/GemocBreakpointDetailPane.java | 0 .../ui/breakpoints/GemocToggleBreakpointAction.java | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../pom.xml | 0 .../debugger/AbstractGemocDebugger.java | 0 .../debugger/AbstractGemocDebuggerFactory.java | 0 .../executionframework/debugger/Activator.java | 0 .../debugger/AnnotationMutableFieldExtractor.xtend | 0 .../debugger/GemocBreakpoint.java | 0 .../executionframework/debugger/IGemocDebugger.java | 0 .../debugger/IMutableFieldExtractor.java | 0 .../IntrospectiveMutableFieldExtractor.xtend | 0 .../executionframework/debugger/MutableField.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../pom.xml | 0 .../executionframework/engine/ui/Activator.java | 0 .../engine/ui/commons/RunConfiguration.java | 0 .../engine/ui/launcher/AbstractGemocLauncher.java | 0 .../launcher/AbstractSequentialGemocLauncher.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../icons/sample.gif | Bin .../plugin.xml | 0 .../pom.xml | 0 .../gemoc/executionframework/engine/Activator.java | 0 .../engine/commons/DefaultExecutionPlatform.java | 0 .../engine/commons/EngineContextException.java | 0 .../engine/commons/MelangeHelper.java | 0 .../engine/commons/ModelExecutionContext.java | 0 ...tractCommandBasedSequentialExecutionEngine.xtend | 0 .../engine/core/AbstractExecutionEngine.java | 0 .../core/AbstractSequentialExecutionEngine.java | 0 .../engine/core/CommandExecution.java | 0 .../engine/core/EngineStoppedException.java | 0 .../engine/core/ExecutionWorkspace.java | 0 .../engine/core/GemocRunningEnginesRegistry.java | 0 .../engine/core/IEngineRegistrationListener.java | 0 .../engine/core/SequentialExecutionException.xtend | 0 .../engine/profiler/Profiler.java | 0 .../executionframework/engine/profiler/Unit.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../contexts.xml | 0 .../icons/IconeGemocModel-16.png | Bin .../plugin.xml | 0 .../executionframework/eventmanager/Activator.java | 0 .../eventmanager/views/EventManagerRenderer.java | 0 .../eventmanager/views/EventManagerViewPart.java | 0 .../eventmanager/views/EventPane.java | 0 .../eventmanager/views/EventTableView.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../icons/breakpoint.gif | Bin .../icons/breakpoint_disabled.gif | Bin .../icons/breakpoint_enabled.gif | Bin .../icons/debug_exc.gif | Bin .../plugin.xml | 0 .../pom.xml | 0 .../extensions/sirius/Activator.java | 0 .../sirius/debug/DebugSessionFactory.java | 0 .../modelloader/DebugPermissionAuthority.java | 0 .../sirius/modelloader/DebugPermissionProvider.java | 0 .../sirius/modelloader/DebugURIHandler.java | 0 .../sirius/modelloader/DefaultModelLoader.java | 0 .../extensions/sirius/modelloader/PaletteUtils.java | 0 .../services/AbstractGemocAnimatorServices.java | 0 .../services/AbstractGemocDebuggerServices.java | 0 .../extensions/sirius/services/IModelAnimator.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../icons/IconeGemocModel-16.png | Bin .../icons/resume_co.png | Bin .../icons/services-16-blue.png | Bin .../icons/services-16-green.png | Bin .../icons/services-16-red.png | Bin .../icons/settings-5-16.png | Bin .../icons/suspend_co.png | Bin .../plugin.xml | 0 .../pom.xml | 0 .../org/gemoc/executionframework/ui/Activator.java | 0 .../gemoc/executionframework/ui/IMSEPresenter.java | 0 .../gemoc/executionframework/ui/SharedIcons.java | 0 .../ENamedElementQualifiedNameLabelProvider.java | 0 .../executionframework/ui/utils/ViewUtils.java | 0 .../engine/EngineSelectionDependentViewPart.java | 0 .../ui/views/engine/EngineSelectionManager.java | 0 .../ui/views/engine/EnginesStatusView.java | 0 .../ui/views/engine/IEngineSelectionListener.java | 0 .../ui/views/engine/ViewContentProvider.java | 0 .../views/engine/actions/AbstractEngineAction.java | 0 .../actions/DisposeAllStoppedEnginesAction.java | 0 .../engine/actions/DisposeStoppedEngineAction.java | 0 .../ui/views/engine/actions/StopEngineAction.java | 0 .../ui/xdsml/activefile/ActiveFile.java | 0 .../ui/xdsml/activefile/ActiveFileEcore.java | 0 .../ui/xdsml/activefile/ActiveFileGenmodel.java | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../test/lib/IEngineWrapper.xtend | 0 .../test/lib/IExecutableModel.xtend | 0 .../test/lib/ILanguageWrapper.xtend | 0 .../test/lib/impl/TestEngineAddon.xtend | 0 .../test/lib/impl/TestHelper.xtend | 0 .../test/lib/impl/TestModel.xtend | 0 .../test/lib/impl/TestRunConfiguration.xtend | 0 .../executionframework/test/lib/impl/TestUtil.xtend | 0 153 files changed, 0 insertions(+), 0 deletions(-) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/.classpath (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/.project (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/META-INF/MANIFEST.MF (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/build.properties (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/plugin.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/pom.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/src/org/gemoc/executionframework/debugger/ui/Activator.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger.ui => org.eclipse.gemoc.executionframework.debugger.ui}/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/.classpath (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/.project (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/META-INF/MANIFEST.MF (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/build.properties (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/pom.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/src/org/gemoc/executionframework/debugger/Activator.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/src/org/gemoc/executionframework/debugger/IGemocDebugger.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.debugger => org.eclipse.gemoc.executionframework.debugger}/src/org/gemoc/executionframework/debugger/MutableField.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/.checkstyle (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/.classpath (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/.gitignore (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/.project (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/META-INF/MANIFEST.MF (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/about.html (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/build.properties (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/pom.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/src/org/gemoc/executionframework/engine/ui/Activator.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine.ui => org.eclipse.gemoc.executionframework.engine.ui}/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/.checkstyle (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/.classpath (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/.gitignore (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/.project (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/.settings/org.eclipse.core.resources.prefs (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/META-INF/MANIFEST.MF (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/about.html (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/build.properties (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/icons/sample.gif (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/plugin.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/pom.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/Activator.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/commons/EngineContextException.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/core/CommandExecution.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/profiler/Profiler.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.engine => org.eclipse.gemoc.executionframework.engine}/src/org/gemoc/executionframework/engine/profiler/Unit.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/.checkstyle (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/.classpath (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/.project (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/META-INF/MANIFEST.MF (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/build.properties (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/contexts.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/icons/IconeGemocModel-16.png (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/plugin.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/src/org/gemoc/executionframework/eventmanager/Activator.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/src/org/gemoc/executionframework/eventmanager/views/EventPane.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.eventmanager => org.eclipse.gemoc.executionframework.eventmanager}/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/.checkstyle (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/.classpath (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/.project (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/META-INF/MANIFEST.MF (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/about.html (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/build.properties (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/icons/breakpoint.gif (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/icons/breakpoint_disabled.gif (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/icons/breakpoint_enabled.gif (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/icons/debug_exc.gif (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/plugin.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/pom.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/src/org/gemoc/executionframework/extensions/sirius/Activator.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/src/org/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/src/org/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.extensions.sirius => org.eclipse.gemoc.executionframework.extensions.sirius}/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/.checkstyle (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/.classpath (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/.gitignore (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/.project (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/META-INF/MANIFEST.MF (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/about.html (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/build.properties (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/icons/IconeGemocModel-16.png (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/icons/resume_co.png (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/icons/services-16-blue.png (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/icons/services-16-green.png (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/icons/services-16-red.png (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/icons/settings-5-16.png (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/icons/suspend_co.png (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/plugin.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/pom.xml (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/Activator.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/IMSEPresenter.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/SharedIcons.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/utils/ViewUtils.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java (100%) rename framework/execution_framework/plugins/{org.gemoc.executionframework.ui => org.eclipse.gemoc.executionframework.ui}/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/.classpath (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/.project (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/.settings/org.eclipse.jdt.core.prefs (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/META-INF/MANIFEST.MF (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/build.properties (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend (100%) rename framework/execution_framework/tests/{org.gemoc.executionframework.test.lib => org.eclipse.gemoc.executionframework.test.lib}/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend (100%) diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.classpath similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.classpath rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.classpath diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.project similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.project rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.project diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/build.properties b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/build.properties similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/build.properties rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/build.properties diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/plugin.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/plugin.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/pom.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/pom.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/pom.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/Activator.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/Activator.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/.classpath similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.classpath rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/.classpath diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/.project similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.project rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/.project diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/META-INF/MANIFEST.MF rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/build.properties b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/build.properties similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/build.properties rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/build.properties diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/pom.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/pom.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/pom.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/MutableField.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/MutableField.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/MutableField.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/MutableField.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.checkstyle b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.checkstyle similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.checkstyle rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.checkstyle diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.classpath similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.classpath rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.classpath diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.gitignore b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.gitignore similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.gitignore rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.gitignore diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.project similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.project rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.project diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/.settings/org.eclipse.jdt.core.prefs rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/about.html b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/about.html similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/about.html rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/about.html diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/build.properties b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/build.properties similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/build.properties rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/build.properties diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/pom.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/pom.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/pom.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.checkstyle b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.checkstyle similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/.checkstyle rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.checkstyle diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.classpath similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/.classpath rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.classpath diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.gitignore b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.gitignore similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/.gitignore rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.gitignore diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.project similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/.project rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.project diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.settings/org.eclipse.core.resources.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/.settings/org.eclipse.core.resources.prefs rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.settings/org.eclipse.core.resources.prefs diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/.settings/org.eclipse.jdt.core.prefs rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/META-INF/MANIFEST.MF rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/about.html b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/about.html similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/about.html rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/about.html diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/build.properties b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/build.properties similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/build.properties rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/build.properties diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/icons/sample.gif b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/icons/sample.gif similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/icons/sample.gif rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/icons/sample.gif diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/plugin.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/plugin.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/plugin.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/plugin.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/pom.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/pom.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/pom.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/EngineContextException.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/EngineContextException.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/EngineContextException.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/EngineContextException.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Profiler.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Profiler.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Profiler.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Profiler.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Unit.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Unit.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Unit.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Unit.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.checkstyle b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.checkstyle similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.checkstyle rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.checkstyle diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.classpath similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.classpath rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.classpath diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.project similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.project rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.project diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/.settings/org.eclipse.jdt.core.prefs rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/build.properties b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/build.properties similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/build.properties rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/build.properties diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/contexts.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/contexts.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/contexts.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/contexts.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/IconeGemocModel-16.png b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/icons/IconeGemocModel-16.png similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/icons/IconeGemocModel-16.png rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/icons/IconeGemocModel-16.png diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/plugin.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/plugin.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/plugin.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/plugin.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.checkstyle b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.checkstyle similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.checkstyle rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.checkstyle diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.classpath similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.classpath rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.classpath diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.project similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.project rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.project diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/.settings/org.eclipse.jdt.core.prefs rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/about.html b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/about.html similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/about.html rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/about.html diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/build.properties b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/build.properties similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/build.properties rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/build.properties diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/icons/breakpoint.gif b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint.gif similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/icons/breakpoint.gif rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint.gif diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/icons/breakpoint_disabled.gif b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint_disabled.gif similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/icons/breakpoint_disabled.gif rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint_disabled.gif diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/icons/breakpoint_enabled.gif b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint_enabled.gif similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/icons/breakpoint_enabled.gif rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint_enabled.gif diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/plugin.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/plugin.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/plugin.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/plugin.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/pom.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/pom.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/pom.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.checkstyle b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.checkstyle similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/.checkstyle rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.checkstyle diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.classpath similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/.classpath rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.classpath diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.gitignore b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.gitignore similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/.gitignore rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.gitignore diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.project similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/.project rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.project diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/.settings/org.eclipse.jdt.core.prefs rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/META-INF/MANIFEST.MF rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/about.html b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/about.html similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/about.html rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/about.html diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/build.properties b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/build.properties similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/build.properties rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/build.properties diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/IconeGemocModel-16.png b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/IconeGemocModel-16.png similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/IconeGemocModel-16.png rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/IconeGemocModel-16.png diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/resume_co.png b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/resume_co.png similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/resume_co.png rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/resume_co.png diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/services-16-blue.png b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/services-16-blue.png similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/services-16-blue.png rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/services-16-blue.png diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/services-16-green.png b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/services-16-green.png similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/services-16-green.png rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/services-16-green.png diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/services-16-red.png b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/services-16-red.png similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/services-16-red.png rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/services-16-red.png diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/settings-5-16.png b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/settings-5-16.png similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/settings-5-16.png rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/settings-5-16.png diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/suspend_co.png b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/suspend_co.png similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/icons/suspend_co.png rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/icons/suspend_co.png diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/plugin.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/plugin.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/plugin.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/plugin.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/pom.xml similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/pom.xml rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/pom.xml diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/IMSEPresenter.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/IMSEPresenter.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/IMSEPresenter.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/IMSEPresenter.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/SharedIcons.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/SharedIcons.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/SharedIcons.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/SharedIcons.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ViewUtils.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ViewUtils.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ViewUtils.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ViewUtils.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java similarity index 100% rename from framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.classpath b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/.classpath similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.classpath rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/.classpath diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.project b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/.project similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.project rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/.project diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/.settings/org.eclipse.jdt.core.prefs rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/.settings/org.eclipse.jdt.core.prefs diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/build.properties b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/build.properties similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/build.properties rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/build.properties diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend diff --git a/framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend similarity index 100% rename from framework/execution_framework/tests/org.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend From ea57d881b82c9ea0b42b4d53e3d73d1b19023525 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 10:38:18 +0200 Subject: [PATCH 232/267] rename org.gemoc.executionframework.* in org.eclipse.gemoc.executionframework.* --- .../.project | 2 +- .../META-INF/MANIFEST.MF | 16 +++---- .../plugin.xml | 28 ++++++------- .../pom.xml | 2 +- .../debugger/ui/Activator.java | 2 +- .../ui/MutableFieldNameProvider.xtend | 4 +- .../debugger/ui/OpenSemanticsHandler.java | 8 ++-- .../BreakpointDetailPaneFactory.java | 4 +- .../GemocBreakpointDetailPane.java | 4 +- .../GemocToggleBreakpointAction.java | 6 +-- .../.project | 2 +- .../META-INF/MANIFEST.MF | 10 ++--- .../pom.xml | 2 +- .../debugger/AbstractGemocDebugger.java | 2 +- .../AbstractGemocDebuggerFactory.java | 2 +- .../debugger/Activator.java | 2 +- .../AnnotationMutableFieldExtractor.xtend | 4 +- .../debugger/GemocBreakpoint.java | 2 +- .../debugger/IGemocDebugger.java | 2 +- .../debugger/IMutableFieldExtractor.java | 2 +- .../IntrospectiveMutableFieldExtractor.xtend | 4 +- .../debugger/MutableField.java | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 14 +++---- .../pom.xml | 2 +- .../engine/ui/Activator.java | 4 +- .../engine/ui/commons/RunConfiguration.java | 2 +- .../ui/launcher/AbstractGemocLauncher.java | 4 +- .../AbstractSequentialGemocLauncher.java | 14 +++---- .../.project | 2 +- .../META-INF/MANIFEST.MF | 12 +++--- .../pom.xml | 2 +- .../executionframework/engine/Activator.java | 8 ++-- .../commons/DefaultExecutionPlatform.java | 2 +- .../commons/EngineContextException.java | 2 +- .../engine/commons/MelangeHelper.java | 2 +- .../engine/commons/ModelExecutionContext.java | 6 +-- ...ommandBasedSequentialExecutionEngine.xtend | 2 +- .../engine/core/AbstractExecutionEngine.java | 14 +++---- .../AbstractSequentialExecutionEngine.java | 4 +- .../engine/core/CommandExecution.java | 2 +- .../engine/core/EngineStoppedException.java | 2 +- .../engine/core/ExecutionWorkspace.java | 2 +- .../core/GemocRunningEnginesRegistry.java | 2 +- .../core/IEngineRegistrationListener.java | 2 +- .../core/SequentialExecutionException.xtend | 2 +- .../engine/profiler/Profiler.java | 2 +- .../engine/profiler/Unit.java | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 6 +-- .../plugin.xml | 12 +++--- .../eventmanager/Activator.java | 4 +- .../views/EventManagerRenderer.java | 2 +- .../views/EventManagerViewPart.java | 6 +-- .../eventmanager/views/EventPane.java | 2 +- .../eventmanager/views/EventTableView.java | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 14 +++---- .../plugin.xml | 2 +- .../pom.xml | 2 +- .../extensions/sirius/Activator.java | 6 +-- .../sirius/debug/DebugSessionFactory.java | 2 +- .../modelloader/DebugPermissionAuthority.java | 2 +- .../modelloader/DebugPermissionProvider.java | 2 +- .../sirius/modelloader/DebugURIHandler.java | 2 +- .../modelloader/DefaultModelLoader.java | 10 ++--- .../sirius/modelloader/PaletteUtils.java | 2 +- .../AbstractGemocAnimatorServices.java | 4 +- .../AbstractGemocDebuggerServices.java | 2 +- .../sirius/services/IModelAnimator.java | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 16 +++---- .../plugin.xml | 20 ++++----- .../pom.xml | 2 +- .../executionframework/ui/Activator.java | 4 +- .../executionframework/ui/IMSEPresenter.java | 2 +- .../executionframework/ui/SharedIcons.java | 2 +- ...amedElementQualifiedNameLabelProvider.java | 2 +- .../ui/utils/ViewUtils.java | 2 +- .../EngineSelectionDependentViewPart.java | 4 +- .../views/engine/EngineSelectionManager.java | 2 +- .../ui/views/engine/EnginesStatusView.java | 42 +++++++++---------- .../engine/IEngineSelectionListener.java | 2 +- .../ui/views/engine/ViewContentProvider.java | 6 +-- .../engine/actions/AbstractEngineAction.java | 6 +-- .../DisposeAllStoppedEnginesAction.java | 6 +-- .../actions/DisposeStoppedEngineAction.java | 6 +-- .../engine/actions/StopEngineAction.java | 6 +-- .../ui/xdsml/activefile/ActiveFile.java | 2 +- .../ui/xdsml/activefile/ActiveFileEcore.java | 4 +- .../xdsml/activefile/ActiveFileGenmodel.java | 4 +- framework/execution_framework/pom.xml | 12 +++--- .../feature.xml | 12 +++--- .../.project | 2 +- .../META-INF/MANIFEST.MF | 8 ++-- .../test/lib/IEngineWrapper.xtend | 2 +- .../test/lib/IExecutableModel.xtend | 2 +- .../test/lib/ILanguageWrapper.xtend | 2 +- .../test/lib/impl/TestEngineAddon.xtend | 2 +- .../test/lib/impl/TestHelper.xtend | 8 ++-- .../test/lib/impl/TestModel.xtend | 4 +- .../test/lib/impl/TestRunConfiguration.xtend | 6 +-- .../test/lib/impl/TestUtil.xtend | 4 +- .../sirius/command/AddDebugLayerHandler.java | 26 ++++++------ .../META-INF/MANIFEST.MF | 12 +++--- .../plugin.xml | 8 ++-- .../sequential/javaengine/ui/Activator.java | 2 +- .../GemocToggleBreakpointHandler.java | 2 +- .../debug/GenericSequentialModelDebugger.java | 6 +-- ...scientGenericSequentialModelDebugger.xtend | 2 +- ...GemocSequentialToggleBreakpointAction.java | 2 +- .../launcher/GemocDebugModelPresentation.java | 4 +- .../javaengine/ui/launcher/Launcher.java | 18 ++++---- .../launcher/SequentialRunConfiguration.java | 2 +- .../tabs/LaunchConfigurationMainTab.java | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../javaengine/PlainK3ExecutionEngine.java | 6 +-- .../SequentialModelExecutionContext.java | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../javaengine/tests/JavaEngineTests.xtend | 4 +- .../tests/languages/LegacyFSM.xtend | 2 +- .../javaengine/tests/languages/TFSM.xtend | 2 +- .../tests/wrapper/JavaEngineWrapper.xtend | 8 ++-- .../META-INF/MANIFEST.MF | 4 +- ...SequentialLanguageDefinitionExtension.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- ...eGemocSequentialLanguageNatureHandler.java | 2 +- .../GemocSequentialLanguageBuilder.java | 4 +- .../CreateDSAWizardContextActionDSAK3.java | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../GenericEngineTraceAddonGenerator.xtend | 2 +- .../codegen/StateManagerGeneratorJava.xtend | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../gemoc/traceaddon/AbstractTraceAddon.xtend | 2 +- .../gemoc/traceaddon/GenericStateManager.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../plugin.xml | 4 +- .../views/TimelineDiffViewerViewPart.java | 2 +- .../META-INF/MANIFEST.MF | 8 ++-- .../plugin.xml | 4 +- .../MultidimensionalTimelineViewPart.java | 8 ++-- .../META-INF/MANIFEST.MF | 2 +- .../stategraph/views/StateGraphViewPart.java | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../BenchmarkExecutionModelContext.xtend | 2 +- .../trace/benchmark/utils/EngineHelper.java | 4 +- 147 files changed, 360 insertions(+), 360 deletions(-) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/{ => eclipse}/gemoc/executionframework/debugger/ui/Activator.java (97%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/{ => eclipse}/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend (88%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/{ => eclipse}/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java (90%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/{ => eclipse}/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java (94%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/{ => eclipse}/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java (96%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/{ => eclipse}/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java (89%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/{ => eclipse}/gemoc/executionframework/debugger/AbstractGemocDebugger.java (99%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/{ => eclipse}/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java (94%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/{ => eclipse}/gemoc/executionframework/debugger/Activator.java (98%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/{ => eclipse}/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend (95%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/{ => eclipse}/gemoc/executionframework/debugger/GemocBreakpoint.java (98%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/{ => eclipse}/gemoc/executionframework/debugger/IGemocDebugger.java (94%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/{ => eclipse}/gemoc/executionframework/debugger/IMutableFieldExtractor.java (92%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/{ => eclipse}/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend (98%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/{ => eclipse}/gemoc/executionframework/debugger/MutableField.java (96%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/{ => eclipse}/gemoc/executionframework/engine/ui/Activator.java (93%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/{ => eclipse}/gemoc/executionframework/engine/ui/commons/RunConfiguration.java (98%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/{ => eclipse}/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java (89%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/{ => eclipse}/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java (93%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/Activator.java (87%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java (97%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/commons/EngineContextException.java (93%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/commons/MelangeHelper.java (99%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/commons/ModelExecutionContext.java (96%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend (95%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/core/AbstractExecutionEngine.java (96%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java (98%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/core/CommandExecution.java (96%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/core/EngineStoppedException.java (94%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/core/ExecutionWorkspace.java (98%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java (98%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/core/IEngineRegistrationListener.java (95%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/core/SequentialExecutionException.xtend (96%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/profiler/Profiler.java (97%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/{ => eclipse}/gemoc/executionframework/engine/profiler/Unit.java (91%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/{ => eclipse}/gemoc/executionframework/eventmanager/Activator.java (91%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/{ => eclipse}/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java (99%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/{ => eclipse}/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java (85%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/{ => eclipse}/gemoc/executionframework/eventmanager/views/EventPane.java (94%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/{ => eclipse}/gemoc/executionframework/eventmanager/views/EventTableView.java (99%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/{ => eclipse}/gemoc/executionframework/extensions/sirius/Activator.java (89%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/{ => eclipse}/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java (99%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/{ => eclipse}/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java (97%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/{ => eclipse}/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java (96%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/{ => eclipse}/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java (96%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/{ => eclipse}/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java (98%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/{ => eclipse}/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java (97%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/{ => eclipse}/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java (99%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/{ => eclipse}/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java (91%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/{ => eclipse}/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java (94%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/Activator.java (96%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/IMSEPresenter.java (95%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/SharedIcons.java (97%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java (95%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/utils/ViewUtils.java (95%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java (93%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java (96%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/views/engine/EnginesStatusView.java (85%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java (92%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/views/engine/ViewContentProvider.java (87%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java (92%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java (85%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java (90%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java (89%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java (93%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java (91%) rename framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/{ => eclipse}/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java (91%) rename framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/{ => eclipse}/gemoc/executionframework/test/lib/IEngineWrapper.xtend (85%) rename framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/{ => eclipse}/gemoc/executionframework/test/lib/IExecutableModel.xtend (79%) rename framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/{ => eclipse}/gemoc/executionframework/test/lib/ILanguageWrapper.xtend (71%) rename framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/{ => eclipse}/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend (97%) rename framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/{ => eclipse}/gemoc/executionframework/test/lib/impl/TestHelper.xtend (92%) rename framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/{ => eclipse}/gemoc/executionframework/test/lib/impl/TestModel.xtend (89%) rename framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/{ => eclipse}/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend (92%) rename framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/{ => eclipse}/gemoc/executionframework/test/lib/impl/TestUtil.xtend (96%) diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.project index 748c7f83c..62df3190e 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.project +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/.project @@ -1,6 +1,6 @@ - org.gemoc.executionframework.debugger.ui + org.eclipse.gemoc.executionframework.debugger.ui diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF index a346da27d..4d6255d02 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: org.gemoc.executionframework.debugger.ui -Bundle-SymbolicName: org.gemoc.executionframework.debugger.ui;singleton:=true +Bundle-Name: org.eclipse.gemoc.executionframework.debugger.ui +Bundle-SymbolicName: org.eclipse.gemoc.executionframework.debugger.ui;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-Activator: org.gemoc.executionframework.debugger.ui.Activator -Export-Package: org.gemoc.executionframework.debugger.ui;uses:="org.eclipse.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", - org.gemoc.executionframework.debugger.ui.breakpoints +Bundle-Activator: org.eclipse.gemoc.executionframework.debugger.ui.Activator +Export-Package: org.eclipse.gemoc.executionframework.debugger.ui;uses:="org.eclipse.gemoc.xdsmlframework.api.core,org.eclipse.core.commands,org.eclipse.jface.viewers", + org.eclipse.gemoc.executionframework.debugger.ui.breakpoints Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, @@ -17,14 +17,14 @@ Require-Bundle: com.google.guava, org.eclipse.debug.core, fr.obeo.dsl.debug.ide, org.eclipse.core.runtime;bundle-version="3.12.0", - org.gemoc.executionframework.engine, + org.eclipse.gemoc.executionframework.engine, org.eclipse.gemoc.commons.eclipse.ui, org.eclipse.equinox.registry, org.eclipse.ui.workbench, org.eclipse.xtext;bundle-version="2.10.0", - org.gemoc.executionframework.debugger;bundle-version="1.0.0", + org.eclipse.gemoc.executionframework.debugger;bundle-version="1.0.0", fr.obeo.dsl.debug.ide.sirius.ui, - org.gemoc.executionframework.engine.ui, + org.eclipse.gemoc.executionframework.engine.ui, fr.inria.diverse.melange.resource, fr.obeo.dsl.debug.ide.ui;bundle-version="2.3.0", org.eclipse.sirius;bundle-version="4.1.3", diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml index 9f60c99a1..f981adc78 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml @@ -2,7 +2,7 @@ @@ -14,9 +14,9 @@ @@ -24,8 +24,8 @@ + class="org.eclipse.gemoc.executionframework.debugger.ui.breakpoints.BreakpointDetailPaneFactory" + id="org.eclipse.gemoc.executionframework.debugger.detailFactories"> @@ -34,7 +34,7 @@ + value="org.eclipse.gemoc.executionframework.debugger.GemocBreakpoint"> @@ -44,7 +44,7 @@ @@ -54,15 +54,15 @@ + class="org.eclipse.gemoc.executionframework.debugger.ui.OpenSemanticsHandler" + commandId="org.eclipse.gemoc.executionframework.debugger.ui.openSemantics"> @@ -79,8 +79,8 @@ + actionClass="org.eclipse.gemoc.executionframework.debugger.ui.breakpoints.GemocToggleBreakpointAction" + id="org.eclipse.gemoc.executionframework.debugger.ui.GemocToggleBreakpointAction"> diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/pom.xml index 5358c227b..7d4d8b410 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/pom.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/pom.xml @@ -10,7 +10,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 2.3.0-SNAPSHOT - org.gemoc.executionframework.debugger.ui + org.eclipse.gemoc.executionframework.debugger.ui 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/Activator.java similarity index 97% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/Activator.java index ddc86a678..04b07ba98 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/Activator.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger.ui; +package org.eclipse.gemoc.executionframework.debugger.ui; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend similarity index 88% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend index 808300756..ea8d0bcff 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/MutableFieldNameProvider.xtend @@ -8,11 +8,11 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.gemoc.executionframework.debugger.ui + package org.eclipse.gemoc.executionframework.debugger.ui import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; -import org.gemoc.executionframework.debugger.MutableField +import org.eclipse.gemoc.executionframework.debugger.MutableField public class MutableFieldNameProvider extends DefaultDeclarativeQualifiedNameProvider{ diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java similarity index 90% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java index dffc626cb..a9109b191 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/OpenSemanticsHandler.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger.ui; +package org.eclipse.gemoc.executionframework.debugger.ui; import java.io.File; import java.io.IOException; @@ -28,7 +28,7 @@ import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.gemoc.commons.eclipse.ui.OpenEditor; -import org.gemoc.executionframework.engine.core.AbstractExecutionEngine; +import org.eclipse.gemoc.executionframework.engine.core.AbstractExecutionEngine; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.osgi.framework.Bundle; @@ -102,8 +102,8 @@ public void locateAndOpenSource(TreeSelection selection) { } public Object execute(ExecutionEvent event) throws ExecutionException { - Supplier engineSupplier = org.gemoc.executionframework.debugger.Activator.getDefault().getEngineSupplier(); - Supplier bundleSupplier = org.gemoc.executionframework.debugger.Activator.getDefault().getBundleSymbolicNameSupplier(); + Supplier engineSupplier = org.eclipse.gemoc.executionframework.debugger.Activator.getDefault().getEngineSupplier(); + Supplier bundleSupplier = org.eclipse.gemoc.executionframework.debugger.Activator.getDefault().getBundleSymbolicNameSupplier(); if (engineSupplier != null) { this.engine = engineSupplier.get(); } diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java similarity index 94% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java index 5d9d44f90..0a9eb2be9 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/breakpoints/BreakpointDetailPaneFactory.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger.ui.breakpoints; +package org.eclipse.gemoc.executionframework.debugger.ui.breakpoints; import java.util.HashSet; import java.util.Set; @@ -17,7 +17,7 @@ import org.eclipse.debug.ui.IDetailPane; import org.eclipse.debug.ui.IDetailPaneFactory; import org.eclipse.jface.viewers.IStructuredSelection; -import org.gemoc.executionframework.debugger.GemocBreakpoint; +import org.eclipse.gemoc.executionframework.debugger.GemocBreakpoint; import fr.obeo.dsl.debug.ide.DSLBreakpoint; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java similarity index 96% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java index 477c11290..b1b1d8bae 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/breakpoints/GemocBreakpointDetailPane.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger.ui.breakpoints; +package org.eclipse.gemoc.executionframework.debugger.ui.breakpoints; import org.eclipse.debug.ui.IDetailPane; import org.eclipse.jface.viewers.IStructuredSelection; @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbenchPartSite; -import org.gemoc.executionframework.debugger.GemocBreakpoint; +import org.eclipse.gemoc.executionframework.debugger.GemocBreakpoint; /** * Gemoc {@link IDetailPane} for breakpoints. diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java similarity index 89% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java index 495374c5e..9b5aae48f 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/src/org/eclipse/gemoc/executionframework/debugger/ui/breakpoints/GemocToggleBreakpointAction.java @@ -8,14 +8,14 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger.ui.breakpoints; +package org.eclipse.gemoc.executionframework.debugger.ui.breakpoints; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.gemoc.executionframework.debugger.GemocBreakpoint; -import org.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher; +import org.eclipse.gemoc.executionframework.debugger.GemocBreakpoint; +import org.eclipse.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher; import fr.inria.diverse.melange.resource.MelangeResource; import fr.obeo.dsl.debug.ide.DSLBreakpoint; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/.project index a21fa6b47..b6e852ca4 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/.project +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/.project @@ -1,6 +1,6 @@ - org.gemoc.executionframework.debugger + org.eclipse.gemoc.executionframework.debugger diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF index 303859be4..aac7d78dc 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: org.gemoc.executionframework.debugger -Bundle-SymbolicName: org.gemoc.executionframework.debugger;singleton:=true +Bundle-Name: org.eclipse.gemoc.executionframework.debugger +Bundle-SymbolicName: org.eclipse.gemoc.executionframework.debugger;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-Activator: org.gemoc.executionframework.debugger.Activator +Bundle-Activator: org.eclipse.gemoc.executionframework.debugger.Activator Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, @@ -19,7 +19,7 @@ Require-Bundle: com.google.guava, org.eclipse.debug.ui, fr.obeo.dsl.debug;bundle-version="2.3.0", org.eclipse.core.runtime;bundle-version="3.12.0", - org.gemoc.executionframework.engine;bundle-version="2.3.0", + org.eclipse.gemoc.executionframework.engine;bundle-version="2.3.0", org.eclipse.emf.transaction;bundle-version="1.9.0", org.eclipse.gemoc.xdsmlframework.commons;bundle-version="2.3.0", org.eclipse.xtext;bundle-version="2.10.0", @@ -27,6 +27,6 @@ Require-Bundle: com.google.guava, org.eclipse.gemoc.commons.eclipse.pde;bundle-version="2.3.0", fr.inria.diverse.commons.eclipse;bundle-version="1.0.0", org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0" -Export-Package: org.gemoc.executionframework.debugger +Export-Package: org.eclipse.gemoc.executionframework.debugger Bundle-ActivationPolicy: lazy diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/pom.xml index e8a807cfe..b4253d08d 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/pom.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/pom.xml @@ -10,7 +10,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 2.3.0-SNAPSHOT - org.gemoc.executionframework.debugger + org.eclipse.gemoc.executionframework.debugger 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AbstractGemocDebugger.java similarity index 99% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AbstractGemocDebugger.java index 1c59d9cb8..ed38c3c14 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AbstractGemocDebugger.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger; +package org.eclipse.gemoc.executionframework.debugger; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java similarity index 94% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java index 2c8a8177a..f37ae7a65 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AbstractGemocDebuggerFactory.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger; +package org.eclipse.gemoc.executionframework.debugger; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/Activator.java similarity index 98% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/Activator.java index db78da562..29335b1ef 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/Activator.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger; +package org.eclipse.gemoc.executionframework.debugger; import java.util.function.Supplier; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend similarity index 95% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend index 9d3724904..688bcad8d 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AnnotationMutableFieldExtractor.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.gemoc.executionframework.debugger + package org.eclipse.gemoc.executionframework.debugger import java.text.DecimalFormat import java.text.NumberFormat @@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EObject import org.eclipse.emf.transaction.RecordingCommand import org.eclipse.emf.transaction.util.TransactionUtil -import org.gemoc.executionframework.engine.core.CommandExecution +import org.eclipse.gemoc.executionframework.engine.core.CommandExecution import org.eclipse.gemoc.xdsmlframework.commons.DynamicAnnotationHelper import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/GemocBreakpoint.java similarity index 98% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/GemocBreakpoint.java index 87db3fd53..bc165aa3e 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/GemocBreakpoint.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/GemocBreakpoint.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger; +package org.eclipse.gemoc.executionframework.debugger; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IGemocDebugger.java similarity index 94% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IGemocDebugger.java index f8fb49027..1ee5483b6 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IGemocDebugger.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IGemocDebugger.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger; +package org.eclipse.gemoc.executionframework.debugger; import java.util.function.BiPredicate; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IMutableFieldExtractor.java similarity index 92% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IMutableFieldExtractor.java index 7655ad119..650e83231 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IMutableFieldExtractor.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IMutableFieldExtractor.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger; +package org.eclipse.gemoc.executionframework.debugger; import java.util.List; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend similarity index 98% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend index f282dc554..e32921c2d 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IntrospectiveMutableFieldExtractor.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.gemoc.executionframework.debugger + package org.eclipse.gemoc.executionframework.debugger import java.util.ArrayList import java.util.Arrays @@ -21,7 +21,7 @@ import java.util.Map import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.impl.EObjectImpl -import org.gemoc.executionframework.engine.commons.MelangeHelper +import org.eclipse.gemoc.executionframework.engine.commons.MelangeHelper class IntrospectiveMutableFieldExtractor implements IMutableFieldExtractor { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/MutableField.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/MutableField.java similarity index 96% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/MutableField.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/MutableField.java index bd6c43157..402be8be4 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/gemoc/executionframework/debugger/MutableField.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/MutableField.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.debugger; +package org.eclipse.gemoc.executionframework.debugger; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.project index b4cc92774..916618875 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.project +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.project @@ -1,6 +1,6 @@ - org.gemoc.executionframework.engine.ui + org.eclipse.gemoc.executionframework.engine.ui diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF index 42850b305..6a26610e4 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Execution Engine UI -Bundle-SymbolicName: org.gemoc.executionframework.engine.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.executionframework.engine.ui;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.executionframework.engine.ui.Activator +Bundle-Activator: org.eclipse.gemoc.executionframework.engine.ui.Activator Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.commons.eclipse, org.eclipse.emf.transaction, fr.obeo.dsl.debug.ide, org.eclipse.debug.ui, - org.gemoc.executionframework.engine, + org.eclipse.gemoc.executionframework.engine, org.eclipse.ui, org.eclipse.gemoc.commons.eclipse.ui, org.eclipse.xtend.lib, @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", org.eclipse.sirius;bundle-version="2.0.7", org.eclipse.xtext, - org.gemoc.executionframework.extensions.sirius, + org.eclipse.gemoc.executionframework.extensions.sirius, org.eclipse.gemoc.commons.eclipse.messagingsystem.api, fr.obeo.dsl.debug.ide.ui;bundle-version="1.0.0", fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", @@ -25,6 +25,6 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, fr.inria.diverse.melange Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.gemoc.executionframework.engine.ui, - org.gemoc.executionframework.engine.ui.commons, - org.gemoc.executionframework.engine.ui.launcher +Export-Package: org.eclipse.gemoc.executionframework.engine.ui, + org.eclipse.gemoc.executionframework.engine.ui.commons, + org.eclipse.gemoc.executionframework.engine.ui.launcher diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/pom.xml index 9e1cae9c0..2d300dbea 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/pom.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/pom.xml @@ -10,7 +10,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 2.3.0-SNAPSHOT - org.gemoc.executionframework.engine.ui + org.eclipse.gemoc.executionframework.engine.ui 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/Activator.java similarity index 93% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/Activator.java index e780f5a6f..4766fffcb 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/Activator.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui; +package org.eclipse.gemoc.executionframework.engine.ui; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; @@ -23,7 +23,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.executionframework.engine.ui"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.executionframework.engine.ui"; //$NON-NLS-1$ // The shared instance diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/commons/RunConfiguration.java similarity index 98% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/commons/RunConfiguration.java index c3a87fbf1..aa4e77bc3 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/commons/RunConfiguration.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/commons/RunConfiguration.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.commons; +package org.eclipse.gemoc.executionframework.engine.ui.commons; import java.util.ArrayList; import java.util.Collection; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java similarity index 89% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java index cd7c74dab..b73ab75e1 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.launcher; +package org.eclipse.gemoc.executionframework.engine.ui.launcher; import java.util.Collections; import java.util.Map; @@ -23,7 +23,7 @@ abstract public class AbstractGemocLauncher extends fr.obeo.dsl.debug.ide.sirius.ui.launch.AbstractDSLLaunchConfigurationDelegateUI { // warning this MODEL_ID must be the same as the one in the ModelLoader in order to enable correctly the breakpoints - public final static String MODEL_ID = org.gemoc.executionframework.engine.ui.Activator.PLUGIN_ID+".debugModel"; + public final static String MODEL_ID = org.eclipse.gemoc.executionframework.engine.ui.Activator.PLUGIN_ID+".debugModel"; public Map parseLaunchConfiguration(LaunchConfiguration launchConfiguration) { return Collections.emptyMap(); diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java similarity index 93% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java index 6e52d5312..6de009188 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractSequentialGemocLauncher.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.ui.launcher; +package org.eclipse.gemoc.executionframework.engine.ui.launcher; import java.util.Collection; import java.util.List; @@ -33,10 +33,10 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; -import org.gemoc.executionframework.engine.commons.EngineContextException; -import org.gemoc.executionframework.engine.ui.commons.RunConfiguration; -import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocAnimatorServices; -import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices; +import org.eclipse.gemoc.executionframework.engine.commons.EngineContextException; +import org.eclipse.gemoc.executionframework.engine.ui.commons.RunConfiguration; +import org.eclipse.gemoc.executionframework.extensions.sirius.services.AbstractGemocAnimatorServices; +import org.eclipse.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices; import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; @@ -48,7 +48,7 @@ abstract public class AbstractSequentialGemocLauncher extends AbstractGemocLauncher { // warning this MODEL_ID must be the same as the one in the ModelLoader in order to enable correctly the breakpoints - public final static String MODEL_ID = org.gemoc.executionframework.extensions.sirius.Activator.PLUGIN_ID + ".debugModel"; + public final static String MODEL_ID = org.eclipse.gemoc.executionframework.extensions.sirius.Activator.PLUGIN_ID + ".debugModel"; protected IExecutionEngine _executionEngine; @@ -152,7 +152,7 @@ protected IStatus run(IProgressMonitor monitor) { private boolean isEngineAlreadyRunning(URI launchedModelURI) throws CoreException { // make sure there is no other running engine on this model - Collection engines = org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry + Collection engines = org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry .getRunningEngines().values(); for (IExecutionEngine engine : engines) { IExecutionEngine observable = (IExecutionEngine) engine; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.project index 7ed2ff703..d915d0a90 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.project +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.project @@ -1,6 +1,6 @@ - org.gemoc.executionframework.engine + org.eclipse.gemoc.executionframework.engine diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF index be79ddebe..3b9bd9dd0 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Engine -Bundle-SymbolicName: org.gemoc.executionframework.engine;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.executionframework.engine;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.executionframework.engine.Activator +Bundle-Activator: org.eclipse.gemoc.executionframework.engine.Activator Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.commons.eclipse, org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.gemoc.executionframework.engine, - org.gemoc.executionframework.engine.commons, - org.gemoc.executionframework.engine.core, - org.gemoc.executionframework.engine.profiler +Export-Package: org.eclipse.gemoc.executionframework.engine, + org.eclipse.gemoc.executionframework.engine.commons, + org.eclipse.gemoc.executionframework.engine.core, + org.eclipse.gemoc.executionframework.engine.profiler diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/pom.xml index c86c2eec3..15eb5bee5 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/pom.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/pom.xml @@ -10,7 +10,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 2.3.0-SNAPSHOT - org.gemoc.executionframework.engine + org.eclipse.gemoc.executionframework.engine 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/Activator.java similarity index 87% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/Activator.java index e338b4a68..8ae540a3c 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/Activator.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/Activator.java @@ -8,11 +8,11 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine; +package org.eclipse.gemoc.executionframework.engine; import org.eclipse.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend; import org.eclipse.gemoc.commons.eclipse.pde.GemocPlugin; -import org.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; +import org.eclipse.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; import org.osgi.framework.BundleContext; import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystemManager; @@ -24,7 +24,7 @@ public class Activator extends GemocPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.executionframework.engine"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.executionframework.engine"; //$NON-NLS-1$ // The shared instance private static Activator plugin; @@ -82,7 +82,7 @@ public String getId() { // @Override // public DefaultLoggingBackend resolveLoggingBackend() { -// return org.gemoc.executionframework.engine.commons.Activator.getDefault().resolveLoggingBackend(); +// return org.eclipse.gemoc.executionframework.engine.commons.Activator.getDefault().resolveLoggingBackend(); // } private DefaultLoggingBackend _loggingBackend; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java similarity index 97% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java index 061667512..873eec97c 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/DefaultExecutionPlatform.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.commons; +package org.eclipse.gemoc.executionframework.engine.commons; import java.util.ArrayList; import java.util.Collection; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/EngineContextException.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/EngineContextException.java similarity index 93% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/EngineContextException.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/EngineContextException.java index bb055bb94..84b753cf7 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/EngineContextException.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/EngineContextException.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.commons; +package org.eclipse.gemoc.executionframework.engine.commons; public class EngineContextException extends Exception { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/MelangeHelper.java similarity index 99% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/MelangeHelper.java index 5d1cd995c..158ee2316 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/MelangeHelper.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/MelangeHelper.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.commons; +package org.eclipse.gemoc.executionframework.engine.commons; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/ModelExecutionContext.java similarity index 96% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/ModelExecutionContext.java index b13d7e7c9..bd01ba3e6 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/ModelExecutionContext.java @@ -8,15 +8,15 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.commons; +package org.eclipse.gemoc.executionframework.engine.commons; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.emf.transaction.util.TransactionUtil; -import org.gemoc.executionframework.engine.Activator; -import org.gemoc.executionframework.engine.core.ExecutionWorkspace; +import org.eclipse.gemoc.executionframework.engine.Activator; +import org.eclipse.gemoc.executionframework.engine.core.ExecutionWorkspace; import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionContext; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionPlatform; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend similarity index 95% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend index 5319eb3df..4b531489c 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractCommandBasedSequentialExecutionEngine.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.gemoc.executionframework.engine.core + package org.eclipse.gemoc.executionframework.engine.core import org.eclipse.emf.transaction.RecordingCommand diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractExecutionEngine.java similarity index 96% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractExecutionEngine.java index 1acf9d004..f329c42c8 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractExecutionEngine.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractExecutionEngine.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.core; +package org.eclipse.gemoc.executionframework.engine.core; import java.io.PrintWriter; import java.io.StringWriter; @@ -23,7 +23,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.emf.transaction.impl.EMFCommandTransaction; import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain; -import org.gemoc.executionframework.engine.Activator; +import org.eclipse.gemoc.executionframework.engine.Activator; import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus; import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.eclipse.gemoc.xdsmlframework.api.core.IDisposable; @@ -89,7 +89,7 @@ public final void initialize(IExecutionContext executionContext) { /* * (non-Javadoc) * - * @see org.gemoc.executionframework.engine.core.IExecutionEngine# + * @see org.eclipse.gemoc.executionframework.engine.core.IExecutionEngine# * getExecutionContext() */ @Override @@ -101,7 +101,7 @@ public final IExecutionContext getExecutionContext() { * (non-Javadoc) * * @see - * org.gemoc.executionframework.engine.core.IExecutionEngine#getEngineStatus + * org.eclipse.gemoc.executionframework.engine.core.IExecutionEngine#getEngineStatus * () */ @Override @@ -241,7 +241,7 @@ protected void notifyLogicalStepExecuted(Step l) { * (non-Javadoc) * * @see - * org.gemoc.executionframework.engine.core.IExecutionEngine#hasAddon(java. + * org.eclipse.gemoc.executionframework.engine.core.IExecutionEngine#hasAddon(java. * lang.Class) */ @Override @@ -257,7 +257,7 @@ public final boolean hasAddon(Class type) { * (non-Javadoc) * * @see - * org.gemoc.executionframework.engine.core.IExecutionEngine#getAddon(java. + * org.eclipse.gemoc.executionframework.engine.core.IExecutionEngine#getAddon(java. * lang.Class) */ @SuppressWarnings("unchecked") @@ -273,7 +273,7 @@ public final T getAddon(Class type) { /* * (non-Javadoc) * - * @see org.gemoc.executionframework.engine.core.IExecutionEngine# + * @see org.eclipse.gemoc.executionframework.engine.core.IExecutionEngine# * getAddonsTypedBy(java.lang.Class) */ @SuppressWarnings("unchecked") diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java similarity index 98% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index 5e86b3c78..a52059443 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.core; +package org.eclipse.gemoc.executionframework.engine.core; import java.io.IOException; @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.util.TransactionUtil; -import org.gemoc.executionframework.engine.Activator; +import org.eclipse.gemoc.executionframework.engine.Activator; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionContext; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/CommandExecution.java similarity index 96% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/CommandExecution.java index 524e504b6..fc69c013a 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/CommandExecution.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/CommandExecution.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.core; +package org.eclipse.gemoc.executionframework.engine.core; import org.eclipse.emf.common.command.CommandStack; import org.eclipse.emf.ecore.resource.ResourceSet; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/EngineStoppedException.java similarity index 94% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/EngineStoppedException.java index 7bdbcd0d7..c9d2a7a8d 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/EngineStoppedException.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/EngineStoppedException.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.core; +package org.eclipse.gemoc.executionframework.engine.core; /** diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/ExecutionWorkspace.java similarity index 98% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/ExecutionWorkspace.java index d11af2b0f..94e6bff3d 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/ExecutionWorkspace.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/ExecutionWorkspace.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.core; +package org.eclipse.gemoc.executionframework.engine.core; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java similarity index 98% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java index 69d4f8a5d..590871038 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/GemocRunningEnginesRegistry.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.core; +package org.eclipse.gemoc.executionframework.engine.core; import java.util.ArrayList; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/IEngineRegistrationListener.java similarity index 95% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/IEngineRegistrationListener.java index 43e5da9bb..7e6fd72e1 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/IEngineRegistrationListener.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/IEngineRegistrationListener.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.core; +package org.eclipse.gemoc.executionframework.engine.core; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/SequentialExecutionException.xtend similarity index 96% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/SequentialExecutionException.xtend index 16a52a415..80395959d 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/core/SequentialExecutionException.xtend +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/SequentialExecutionException.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.gemoc.executionframework.engine.core; + package org.eclipse.gemoc.executionframework.engine.core; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence import org.eclipse.emf.transaction.RollbackException diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Profiler.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/profiler/Profiler.java similarity index 97% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Profiler.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/profiler/Profiler.java index 741071089..465382c1e 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Profiler.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/profiler/Profiler.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.profiler; +package org.eclipse.gemoc.executionframework.engine.profiler; import java.util.ArrayList; import java.util.Date; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Unit.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/profiler/Unit.java similarity index 91% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Unit.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/profiler/Unit.java index 1c3498ce9..e3e47b9b9 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/profiler/Unit.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/profiler/Unit.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.engine.profiler; +package org.eclipse.gemoc.executionframework.engine.profiler; public class Unit { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.project index 93a9bcddf..06a6b42f2 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.project +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/.project @@ -1,6 +1,6 @@ - org.gemoc.executionframework.eventmanager + org.eclipse.gemoc.executionframework.eventmanager diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF index 6285a3905..4de812431 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Eventmanager -Bundle-SymbolicName: org.gemoc.executionframework.eventmanager;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.executionframework.eventmanager;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.executionframework.eventmanager.Activator +Bundle-Activator: org.eclipse.gemoc.executionframework.eventmanager.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.gemoc.executionframework.ui, + org.eclipse.gemoc.executionframework.ui, org.eclipse.gemoc.xdsmlframework.api, org.eclipse.emf.ecore, fr.inria.diverse.trace.commons.model, diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/plugin.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/plugin.xml index 4cdd6811c..01bc0e91a 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/plugin.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/plugin.xml @@ -6,14 +6,14 @@ point="org.eclipse.ui.views"> + id="org.eclipse.gemoc.executionframework.eventmanager"> + category="org.eclipse.gemoc.executionframework.eventmanager" + class="org.eclipse.gemoc.executionframework.eventmanager.views.EventManagerViewPart" + id="org.eclipse.gemoc.executionframework.eventmanager.views.EventManager"> + id="org.eclipse.gemoc.executionframework.eventmanager.views.EventManager"> + id="org.eclipse.gemoc.executionframework.eventmanager.views.EventManager"> diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/Activator.java similarity index 91% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/Activator.java index a4807ae6c..a7af49554 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/Activator.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.eventmanager; +package org.eclipse.gemoc.executionframework.eventmanager; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -20,7 +20,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.executionframework.eventmanager"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.executionframework.eventmanager"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java similarity index 99% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java index 0500294b0..ef836b0ec 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.eventmanager.views; +package org.eclipse.gemoc.executionframework.eventmanager.views; import java.util.ArrayList; import java.util.Collection; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java similarity index 85% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java index 598507246..c40883cda 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventManagerViewPart.java @@ -8,11 +8,11 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.eventmanager.views; +package org.eclipse.gemoc.executionframework.eventmanager.views; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import org.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; +import org.eclipse.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import javafx.embed.swt.FXCanvas; @@ -23,7 +23,7 @@ public class EventManagerViewPart extends EngineSelectionDependentViewPart { /** * The ID of the view as specified by the extension. */ - public static final String ID = "org.gemoc.executionframework.eventmanager.views.EventManager"; + public static final String ID = "org.eclipse.gemoc.executionframework.eventmanager.views.EventManager"; private FXCanvas fxCanvas; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventPane.java similarity index 94% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventPane.java index f2cd900af..0d700e44f 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventPane.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventPane.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.eventmanager.views; +package org.eclipse.gemoc.executionframework.eventmanager.views; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.resource.Resource; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventTableView.java similarity index 99% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventTableView.java index 674e77d58..5b4c254bf 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventTableView.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventTableView.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.eventmanager.views; +package org.eclipse.gemoc.executionframework.eventmanager.views; import java.util.ArrayList; import java.util.HashMap; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.project index a1f4f7741..ad4e8ea25 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.project +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/.project @@ -1,6 +1,6 @@ - org.gemoc.executionframework.extensions.sirius + org.eclipse.gemoc.executionframework.extensions.sirius diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF index 2d4735204..28d683691 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Sirius -Bundle-SymbolicName: org.gemoc.executionframework.extensions.sirius;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.executionframework.extensions.sirius;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.executionframework.extensions.sirius.Activator +Bundle-Activator: org.eclipse.gemoc.executionframework.extensions.sirius.Activator Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.sirius.diagram.ui;bundle-version="4.0.0", org.eclipse.sirius.common;bundle-version="1.0.1", @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.commons.eclipse, org.eclipse.emf.codegen.ecore, org.eclipse.emf.edit.ui, - org.gemoc.executionframework.engine, + org.eclipse.gemoc.executionframework.engine, org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", org.eclipse.ui.ide;bundle-version="3.10.2", fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", @@ -24,8 +24,8 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, fr.inria.diverse.melange.adapters Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Export-Package: org.gemoc.executionframework.extensions.sirius, - org.gemoc.executionframework.extensions.sirius.debug, - org.gemoc.executionframework.extensions.sirius.modelloader, - org.gemoc.executionframework.extensions.sirius.services +Export-Package: org.eclipse.gemoc.executionframework.extensions.sirius, + org.eclipse.gemoc.executionframework.extensions.sirius.debug, + org.eclipse.gemoc.executionframework.extensions.sirius.modelloader, + org.eclipse.gemoc.executionframework.extensions.sirius.services Import-Package: fr.inria.diverse.trace.commons.model.trace diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/plugin.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/plugin.xml index eca65d61a..5f82571ca 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/plugin.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/plugin.xml @@ -5,7 +5,7 @@ point="org.eclipse.sirius.ecore.extender.PermissionProvider"> + providerClass="org.eclipse.gemoc.executionframework.extensions.sirius.modelloader.DebugPermissionProvider"> diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/pom.xml index a585b483a..2ffedbfb5 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/pom.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/pom.xml @@ -10,7 +10,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 2.3.0-SNAPSHOT - org.gemoc.executionframework.extensions.sirius + org.eclipse.gemoc.executionframework.extensions.sirius 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/Activator.java similarity index 89% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/Activator.java index 31aac84f3..5a016f2c7 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/Activator.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.extensions.sirius; +package org.eclipse.gemoc.executionframework.extensions.sirius; import java.util.Map.Entry; @@ -30,7 +30,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.executionframework.extensions.sirius"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.executionframework.extensions.sirius"; //$NON-NLS-1$ // The shared instance private static Activator plugin; @@ -48,7 +48,7 @@ public boolean preShutdown(IWorkbench workbench, boolean forced) { // activePage.closeEditors(activePage.getEditorReferences(), false); // try to close only Sirius sessions related to engines - for (Entry engineEntry : org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.getRunningEngines().entrySet()) + for (Entry engineEntry : org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.getRunningEngines().entrySet()) { try{ // stop any running engine diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java similarity index 99% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java index 81d3e188f..345d1c797 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.extensions.sirius.debug; +package org.eclipse.gemoc.executionframework.extensions.sirius.debug; import java.io.IOException; import java.io.InputStream; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java similarity index 97% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java index 8bb75e1c1..896a41239 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.extensions.sirius.modelloader; +package org.eclipse.gemoc.executionframework.extensions.sirius.modelloader; import java.util.Collection; import java.util.HashMap; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java similarity index 96% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java index 596514112..a2db206d0 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionProvider.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.extensions.sirius.modelloader; +package org.eclipse.gemoc.executionframework.extensions.sirius.modelloader; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.URIConverter; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java similarity index 96% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java index d31b379aa..e4ba7dabd 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DebugURIHandler.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.extensions.sirius.modelloader; +package org.eclipse.gemoc.executionframework.extensions.sirius.modelloader; import java.io.IOException; import java.io.InputStream; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java similarity index 98% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index e090dcdb0..8754077f7 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.extensions.sirius.modelloader; +package org.eclipse.gemoc.executionframework.extensions.sirius.modelloader; import java.io.IOException; import java.io.InputStream; @@ -69,10 +69,10 @@ import org.eclipse.xtext.resource.XtextPlatformResourceURIHandler; import org.eclipse.xtext.util.StringInputStream; import org.eclipse.gemoc.commons.eclipse.emf.EMFResource; -import org.gemoc.executionframework.engine.core.CommandExecution; -import org.gemoc.executionframework.extensions.sirius.Activator; -import org.gemoc.executionframework.extensions.sirius.debug.DebugSessionFactory; -import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocAnimatorServices; +import org.eclipse.gemoc.executionframework.engine.core.CommandExecution; +import org.eclipse.gemoc.executionframework.extensions.sirius.Activator; +import org.eclipse.gemoc.executionframework.extensions.sirius.debug.DebugSessionFactory; +import org.eclipse.gemoc.executionframework.extensions.sirius.services.AbstractGemocAnimatorServices; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionContext; import org.eclipse.gemoc.xdsmlframework.api.core.IModelLoader; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java similarity index 97% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java index e57a74d32..37109321c 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/PaletteUtils.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.extensions.sirius.modelloader; +package org.eclipse.gemoc.executionframework.extensions.sirius.modelloader; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java similarity index 99% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index ac8a75147..a251c1c82 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.extensions.sirius.services; +package org.eclipse.gemoc.executionframework.extensions.sirius.services; import java.util.ArrayList; import java.util.Collection; @@ -38,7 +38,7 @@ import org.eclipse.sirius.ui.business.api.session.SessionUIManager; import org.eclipse.sirius.viewpoint.DRepresentation; import org.eclipse.sirius.viewpoint.description.RepresentationDescription; -import org.gemoc.executionframework.engine.core.CommandExecution; +import org.eclipse.gemoc.executionframework.engine.core.CommandExecution; import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.eclipse.gemoc.xdsmlframework.api.Activator; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java similarity index 91% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java index cbd592408..66ee0743d 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/AbstractGemocDebuggerServices.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.extensions.sirius.services; +package org.eclipse.gemoc.executionframework.extensions.sirius.services; import fr.obeo.dsl.debug.ide.sirius.ui.services.AbstractDSLDebuggerServices; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java similarity index 94% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java index 0e8e297f9..94a0d6517 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.extensions.sirius.services; +package org.eclipse.gemoc.executionframework.extensions.sirius.services; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.project b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.project index 0657c0a39..6b3939997 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.project +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.project @@ -1,6 +1,6 @@ - org.gemoc.executionframework.ui + org.eclipse.gemoc.executionframework.ui diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF index 551e1e1d6..f226fc8b0 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF @@ -1,25 +1,25 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Execution framework UI -Bundle-SymbolicName: org.gemoc.executionframework.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.executionframework.ui;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.executionframework.ui.Activator +Bundle-Activator: org.eclipse.gemoc.executionframework.ui.Activator Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.commons.eclipse, org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.core.resources;bundle-version="3.9.1", org.eclipse.ui.workbench, org.eclipse.jface, - org.gemoc.executionframework.engine;bundle-version="0.1.0", + org.eclipse.gemoc.executionframework.engine;bundle-version="0.1.0", org.eclipse.gemoc.commons.eclipse.ui;bundle-version="0.1.0", org.eclipse.xtext.util, fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-Vendor: GEMOC -Export-Package: org.gemoc.executionframework.ui, - org.gemoc.executionframework.ui.utils, - org.gemoc.executionframework.ui.views.engine, - org.gemoc.executionframework.ui.views.engine.actions, - org.gemoc.executionframework.ui.xdsml.activefile +Export-Package: org.eclipse.gemoc.executionframework.ui, + org.eclipse.gemoc.executionframework.ui.utils, + org.eclipse.gemoc.executionframework.ui.views.engine, + org.eclipse.gemoc.executionframework.ui.views.engine.actions, + org.eclipse.gemoc.executionframework.ui.xdsml.activefile diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/plugin.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/plugin.xml index f7d2dd6e4..d08475f79 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/plugin.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/plugin.xml @@ -4,14 +4,14 @@ @@ -20,25 +20,25 @@ + id="org.eclipse.gemoc.executionframework.ui.views.engine.EnginesStatusView"> + id="org.eclipse.gemoc.executionframework.ui.views.engine.EnginesStatusView"> @@ -47,7 +47,7 @@ + id="org.eclipse.gemoc.executionframework.ui.views.engine.EnginesStatusView"> diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/pom.xml index 9a4451f57..8fdccb04b 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/pom.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/pom.xml @@ -10,7 +10,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 2.3.0-SNAPSHOT - org.gemoc.executionframework.ui + org.eclipse.gemoc.executionframework.ui 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/Activator.java similarity index 96% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/Activator.java index e6412c901..b58bd279c 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/Activator.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui; +package org.eclipse.gemoc.executionframework.ui; import java.util.ArrayList; import java.util.List; @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.gemoc.executionframework.ui.views.engine.EngineSelectionManager; +import org.eclipse.gemoc.executionframework.ui.views.engine.EngineSelectionManager; import org.osgi.framework.BundleContext; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/IMSEPresenter.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/IMSEPresenter.java similarity index 95% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/IMSEPresenter.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/IMSEPresenter.java index 246981b19..8147d321a 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/IMSEPresenter.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/IMSEPresenter.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui; +package org.eclipse.gemoc.executionframework.ui; import java.util.List; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/SharedIcons.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/SharedIcons.java similarity index 97% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/SharedIcons.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/SharedIcons.java index dbd4f0514..9f6937822 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/SharedIcons.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/SharedIcons.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui; +package org.eclipse.gemoc.executionframework.ui; import java.util.HashMap; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java similarity index 95% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java index 739997c91..98b67b5c0 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/utils/ENamedElementQualifiedNameLabelProvider.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.utils; +package org.eclipse.gemoc.executionframework.ui.utils; import org.eclipse.emf.ecore.ENamedElement; import org.eclipse.jface.viewers.LabelProvider; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ViewUtils.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/utils/ViewUtils.java similarity index 95% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ViewUtils.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/utils/ViewUtils.java index 1041b69a7..cfdf38962 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/utils/ViewUtils.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/utils/ViewUtils.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.utils; +package org.eclipse.gemoc.executionframework.ui.utils; import org.eclipse.xtext.util.SimpleAttributeResolver; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java similarity index 93% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java index 0c577dc38..a9ddc02a9 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EngineSelectionDependentViewPart.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.views.engine; +package org.eclipse.gemoc.executionframework.ui.views.engine; import org.eclipse.ui.IViewSite; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.ViewPart; import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; -import org.gemoc.executionframework.ui.Activator; +import org.eclipse.gemoc.executionframework.ui.Activator; /** * Views that are dependent on the engine selection in the EnginesStatusView may subclass this to get registered to it diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java similarity index 96% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java index 5001eba4c..9d2e5167c 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EngineSelectionManager.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.views.engine; +package org.eclipse.gemoc.executionframework.ui.views.engine; import java.util.ArrayList; import java.util.List; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EnginesStatusView.java similarity index 85% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EnginesStatusView.java index ac8de053f..4eac2977e 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EnginesStatusView.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.views.engine; +package org.eclipse.gemoc.executionframework.ui.views.engine; import java.util.ArrayList; import java.util.Collection; @@ -37,16 +37,16 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; import org.eclipse.gemoc.commons.eclipse.ui.TreeViewerHelper; -import org.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; -import org.gemoc.executionframework.engine.core.IEngineRegistrationListener; -import org.gemoc.executionframework.ui.Activator; -import org.gemoc.executionframework.ui.SharedIcons; -import org.gemoc.executionframework.ui.views.engine.actions.DisposeAllStoppedEnginesAction; -import org.gemoc.executionframework.ui.views.engine.actions.DisposeStoppedEngineAction; -//import org.gemoc.executionframework.ui.views.engine.actions.PauseResumeEngineDeciderAction; -import org.gemoc.executionframework.ui.views.engine.actions.StopEngineAction; +import org.eclipse.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; +import org.eclipse.gemoc.executionframework.engine.core.IEngineRegistrationListener; +import org.eclipse.gemoc.executionframework.ui.Activator; +import org.eclipse.gemoc.executionframework.ui.SharedIcons; +import org.eclipse.gemoc.executionframework.ui.views.engine.actions.DisposeAllStoppedEnginesAction; +import org.eclipse.gemoc.executionframework.ui.views.engine.actions.DisposeStoppedEngineAction; +//import org.eclipse.gemoc.executionframework.ui.views.engine.actions.PauseResumeEngineDeciderAction; +import org.eclipse.gemoc.executionframework.ui.views.engine.actions.StopEngineAction; import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; -//import org.gemoc.executionframework.ui.views.engine.actions.SwitchDeciderAction; +//import org.eclipse.gemoc.executionframework.ui.views.engine.actions.SwitchDeciderAction; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; @@ -57,7 +57,7 @@ public class EnginesStatusView extends ViewPart implements IEngineAddon, IEngine /** * The ID of the view as specified by the extension. */ - public static final String ID = "org.gemoc.executionframework.ui.views.engine.EnginesStatusView"; + public static final String ID = "org.eclipse.gemoc.executionframework.ui.views.engine.EnginesStatusView"; public TreeViewer _viewer; private ViewContentProvider _contentProvider; @@ -70,8 +70,8 @@ public EnginesStatusView() { @Override public void dispose() { -// org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.deleteObserver(this); - org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.removeEngineRegistrationListener(this); +// org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.deleteObserver(this); + org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.removeEngineRegistrationListener(this); super.dispose(); } @@ -98,14 +98,14 @@ public void selectionChanged(SelectionChangedEvent event) { _viewer.getTree().setFont(mono); // Create the help context id for the viewer's control - PlatformUI.getWorkbench().getHelpSystem().setHelp(_viewer.getControl(), "org.gemoc.executionframework.ui.views.engine.EngineStatusView"); + PlatformUI.getWorkbench().getHelpSystem().setHelp(_viewer.getControl(), "org.eclipse.gemoc.executionframework.ui.views.engine.EngineStatusView"); // register for changes in the RunningEngineRegistry - //org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.addObserver(this); + //org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.addObserver(this); buildMenu(); - org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.addEngineRegistrationListener(this); + org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.addEngineRegistrationListener(this); } private void buildMenu() @@ -249,7 +249,7 @@ public String getToolTipText(Object element) if (element instanceof IExecutionEngine) { IExecutionEngine engine = (IExecutionEngine)element; - GemocRunningEnginesRegistry registry = org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry; + GemocRunningEnginesRegistry registry = org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry; for (Entry e : registry.getRunningEngines().entrySet()) { if (e.getValue() == engine) @@ -331,18 +331,18 @@ public void removeStoppedEngines(){ public void run() { // we may be triggered by a registry change or by an engine change // if registry changes, then may need to observe the new engine - for (Entry engineEntry : org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.getRunningEngines().entrySet()) + for (Entry engineEntry : org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.getRunningEngines().entrySet()) { switch(engineEntry.getValue().getRunningStatus()) { case Stopped: engineEntry.getValue().dispose(); - org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.unregisterEngine(engineEntry.getKey()); + org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry.unregisterEngine(engineEntry.getKey()); break; default: } } - _viewer.setInput(org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry); + _viewer.setInput(org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry); } }); } @@ -365,7 +365,7 @@ public void engineRegistered(final IExecutionEngine engine) Display.getDefault().syncExec(new Runnable() { public void run() { engine.getExecutionContext().getExecutionPlatform().addEngineAddon(EnginesStatusView.this); - _viewer.setInput(org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry); + _viewer.setInput(org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry); TreeViewerHelper.resizeColumns(_viewer); TreePath treePath = new TreePath(new Object[] {engine}); TreeSelection newSelection = new TreeSelection(treePath); diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java similarity index 92% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java index 1d868ac58..4894bdaab 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/IEngineSelectionListener.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.views.engine; +package org.eclipse.gemoc.executionframework.ui.views.engine; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/ViewContentProvider.java similarity index 87% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/ViewContentProvider.java index ab859b6f4..3bd2d3c93 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/ViewContentProvider.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/ViewContentProvider.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.views.engine; +package org.eclipse.gemoc.executionframework.ui.views.engine; import java.util.ArrayList; import java.util.Collections; @@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; +import org.eclipse.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; class ViewContentProvider implements ITreeContentProvider @@ -32,7 +32,7 @@ public void dispose() { public Object[] getElements(Object parent) { if (parent instanceof GemocRunningEnginesRegistry) { - GemocRunningEnginesRegistry registry = org.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry; + GemocRunningEnginesRegistry registry = org.eclipse.gemoc.executionframework.engine.Activator.getDefault().gemocRunningEngineRegistry; List engines = new ArrayList(registry.getRunningEngines().values()); Collections.sort(engines, getComparator()); return engines.toArray(); diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java similarity index 92% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java index a0385065e..f48250c5b 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/AbstractEngineAction.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.views.engine.actions; +package org.eclipse.gemoc.executionframework.ui.views.engine.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuCreator; @@ -16,8 +16,8 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IWorkbenchPartSite; -import org.gemoc.executionframework.ui.Activator; -import org.gemoc.executionframework.ui.views.engine.IEngineSelectionListener; +import org.eclipse.gemoc.executionframework.ui.Activator; +import org.eclipse.gemoc.executionframework.ui.views.engine.IEngineSelectionListener; import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java similarity index 85% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java index 2e59e5ad1..c1848a96f 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/DisposeAllStoppedEnginesAction.java @@ -8,14 +8,14 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.views.engine.actions; +package org.eclipse.gemoc.executionframework.ui.views.engine.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.ISharedImages; import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; -import org.gemoc.executionframework.ui.Activator; -import org.gemoc.executionframework.ui.views.engine.EnginesStatusView; +import org.eclipse.gemoc.executionframework.ui.Activator; +import org.eclipse.gemoc.executionframework.ui.views.engine.EnginesStatusView; public class DisposeAllStoppedEnginesAction extends Action { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java similarity index 90% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java index eb4e2f69e..898ff7101 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/DisposeStoppedEngineAction.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.views.engine.actions; +package org.eclipse.gemoc.executionframework.ui.views.engine.actions; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.ISharedImages; import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; -import org.gemoc.executionframework.ui.Activator; -import org.gemoc.executionframework.ui.views.engine.EnginesStatusView; +import org.eclipse.gemoc.executionframework.ui.Activator; +import org.eclipse.gemoc.executionframework.ui.views.engine.EnginesStatusView; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java similarity index 89% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java index e271d8e58..9e50f49f0 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/actions/StopEngineAction.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.views.engine.actions; +package org.eclipse.gemoc.executionframework.ui.views.engine.actions; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.ISharedImages; import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; -import org.gemoc.executionframework.ui.Activator; -import org.gemoc.executionframework.ui.views.engine.EnginesStatusView; +import org.eclipse.gemoc.executionframework.ui.Activator; +import org.eclipse.gemoc.executionframework.ui.views.engine.EnginesStatusView; import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java similarity index 93% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java index 79ce205b2..82880b288 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/xdsml/activefile/ActiveFile.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.xdsml.activefile; +package org.eclipse.gemoc.executionframework.ui.xdsml.activefile; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java similarity index 91% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java index 50847e9d5..bf9b51367 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/xdsml/activefile/ActiveFileEcore.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.xdsml.activefile; +package org.eclipse.gemoc.executionframework.ui.xdsml.activefile; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; -import org.gemoc.executionframework.ui.Activator; +import org.eclipse.gemoc.executionframework.ui.Activator; public class ActiveFileEcore extends ActiveFile { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java similarity index 91% rename from framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java rename to framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java index 544839abd..806bf053b 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/xdsml/activefile/ActiveFileGenmodel.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.executionframework.ui.xdsml.activefile; +package org.eclipse.gemoc.executionframework.ui.xdsml.activefile; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.gemoc.commons.eclipse.core.resources.FileFinderVisitor; -import org.gemoc.executionframework.ui.Activator; +import org.eclipse.gemoc.executionframework.ui.Activator; public class ActiveFileGenmodel extends ActiveFileEcore { diff --git a/framework/execution_framework/pom.xml b/framework/execution_framework/pom.xml index 7e92a9a50..9689d8e3f 100644 --- a/framework/execution_framework/pom.xml +++ b/framework/execution_framework/pom.xml @@ -13,12 +13,12 @@ - plugins/org.gemoc.executionframework.engine - plugins/org.gemoc.executionframework.engine.ui - plugins/org.gemoc.executionframework.ui - plugins/org.gemoc.executionframework.extensions.sirius - plugins/org.gemoc.executionframework.debugger - plugins/org.gemoc.executionframework.debugger.ui + plugins/org.eclipse.gemoc.executionframework.engine + plugins/org.eclipse.gemoc.executionframework.engine.ui + plugins/org.eclipse.gemoc.executionframework.ui + plugins/org.eclipse.gemoc.executionframework.extensions.sirius + plugins/org.eclipse.gemoc.executionframework.debugger + plugins/org.eclipse.gemoc.executionframework.debugger.ui releng/org.gemoc.modeldebugging.executionframework.feature diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml index bcbfb11a4..9932f2a3b 100644 --- a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml +++ b/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml @@ -18,42 +18,42 @@ - org.gemoc.executionframework.test.lib + org.eclipse.gemoc.executionframework.test.lib diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF index eb19874f1..68ab4fae9 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test -Bundle-SymbolicName: org.gemoc.executionframework.test.lib +Bundle-SymbolicName: org.eclipse.gemoc.executionframework.test.lib Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.google.guava, @@ -16,7 +16,7 @@ Require-Bundle: com.google.guava, org.eclipse.swt;bundle-version="3.105.3", org.eclipse.ui;bundle-version="3.108.1", fr.inria.diverse.trace.gemoc;bundle-version="2.3.0", - org.gemoc.executionframework.engine;bundle-version="2.3.0" -Export-Package: org.gemoc.executionframework.test.lib, - org.gemoc.executionframework.test.lib.impl + org.eclipse.gemoc.executionframework.engine;bundle-version="2.3.0" +Export-Package: org.eclipse.gemoc.executionframework.test.lib, + org.eclipse.gemoc.executionframework.test.lib.impl diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/IEngineWrapper.xtend similarity index 85% rename from framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/IEngineWrapper.xtend index 4df29e044..8387c02fb 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IEngineWrapper.xtend +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/IEngineWrapper.xtend @@ -1,4 +1,4 @@ -package org.gemoc.executionframework.test.lib +package org.eclipse.gemoc.executionframework.test.lib import java.util.Set import org.eclipse.emf.common.util.URI diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/IExecutableModel.xtend similarity index 79% rename from framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/IExecutableModel.xtend index 6a5499bc2..54ac4e0f2 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/IExecutableModel.xtend +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/IExecutableModel.xtend @@ -1,4 +1,4 @@ -package org.gemoc.executionframework.test.lib +package org.eclipse.gemoc.executionframework.test.lib interface IExecutableModel { diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/ILanguageWrapper.xtend similarity index 71% rename from framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/ILanguageWrapper.xtend index f83d26888..9ae71e63f 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/ILanguageWrapper.xtend +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/ILanguageWrapper.xtend @@ -1,4 +1,4 @@ -package org.gemoc.executionframework.test.lib +package org.eclipse.gemoc.executionframework.test.lib interface ILanguageWrapper { diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend similarity index 97% rename from framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend index 66605236e..d7aa4e903 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend @@ -1,4 +1,4 @@ -package org.gemoc.executionframework.test.lib.impl +package org.eclipse.gemoc.executionframework.test.lib.impl import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestHelper.xtend similarity index 92% rename from framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestHelper.xtend index f65906331..aa1ab6d0e 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestHelper.xtend +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestHelper.xtend @@ -1,4 +1,4 @@ -package org.gemoc.executionframework.test.lib.impl +package org.eclipse.gemoc.executionframework.test.lib.impl import java.io.File import java.io.PrintWriter @@ -11,9 +11,9 @@ import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.core.runtime.Status import org.eclipse.core.runtime.jobs.Job import org.eclipse.emf.common.util.URI -import org.gemoc.executionframework.test.lib.IEngineWrapper -import org.gemoc.executionframework.test.lib.IExecutableModel -import org.gemoc.executionframework.test.lib.ILanguageWrapper +import org.eclipse.gemoc.executionframework.test.lib.IEngineWrapper +import org.eclipse.gemoc.executionframework.test.lib.IExecutableModel +import org.eclipse.gemoc.executionframework.test.lib.ILanguageWrapper import static org.junit.Assert.* diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestModel.xtend similarity index 89% rename from framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestModel.xtend index f200e26e4..f1cfddf33 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestModel.xtend +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestModel.xtend @@ -1,7 +1,7 @@ -package org.gemoc.executionframework.test.lib.impl +package org.eclipse.gemoc.executionframework.test.lib.impl import org.eclipse.xtend.lib.annotations.Accessors -import org.gemoc.executionframework.test.lib.IExecutableModel +import org.eclipse.gemoc.executionframework.test.lib.IExecutableModel class TestModel implements IExecutableModel { diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend similarity index 92% rename from framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend index b53909f19..c9361c42c 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend @@ -1,4 +1,4 @@ -package org.gemoc.executionframework.test.lib.impl +package org.eclipse.gemoc.executionframework.test.lib.impl import java.util.ArrayList import java.util.List @@ -7,11 +7,11 @@ import org.eclipse.emf.common.util.URI import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl -import org.gemoc.executionframework.test.lib.ILanguageWrapper +import org.eclipse.gemoc.executionframework.test.lib.ILanguageWrapper import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtensionPoint -import org.gemoc.executionframework.test.lib.IExecutableModel +import org.eclipse.gemoc.executionframework.test.lib.IExecutableModel class TestRunConfiguration implements IRunConfiguration { private val ILanguageWrapper language diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestUtil.xtend similarity index 96% rename from framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend rename to framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestUtil.xtend index 5c971cef0..30fe8416f 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/gemoc/executionframework/test/lib/impl/TestUtil.xtend +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestUtil.xtend @@ -1,4 +1,4 @@ -package org.gemoc.executionframework.test.lib.impl +package org.eclipse.gemoc.executionframework.test.lib.impl import java.io.File import java.io.FileInputStream @@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Display import org.eclipse.ui.IWindowListener import org.eclipse.ui.IWorkbenchWindow import org.eclipse.ui.PlatformUI -import org.gemoc.executionframework.engine.Activator +import org.eclipse.gemoc.executionframework.engine.Activator import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine import org.osgi.framework.Bundle diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java index a4fb27613..de78a2ce2 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java @@ -134,7 +134,7 @@ protected void doExecute() { public static void updateManifest(final IProject project){ ManifestChanger changer = new ManifestChanger(project); try { - changer.addPluginDependency("org.gemoc.executionframework.extensions.sirius"); + changer.addPluginDependency("org.eclipse.gemoc.executionframework.extensions.sirius"); changer.addPluginDependency("org.gemoc.execution.sequential.javaengine.ui"); changer.commit(); } catch (BundleException | IOException | CoreException e) { @@ -254,7 +254,7 @@ public static Layer createLayer(DiagramDescription description, .createOperationAction(); debugAction.setName("Debug"); debugAction - .setIcon("/org.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); + .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); popupMenu.getMenuItemDescription().add(debugAction); ExternalJavaAction debugJavaAction = ToolPackage.eINSTANCE .getToolFactory().createExternalJavaAction(); @@ -262,7 +262,7 @@ public static Layer createLayer(DiagramDescription description, debugJavaAction .setId("org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.gemocDebugAs"); debugJavaAction - .setIcon("/org.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); + .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); InitialOperation initialOperation = ToolPackage.eINSTANCE .getToolFactory().createInitialOperation(); initialOperation.setFirstModelOperations(debugJavaAction); @@ -272,7 +272,7 @@ public static Layer createLayer(DiagramDescription description, .getToolFactory().createOperationAction(); toogleBreakpointAction.setName("Toggle breakpoint"); toogleBreakpointAction - .setIcon("/org.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); + .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); popupMenu.getMenuItemDescription().add(toogleBreakpointAction); ExternalJavaAction toogleBreakpointJavaAction = ToolPackage.eINSTANCE .getToolFactory().createExternalJavaAction(); @@ -280,7 +280,7 @@ public static Layer createLayer(DiagramDescription description, toogleBreakpointJavaAction .setId("org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.GemocSequentialToggleBreakpointAction"); toogleBreakpointJavaAction - .setIcon("/org.gemoc.executionframework.extensions.sirius/icons/breakpoint.gif"); + .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint.gif"); initialOperation = ToolPackage.eINSTANCE.getToolFactory() .createInitialOperation(); initialOperation.setFirstModelOperations(toogleBreakpointJavaAction); @@ -297,7 +297,7 @@ public static Layer createLayer(DiagramDescription description, enabledBreakpoint.setName("Enabled breakpoint"); enabledBreakpoint.setPosition(Position.WEST_LITERAL); enabledBreakpoint - .setDecoratorPath("/org.gemoc.executionframework.extensions.sirius/icons/breakpoint_enabled.gif"); + .setDecoratorPath("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint_enabled.gif"); enabledBreakpoint .setPreconditionExpression("service:self.hasEnabledBreakpoint"); enabledBreakpoint.getMappings().addAll(mappings); @@ -308,7 +308,7 @@ public static Layer createLayer(DiagramDescription description, disabledBreakpoint.setName("Disabled breakpoint"); disabledBreakpoint.setPosition(Position.WEST_LITERAL); disabledBreakpoint - .setDecoratorPath("/org.gemoc.executionframework.extensions.sirius/icons/breakpoint_disabled.gif"); + .setDecoratorPath("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint_disabled.gif"); disabledBreakpoint .setPreconditionExpression("service:self.hasDisabledBreakpoint"); disabledBreakpoint.getMappings().addAll(mappings); @@ -372,7 +372,7 @@ public static Layer createLayer(DiagramExtensionDescription descriptionExtension .createOperationAction(); debugAction.setName("Debug"); debugAction - .setIcon("/org.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); + .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); popupMenu.getMenuItemDescription().add(debugAction); ExternalJavaAction debugJavaAction = ToolPackage.eINSTANCE .getToolFactory().createExternalJavaAction(); @@ -380,7 +380,7 @@ public static Layer createLayer(DiagramExtensionDescription descriptionExtension debugJavaAction .setId("org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.gemocDebugAs"); debugJavaAction - .setIcon("/org.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); + .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); InitialOperation initialOperation = ToolPackage.eINSTANCE .getToolFactory().createInitialOperation(); initialOperation.setFirstModelOperations(debugJavaAction); @@ -390,7 +390,7 @@ public static Layer createLayer(DiagramExtensionDescription descriptionExtension .getToolFactory().createOperationAction(); toogleBreakpointAction.setName("Toggle breakpoint"); toogleBreakpointAction - .setIcon("/org.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); + .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); popupMenu.getMenuItemDescription().add(toogleBreakpointAction); ExternalJavaAction toogleBreakpointJavaAction = ToolPackage.eINSTANCE .getToolFactory().createExternalJavaAction(); @@ -398,7 +398,7 @@ public static Layer createLayer(DiagramExtensionDescription descriptionExtension toogleBreakpointJavaAction .setId("org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.GemocSequentialToggleBreakpointAction"); toogleBreakpointJavaAction - .setIcon("/org.gemoc.executionframework.extensions.sirius/icons/breakpoint.gif"); + .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint.gif"); initialOperation = ToolPackage.eINSTANCE.getToolFactory() .createInitialOperation(); initialOperation.setFirstModelOperations(toogleBreakpointJavaAction); @@ -415,7 +415,7 @@ public static Layer createLayer(DiagramExtensionDescription descriptionExtension enabledBreakpoint.setName("Enabled breakpoint"); enabledBreakpoint.setPosition(Position.WEST_LITERAL); enabledBreakpoint - .setDecoratorPath("/org.gemoc.executionframework.extensions.sirius/icons/breakpoint_enabled.gif"); + .setDecoratorPath("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint_enabled.gif"); enabledBreakpoint .setPreconditionExpression("service:self.hasEnabledBreakpoint"); enabledBreakpoint.getMappings().addAll(mappings); @@ -426,7 +426,7 @@ public static Layer createLayer(DiagramExtensionDescription descriptionExtension disabledBreakpoint.setName("Disabled breakpoint"); disabledBreakpoint.setPosition(Position.WEST_LITERAL); disabledBreakpoint - .setDecoratorPath("/org.gemoc.executionframework.extensions.sirius/icons/breakpoint_disabled.gif"); + .setDecoratorPath("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint_disabled.gif"); disabledBreakpoint .setPreconditionExpression("service:self.hasDisabledBreakpoint"); disabledBreakpoint.getMappings().addAll(mappings); diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index 00176f241..130091734 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -18,23 +18,23 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", org.eclipse.emf.edit.ui, org.gemoc.execution.sequential.javaxdsml.api;bundle-version="0.1.0", - org.gemoc.executionframework.ui, + org.eclipse.gemoc.executionframework.ui, org.gemoc.execution.sequential.javaengine;bundle-version="0.1.0", fr.inria.diverse.trace.gemoc;bundle-version="1.0.0", fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", fr.inria.diverse.k3.al.annotationprocessor.plugin, - org.gemoc.executionframework.engine, - org.gemoc.executionframework.engine.ui, + org.eclipse.gemoc.executionframework.engine, + org.eclipse.gemoc.executionframework.engine.ui, org.eclipse.ui.ide;bundle-version="3.10.2", fr.obeo.dsl.debug.ide.ui;bundle-version="1.0.0", org.eclipse.gemoc.timeline;bundle-version="1.0.0", - org.gemoc.executionframework.extensions.sirius, + org.eclipse.gemoc.executionframework.extensions.sirius, org.eclipse.gemoc.xdsmlframework.ui.utils, org.eclipse.xtext, org.eclipse.xtend.lib, fr.inria.diverse.melange.resource, - org.gemoc.executionframework.debugger, - org.gemoc.executionframework.debugger.ui, + org.eclipse.gemoc.executionframework.debugger, + org.eclipse.gemoc.executionframework.debugger.ui, org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="2.3.0", org.eclipse.gemoc.commons.eclipse.messagingsystem.ui;bundle-version="2.3.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/plugin.xml b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/plugin.xml index d6571f207..e008766a6 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/plugin.xml +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/plugin.xml @@ -180,7 +180,7 @@ id="org.gemoc.gemoc_modeling_workbench.ui.wizards.CreateNewGemocModelingProject"> --> - releng/org.gemoc.modeldebugging.executionframework.feature + releng/org.eclipse.gemoc.executionframework.feature diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/.gitignore b/framework/execution_framework/releng/org.eclipse.gemoc.executionframework.feature/.gitignore similarity index 100% rename from framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/.gitignore rename to framework/execution_framework/releng/org.eclipse.gemoc.executionframework.feature/.gitignore diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/build.properties b/framework/execution_framework/releng/org.eclipse.gemoc.executionframework.feature/build.properties similarity index 100% rename from framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/build.properties rename to framework/execution_framework/releng/org.eclipse.gemoc.executionframework.feature/build.properties diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml b/framework/execution_framework/releng/org.eclipse.gemoc.executionframework.feature/feature.xml similarity index 96% rename from framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml rename to framework/execution_framework/releng/org.eclipse.gemoc.executionframework.feature/feature.xml index 9932f2a3b..249e35cb2 100644 --- a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/feature.xml +++ b/framework/execution_framework/releng/org.eclipse.gemoc.executionframework.feature/feature.xml @@ -1,6 +1,6 @@ diff --git a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/pom.xml b/framework/execution_framework/releng/org.eclipse.gemoc.executionframework.feature/pom.xml similarity index 83% rename from framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/pom.xml rename to framework/execution_framework/releng/org.eclipse.gemoc.executionframework.feature/pom.xml index 84e439602..4ff914453 100644 --- a/framework/execution_framework/releng/org.gemoc.modeldebugging.executionframework.feature/pom.xml +++ b/framework/execution_framework/releng/org.eclipse.gemoc.executionframework.feature/pom.xml @@ -9,7 +9,7 @@ 2.3.0-SNAPSHOT - org.gemoc.modeldebugging.executionframework.feature + org.eclipse.gemoc.executionframework.feature eclipse-feature \ No newline at end of file diff --git a/releng/org.gemoc.siriusanimation.repository/category.xml b/releng/org.gemoc.siriusanimation.repository/category.xml index 6ea41fb08..07eced2d5 100644 --- a/releng/org.gemoc.siriusanimation.repository/category.xml +++ b/releng/org.gemoc.siriusanimation.repository/category.xml @@ -24,10 +24,10 @@ - + - + From 66d03e27e4819499f11bdcbce4b9d66b0e9c4e87 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 10:51:35 +0200 Subject: [PATCH 234/267] rename fr.obeo.dsl.debug* in org.eclipse.gemoc.dsl.debug* --- .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 ...reateCurrentSession_debugTargets_DebugTarget.gif | Bin .../ctool16/CreateDebugTarget_threads_Thread.gif | Bin .../CreateRegisterGroup_registers_Register.gif | Bin .../CreateStackFrame_childFrame_StackFrame.gif | Bin ...reateStackFrame_registerGroups_RegisterGroup.gif | Bin .../ctool16/CreateStackFrame_variables_Register.gif | Bin .../ctool16/CreateStackFrame_variables_Variable.gif | Bin .../ctool16/CreateThread_breakpoints_BreakPoint.gif | Bin .../icons/full/deco16/RUNNING.gif | Bin .../icons/full/deco16/SUSPENDED.gif | Bin .../icons/full/deco16/TERMINATED.gif | Bin .../icons/full/deco16/breakpoint.gif | Bin .../icons/full/obj16/Breakpoint.gif | Bin .../icons/full/obj16/CurrentSession.gif | Bin .../icons/full/obj16/DebugTarget.gif | Bin .../icons/full/obj16/Register.gif | Bin .../icons/full/obj16/RegisterGroup.gif | Bin .../icons/full/obj16/StackFrame.gif | Bin .../icons/full/obj16/Thread.gif | Bin .../icons/full/obj16/Variable.gif | Bin .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../debug/provider/CurrentSessionItemProvider.java | 0 .../gemoc}/dsl/debug/provider/DebugEditPlugin.java | 0 .../provider/DebugItemProviderAdapterFactory.java | 0 .../dsl/debug/provider/DebugTargetItemProvider.java | 0 .../debug/provider/RegisterGroupItemProvider.java | 0 .../dsl/debug/provider/RegisterItemProvider.java | 0 .../dsl/debug/provider/StackFrameItemProvider.java | 0 .../dsl/debug/provider/ThreadItemProvider.java | 0 .../dsl/debug/provider/VariableItemProvider.java | 0 .../CustomDebugItemProviderAdapterFactory.java | 0 .../provider/CustomDebugTargetItemProvider.java | 0 .../provider/CustomStackFrameItemProvider.java | 0 .../debug/provider/CustomThreadItemProvider.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../plugin.properties | 0 .../pom.xml | 0 .../ide/sirius/ui/DSLDebugModelPresentation.java | 0 .../ide/sirius/ui/DSLToggleBreakpointsUtils.java | 0 .../debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java | 0 .../dsl/debug/ide/sirius/ui/SiriusEditorUtils.java | 0 .../ide/sirius/ui/action/AbstractDebugAsAction.java | 0 .../ui/action/AbstractToggleBreakpointAction.java | 0 .../AbstractDSLLaunchConfigurationDelegateUI.java | 0 .../sirius/ui/launch/DSLLaunchConfigurationTab.java | 0 .../ui/services/AbstractDSLDebuggerServices.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../icons/full/deco16/breakpoint_disabled.gif | Bin .../icons/full/deco16/breakpoint_enabled.gif | Bin .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../dsl/debug/ide/ui/DSLDebugModelPresentation.java | 0 .../dsl/debug/ide/ui/DSLToggleBreakpointsUtils.java | 0 .../gemoc}/dsl/debug/ide/ui/DebugIdeUiPlugin.java | 0 .../gemoc}/dsl/debug/ide/ui/EMFEditorUtils.java | 0 .../ui/handler/AbstractToggleBreakpointHandler.java | 0 .../AbstractDSLLaunchConfigurationDelegateUI.java | 0 .../ide/ui/launch/DSLLaunchConfigurationTab.java | 0 .../ide/ui/launch/FilteredFileContentProvider.java | 0 .../debug/ide/ui/provider/DSLLabelDecorator.java | 0 .../ui/provider/DecoratingColumLabelProvider.java | 0 .../ide/ui/provider/OverlayImageDescriptor.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../schema/fr.obeo.dsl.debug.locator.exsd | 0 .../gemoc}/dsl/debug/ide/AbstractDSLDebugger.java | 0 .../org/eclipse/gemoc}/dsl/debug/ide/Activator.java | 0 .../eclipse/gemoc}/dsl/debug/ide/DSLBreakpoint.java | 0 .../dsl/debug/ide/DSLEclipseDebugIntegration.java | 0 .../gemoc}/dsl/debug/ide/DSLSourceLocator.java | 0 .../eclipse/gemoc}/dsl/debug/ide/IDSLDebugger.java | 0 .../eclipse/gemoc}/dsl/debug/ide/IModelUpdater.java | 0 .../eclipse/gemoc}/dsl/debug/ide/ModelUpdater.java | 0 .../gemoc}/dsl/debug/ide/ThreadController.java | 0 .../dsl/debug/ide/TransactionalModelUpdater.java | 0 .../ide/adapter/AbstractDSLDebugElementAdapter.java | 0 .../debug/ide/adapter/DSLDebugTargetAdapter.java | 0 .../dsl/debug/ide/adapter/DSLStackFrameAdapter.java | 0 .../dsl/debug/ide/adapter/DSLThreadAdapter.java | 0 .../dsl/debug/ide/adapter/DSLVariableAdapter.java | 0 .../ide/adapter/IDSLCurrentInstructionListener.java | 0 .../gemoc}/dsl/debug/ide/adapter/ILocator.java | 0 .../debug/ide/adapter/value/AbstractDSLValue.java | 0 .../dsl/debug/ide/adapter/value/DSLArrayValue.java | 0 .../ide/adapter/value/DSLBooleanArrayValue.java | 0 .../debug/ide/adapter/value/DSLByteArrayValue.java | 0 .../debug/ide/adapter/value/DSLCharArrayValue.java | 0 .../ide/adapter/value/DSLDoubleArrayValue.java | 0 .../ide/adapter/value/DSLEObjectValueAdapter.java | 0 .../debug/ide/adapter/value/DSLFloatArrayValue.java | 0 .../debug/ide/adapter/value/DSLIntArrayValue.java | 0 .../debug/ide/adapter/value/DSLLongArrayValue.java | 0 .../dsl/debug/ide/adapter/value/DSLNullValue.java | 0 .../dsl/debug/ide/adapter/value/DSLObjectValue.java | 0 .../debug/ide/adapter/value/DSLShortArrayValue.java | 0 .../ide/adapter/variable/DSLObjectVariable.java | 0 .../debug/ide/event/DSLDebugEventDispatcher.java | 0 .../gemoc}/dsl/debug/ide/event/IDSLDebugEvent.java | 0 .../debug/ide/event/IDSLDebugEventProcessor.java | 0 .../ide/event/debugger/AbstractThreadReply.java | 0 .../ide/event/debugger/AbstractVariableReply.java | 0 .../debug/ide/event/debugger/BreakpointReply.java | 0 .../ide/event/debugger/DeleteVariableReply.java | 0 .../debug/ide/event/debugger/IDSLDebuggerReply.java | 0 .../ide/event/debugger/PopStackFrameReply.java | 0 .../ide/event/debugger/PushStackFrameReply.java | 0 .../dsl/debug/ide/event/debugger/ResumingReply.java | 0 .../event/debugger/SetCurrentInstructionReply.java | 0 .../ide/event/debugger/SetVariableValueReply.java | 0 .../ide/event/debugger/SpawnRunningThreadReply.java | 0 .../ide/event/debugger/StepIntoResumingReply.java | 0 .../ide/event/debugger/StepOverResumingReply.java | 0 .../ide/event/debugger/StepReturnResumingReply.java | 0 .../dsl/debug/ide/event/debugger/SteppedReply.java | 0 .../debug/ide/event/debugger/SuspendedReply.java | 0 .../debug/ide/event/debugger/TerminatedReply.java | 0 .../event/debugger/ValidateVariableValueReply.java | 0 .../dsl/debug/ide/event/debugger/VariableReply.java | 0 .../ide/event/model/AbstractBreakpointRequest.java | 0 .../debug/ide/event/model/AbstractStepRequest.java | 0 .../ide/event/model/AbstractThreadRequest.java | 0 .../ide/event/model/AbstractVariableRequest.java | 0 .../debug/ide/event/model/AddBreakpointRequest.java | 0 .../ide/event/model/ChangeBreakPointRequest.java | 0 .../debug/ide/event/model/DisconnectRequest.java | 0 .../dsl/debug/ide/event/model/IDSLModelRequest.java | 0 .../ide/event/model/RemoveBreakpointRequest.java | 0 .../dsl/debug/ide/event/model/ResumeRequest.java | 0 .../ide/event/model/SetVariableValueRequest.java | 0 .../dsl/debug/ide/event/model/StartRequest.java | 0 .../dsl/debug/ide/event/model/StepIntoRequest.java | 0 .../dsl/debug/ide/event/model/StepOverRequest.java | 0 .../debug/ide/event/model/StepReturnRequest.java | 0 .../dsl/debug/ide/event/model/SuspendRequest.java | 0 .../dsl/debug/ide/event/model/TerminateRequest.java | 0 .../event/model/ValidateVariableValueRequest.java | 0 .../AbstractDSLLaunchConfigurationDelegate.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../model/EMF_debug_model.png | Bin .../model/debug.ecore | 0 .../model/debug.genmodel | 0 .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../org/eclipse/gemoc}/dsl/debug/Contextual.java | 0 .../eclipse/gemoc}/dsl/debug/CurrentSession.java | 0 .../org/eclipse/gemoc}/dsl/debug/DebugFactory.java | 0 .../org/eclipse/gemoc}/dsl/debug/DebugPackage.java | 0 .../org/eclipse/gemoc}/dsl/debug/DebugTarget.java | 0 .../eclipse/gemoc}/dsl/debug/DebugTargetState.java | 0 .../org/eclipse/gemoc}/dsl/debug/Register.java | 0 .../org/eclipse/gemoc}/dsl/debug/RegisterGroup.java | 0 .../org/eclipse/gemoc}/dsl/debug/StackFrame.java | 0 .../src-gen/org/eclipse/gemoc}/dsl/debug/State.java | 0 .../org/eclipse/gemoc}/dsl/debug/Thread.java | 0 .../org/eclipse/gemoc}/dsl/debug/Variable.java | 0 .../gemoc}/dsl/debug/impl/CurrentSessionImpl.java | 0 .../gemoc}/dsl/debug/impl/DebugFactoryImpl.java | 0 .../gemoc}/dsl/debug/impl/DebugPackageImpl.java | 0 .../gemoc}/dsl/debug/impl/DebugTargetImpl.java | 0 .../gemoc}/dsl/debug/impl/RegisterGroupImpl.java | 0 .../eclipse/gemoc}/dsl/debug/impl/RegisterImpl.java | 0 .../gemoc}/dsl/debug/impl/StackFrameImpl.java | 0 .../eclipse/gemoc}/dsl/debug/impl/ThreadImpl.java | 0 .../eclipse/gemoc}/dsl/debug/impl/VariableImpl.java | 0 .../gemoc}/dsl/debug/util/DebugAdapterFactory.java | 0 .../eclipse/gemoc}/dsl/debug/util/DebugSwitch.java | 0 .../eclipse/gemoc}/dsl/debug/DebugTargetUtils.java | 0 .../org/eclipse/gemoc}/dsl/debug/ThreadUtils.java | 0 .../.project | 0 .../about.html | 0 .../build.properties | 0 .../feature.xml | 0 .../pom.xml | 0 .../.project | 0 .../about.html | 0 .../build.properties | 0 .../feature.xml | 0 .../pom.xml | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../dsldebug-luna.target | 0 .../dsldebug-luna.tpd | 0 .../dsldebug-neon.target | 0 .../dsldebug-neon.tpd | 0 .../.project | 0 .../about.html | 0 .../build.properties | 0 .../feature.xml | 0 .../pom.xml | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../fr.obeo.dsl.debug.ide.tests.launch | 0 .../plugin.properties | 0 .../pom.xml | 0 .../gemoc}/dsl/debug/ide/tests/AllTests.java | 0 .../dsl/debug/ide/tests/DSLDebuggerTests.java | 0 .../gemoc}/dsl/debug/ide/tests/TestDSLDebugger.java | 0 .../dsl/debug/ide/tests/adapter/AdapterTests.java | 0 .../tests/adapter/DSLDebugTargetAdapterTests.java | 0 .../tests/adapter/TestDebugEventSetListener.java | 0 .../debug/ide/tests/event/TestEventProcessor.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../fr.obeo.dsl.debug.tests.launch | 0 .../plugin.properties | 0 .../pom.xml | 0 .../gemoc}/dsl/debug/tests/AbstractDebugTests.java | 0 .../eclipse/gemoc}/dsl/debug/tests/AllTests.java | 0 .../dsl/debug/tests/DebugTargetUtilsTests.java | 0 .../gemoc}/dsl/debug/tests/ThreadUtilsTests.java | 0 265 files changed, 0 insertions(+), 0 deletions(-) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/.checkstyle (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/.classpath (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/.project (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/.settings/org.eclipse.jdt.core.prefs (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/.settings/org.eclipse.jdt.ui.prefs (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/META-INF/MANIFEST.MF (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/about.html (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/build.properties (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/ctool16/CreateCurrentSession_debugTargets_DebugTarget.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/ctool16/CreateDebugTarget_threads_Thread.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/ctool16/CreateRegisterGroup_registers_Register.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/ctool16/CreateStackFrame_childFrame_StackFrame.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/ctool16/CreateStackFrame_registerGroups_RegisterGroup.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/ctool16/CreateStackFrame_variables_Register.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/ctool16/CreateStackFrame_variables_Variable.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/ctool16/CreateThread_breakpoints_BreakPoint.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/deco16/RUNNING.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/deco16/SUSPENDED.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/deco16/TERMINATED.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/deco16/breakpoint.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/obj16/Breakpoint.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/obj16/CurrentSession.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/obj16/DebugTarget.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/obj16/Register.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/obj16/RegisterGroup.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/obj16/StackFrame.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/obj16/Thread.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/icons/full/obj16/Variable.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/plugin.properties (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/plugin.xml (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit => org.eclipse.gemoc.dsl.debug.edit}/pom.xml (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc}/dsl/debug/provider/CurrentSessionItemProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc}/dsl/debug/provider/DebugEditPlugin.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc}/dsl/debug/provider/DebugItemProviderAdapterFactory.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc}/dsl/debug/provider/DebugTargetItemProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc}/dsl/debug/provider/RegisterGroupItemProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc}/dsl/debug/provider/RegisterItemProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc}/dsl/debug/provider/StackFrameItemProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc}/dsl/debug/provider/ThreadItemProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc}/dsl/debug/provider/VariableItemProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc}/dsl/debug/provider/CustomDebugItemProviderAdapterFactory.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc}/dsl/debug/provider/CustomDebugTargetItemProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc}/dsl/debug/provider/CustomStackFrameItemProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.edit/src/fr/obeo => org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc}/dsl/debug/provider/CustomThreadItemProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui => org.eclipse.gemoc.dsl.debug.ide.sirius.ui}/.checkstyle (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui => org.eclipse.gemoc.dsl.debug.ide.sirius.ui}/.classpath (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui => org.eclipse.gemoc.dsl.debug.ide.sirius.ui}/.project (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui => org.eclipse.gemoc.dsl.debug.ide.sirius.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui => org.eclipse.gemoc.dsl.debug.ide.sirius.ui}/.settings/org.eclipse.jdt.ui.prefs (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui => org.eclipse.gemoc.dsl.debug.ide.sirius.ui}/META-INF/MANIFEST.MF (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui => org.eclipse.gemoc.dsl.debug.ide.sirius.ui}/about.html (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui => org.eclipse.gemoc.dsl.debug.ide.sirius.ui}/build.properties (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui => org.eclipse.gemoc.dsl.debug.ide.sirius.ui}/plugin.properties (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui => org.eclipse.gemoc.dsl.debug.ide.sirius.ui}/pom.xml (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc}/dsl/debug/ide/sirius/ui/DSLDebugModelPresentation.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc}/dsl/debug/ide/sirius/ui/DSLToggleBreakpointsUtils.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc}/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc}/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc}/dsl/debug/ide/sirius/ui/action/AbstractDebugAsAction.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc}/dsl/debug/ide/sirius/ui/action/AbstractToggleBreakpointAction.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc}/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc}/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc}/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/.checkstyle (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/.classpath (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/.project (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/.settings/org.eclipse.jdt.ui.prefs (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/META-INF/MANIFEST.MF (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/about.html (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/build.properties (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/icons/full/deco16/breakpoint_disabled.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/icons/full/deco16/breakpoint_enabled.gif (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/plugin.properties (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/plugin.xml (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui => org.eclipse.gemoc.dsl.debug.ide.ui}/pom.xml (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/DSLDebugModelPresentation.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/DSLToggleBreakpointsUtils.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/DebugIdeUiPlugin.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/EMFEditorUtils.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/handler/AbstractToggleBreakpointHandler.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/launch/DSLLaunchConfigurationTab.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/launch/FilteredFileContentProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/provider/DSLLabelDecorator.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/provider/DecoratingColumLabelProvider.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide.ui/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc}/dsl/debug/ide/ui/provider/OverlayImageDescriptor.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/.checkstyle (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/.classpath (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/.project (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/.settings/org.eclipse.jdt.core.prefs (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/.settings/org.eclipse.jdt.ui.prefs (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/META-INF/MANIFEST.MF (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/about.html (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/build.properties (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/plugin.properties (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/plugin.xml (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/pom.xml (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide => org.eclipse.gemoc.dsl.debug.ide}/schema/fr.obeo.dsl.debug.locator.exsd (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/AbstractDSLDebugger.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/Activator.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/DSLBreakpoint.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/DSLEclipseDebugIntegration.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/DSLSourceLocator.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/IDSLDebugger.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/IModelUpdater.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/ModelUpdater.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/ThreadController.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/TransactionalModelUpdater.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/AbstractDSLDebugElementAdapter.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/DSLStackFrameAdapter.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/DSLThreadAdapter.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/DSLVariableAdapter.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/IDSLCurrentInstructionListener.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/ILocator.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/AbstractDSLValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLArrayValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLBooleanArrayValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLByteArrayValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLCharArrayValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLDoubleArrayValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLEObjectValueAdapter.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLFloatArrayValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLIntArrayValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLLongArrayValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLNullValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLObjectValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/value/DSLShortArrayValue.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/adapter/variable/DSLObjectVariable.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/DSLDebugEventDispatcher.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/IDSLDebugEvent.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/IDSLDebugEventProcessor.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/AbstractThreadReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/AbstractVariableReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/BreakpointReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/DeleteVariableReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/IDSLDebuggerReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/PopStackFrameReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/PushStackFrameReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/ResumingReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/SetCurrentInstructionReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/SetVariableValueReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/SpawnRunningThreadReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/StepIntoResumingReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/StepOverResumingReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/StepReturnResumingReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/SteppedReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/SuspendedReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/TerminatedReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/ValidateVariableValueReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/debugger/VariableReply.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/AbstractBreakpointRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/AbstractStepRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/AbstractThreadRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/AbstractVariableRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/AddBreakpointRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/ChangeBreakPointRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/DisconnectRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/IDSLModelRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/RemoveBreakpointRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/ResumeRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/SetVariableValueRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/StartRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/StepIntoRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/StepOverRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/StepReturnRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/SuspendRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/TerminateRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/event/model/ValidateVariableValueRequest.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug.ide/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc}/dsl/debug/ide/launch/AbstractDSLLaunchConfigurationDelegate.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/.checkstyle (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/.classpath (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/.project (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/.settings/org.eclipse.jdt.core.prefs (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/.settings/org.eclipse.jdt.ui.prefs (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/META-INF/MANIFEST.MF (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/about.html (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/build.properties (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/model/EMF_debug_model.png (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/model/debug.ecore (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/model/debug.genmodel (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/plugin.properties (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/plugin.xml (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug => org.eclipse.gemoc.dsl.debug}/pom.xml (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/Contextual.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/CurrentSession.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/DebugFactory.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/DebugPackage.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/DebugTarget.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/DebugTargetState.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/Register.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/RegisterGroup.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/StackFrame.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/State.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/Thread.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/Variable.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/impl/CurrentSessionImpl.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/impl/DebugFactoryImpl.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/impl/DebugPackageImpl.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/impl/DebugTargetImpl.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/impl/RegisterGroupImpl.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/impl/RegisterImpl.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/impl/StackFrameImpl.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/impl/ThreadImpl.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/impl/VariableImpl.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/util/DebugAdapterFactory.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src-gen/fr/obeo => org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc}/dsl/debug/util/DebugSwitch.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src/fr/obeo => org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc}/dsl/debug/DebugTargetUtils.java (100%) rename simulationmodelanimation/plugins/{fr.obeo.dsl.debug/src/fr/obeo => org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc}/dsl/debug/ThreadUtils.java (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.feature => org.eclipse.gemoc.dsl.debug.feature}/.project (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.feature => org.eclipse.gemoc.dsl.debug.feature}/about.html (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.feature => org.eclipse.gemoc.dsl.debug.feature}/build.properties (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.feature => org.eclipse.gemoc.dsl.debug.feature}/feature.xml (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.feature => org.eclipse.gemoc.dsl.debug.feature}/pom.xml (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.sirius.ui.feature => org.eclipse.gemoc.dsl.debug.sirius.ui.feature}/.project (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.sirius.ui.feature => org.eclipse.gemoc.dsl.debug.sirius.ui.feature}/about.html (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.sirius.ui.feature => org.eclipse.gemoc.dsl.debug.sirius.ui.feature}/build.properties (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.sirius.ui.feature => org.eclipse.gemoc.dsl.debug.sirius.ui.feature}/feature.xml (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.sirius.ui.feature => org.eclipse.gemoc.dsl.debug.sirius.ui.feature}/pom.xml (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.target => org.eclipse.gemoc.dsl.debug.target}/.classpath (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.target => org.eclipse.gemoc.dsl.debug.target}/.gitignore (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.target => org.eclipse.gemoc.dsl.debug.target}/.project (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.target => org.eclipse.gemoc.dsl.debug.target}/dsldebug-luna.target (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.target => org.eclipse.gemoc.dsl.debug.target}/dsldebug-luna.tpd (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.target => org.eclipse.gemoc.dsl.debug.target}/dsldebug-neon.target (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.target => org.eclipse.gemoc.dsl.debug.target}/dsldebug-neon.tpd (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.ui.feature => org.eclipse.gemoc.dsl.debug.ui.feature}/.project (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.ui.feature => org.eclipse.gemoc.dsl.debug.ui.feature}/about.html (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.ui.feature => org.eclipse.gemoc.dsl.debug.ui.feature}/build.properties (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.ui.feature => org.eclipse.gemoc.dsl.debug.ui.feature}/feature.xml (100%) rename simulationmodelanimation/releng/{fr.obeo.dsl.debug.ui.feature => org.eclipse.gemoc.dsl.debug.ui.feature}/pom.xml (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/.checkstyle (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/.classpath (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/.project (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/.settings/org.eclipse.jdt.ui.prefs (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/META-INF/MANIFEST.MF (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/about.html (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/build.properties (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/fr.obeo.dsl.debug.ide.tests.launch (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/plugin.properties (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests => org.eclipse.gemoc.dsl.debug.ide.tests}/pom.xml (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc}/dsl/debug/ide/tests/AllTests.java (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc}/dsl/debug/ide/tests/DSLDebuggerTests.java (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc}/dsl/debug/ide/tests/TestDSLDebugger.java (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc}/dsl/debug/ide/tests/adapter/AdapterTests.java (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc}/dsl/debug/ide/tests/adapter/DSLDebugTargetAdapterTests.java (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc}/dsl/debug/ide/tests/adapter/TestDebugEventSetListener.java (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.ide.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc}/dsl/debug/ide/tests/event/TestEventProcessor.java (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/.checkstyle (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/.classpath (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/.project (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/.settings/org.eclipse.jdt.ui.prefs (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/META-INF/MANIFEST.MF (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/about.html (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/build.properties (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/fr.obeo.dsl.debug.tests.launch (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/plugin.properties (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests => org.eclipse.gemoc.dsl.debug.tests}/pom.xml (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc}/dsl/debug/tests/AbstractDebugTests.java (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc}/dsl/debug/tests/AllTests.java (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc}/dsl/debug/tests/DebugTargetUtilsTests.java (100%) rename simulationmodelanimation/tests/{fr.obeo.dsl.debug.tests/src/fr/obeo => org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc}/dsl/debug/tests/ThreadUtilsTests.java (100%) diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/.checkstyle b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.checkstyle similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/.checkstyle rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.checkstyle diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/.classpath b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.classpath similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/.classpath rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.classpath diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/.project b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.project similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/.project rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.project diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/.settings/org.eclipse.jdt.core.prefs b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/.settings/org.eclipse.jdt.core.prefs rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.settings/org.eclipse.jdt.core.prefs diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/.settings/org.eclipse.jdt.ui.prefs b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/.settings/org.eclipse.jdt.ui.prefs rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.settings/org.eclipse.jdt.ui.prefs diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/META-INF/MANIFEST.MF similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/META-INF/MANIFEST.MF rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/META-INF/MANIFEST.MF diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/about.html b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/about.html similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/about.html rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/about.html diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/build.properties b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/build.properties similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/build.properties rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/build.properties diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateCurrentSession_debugTargets_DebugTarget.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateCurrentSession_debugTargets_DebugTarget.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateCurrentSession_debugTargets_DebugTarget.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateCurrentSession_debugTargets_DebugTarget.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateDebugTarget_threads_Thread.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateDebugTarget_threads_Thread.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateDebugTarget_threads_Thread.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateDebugTarget_threads_Thread.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateRegisterGroup_registers_Register.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateRegisterGroup_registers_Register.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateRegisterGroup_registers_Register.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateRegisterGroup_registers_Register.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_childFrame_StackFrame.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_childFrame_StackFrame.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_childFrame_StackFrame.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_childFrame_StackFrame.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_registerGroups_RegisterGroup.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_registerGroups_RegisterGroup.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_registerGroups_RegisterGroup.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_registerGroups_RegisterGroup.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_variables_Register.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_variables_Register.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_variables_Register.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_variables_Register.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_variables_Variable.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_variables_Variable.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_variables_Variable.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateStackFrame_variables_Variable.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateThread_breakpoints_BreakPoint.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateThread_breakpoints_BreakPoint.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/ctool16/CreateThread_breakpoints_BreakPoint.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/ctool16/CreateThread_breakpoints_BreakPoint.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/deco16/RUNNING.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/deco16/RUNNING.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/deco16/RUNNING.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/deco16/RUNNING.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/deco16/SUSPENDED.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/deco16/SUSPENDED.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/deco16/SUSPENDED.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/deco16/SUSPENDED.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/deco16/TERMINATED.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/deco16/TERMINATED.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/deco16/TERMINATED.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/deco16/TERMINATED.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/deco16/breakpoint.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/deco16/breakpoint.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/deco16/breakpoint.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/deco16/breakpoint.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/Breakpoint.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/Breakpoint.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/Breakpoint.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/Breakpoint.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/CurrentSession.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/CurrentSession.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/CurrentSession.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/CurrentSession.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/DebugTarget.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/DebugTarget.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/DebugTarget.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/DebugTarget.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/Register.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/Register.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/Register.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/Register.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/RegisterGroup.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/RegisterGroup.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/RegisterGroup.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/RegisterGroup.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/StackFrame.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/StackFrame.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/StackFrame.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/StackFrame.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/Thread.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/Thread.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/Thread.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/Thread.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/Variable.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/Variable.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/icons/full/obj16/Variable.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/icons/full/obj16/Variable.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/plugin.properties b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/plugin.properties similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/plugin.properties rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/plugin.properties diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/plugin.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/plugin.xml similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/plugin.xml rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/plugin.xml diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/pom.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/pom.xml similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/pom.xml rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/pom.xml diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/CurrentSessionItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/CurrentSessionItemProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/CurrentSessionItemProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/CurrentSessionItemProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/DebugEditPlugin.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugEditPlugin.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/DebugEditPlugin.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugEditPlugin.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/DebugItemProviderAdapterFactory.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugItemProviderAdapterFactory.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/DebugItemProviderAdapterFactory.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugItemProviderAdapterFactory.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/DebugTargetItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugTargetItemProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/DebugTargetItemProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugTargetItemProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/RegisterGroupItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterGroupItemProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/RegisterGroupItemProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterGroupItemProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/RegisterItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterItemProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/RegisterItemProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterItemProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/StackFrameItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/StackFrameItemProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/StackFrameItemProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/StackFrameItemProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/ThreadItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/ThreadItemProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/ThreadItemProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/ThreadItemProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/VariableItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/VariableItemProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src-gen/fr/obeo/dsl/debug/provider/VariableItemProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/VariableItemProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src/fr/obeo/dsl/debug/provider/CustomDebugItemProviderAdapterFactory.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugItemProviderAdapterFactory.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src/fr/obeo/dsl/debug/provider/CustomDebugItemProviderAdapterFactory.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugItemProviderAdapterFactory.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src/fr/obeo/dsl/debug/provider/CustomDebugTargetItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugTargetItemProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src/fr/obeo/dsl/debug/provider/CustomDebugTargetItemProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugTargetItemProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src/fr/obeo/dsl/debug/provider/CustomStackFrameItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomStackFrameItemProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src/fr/obeo/dsl/debug/provider/CustomStackFrameItemProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomStackFrameItemProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src/fr/obeo/dsl/debug/provider/CustomThreadItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomThreadItemProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.edit/src/fr/obeo/dsl/debug/provider/CustomThreadItemProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomThreadItemProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.checkstyle b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.checkstyle similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.checkstyle rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.checkstyle diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.classpath b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.classpath similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.classpath rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.classpath diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.project b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.project similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.project rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.project diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.core.prefs b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.core.prefs rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.ui.prefs b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.ui.prefs rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.settings/org.eclipse.jdt.ui.prefs diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/about.html b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/about.html similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/about.html rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/about.html diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/build.properties b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/build.properties similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/build.properties rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/build.properties diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/plugin.properties b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/plugin.properties similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/plugin.properties rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/plugin.properties diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/pom.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/pom.xml similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/pom.xml rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/pom.xml diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/DSLDebugModelPresentation.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLDebugModelPresentation.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/DSLDebugModelPresentation.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLDebugModelPresentation.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/DSLToggleBreakpointsUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLToggleBreakpointsUtils.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/DSLToggleBreakpointsUtils.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLToggleBreakpointsUtils.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/action/AbstractDebugAsAction.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractDebugAsAction.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/action/AbstractDebugAsAction.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractDebugAsAction.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/action/AbstractToggleBreakpointAction.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractToggleBreakpointAction.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/action/AbstractToggleBreakpointAction.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractToggleBreakpointAction.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.sirius.ui/src/fr/obeo/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/.checkstyle b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.checkstyle similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/.checkstyle rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.checkstyle diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/.classpath b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.classpath similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/.classpath rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.classpath diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/.project b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.project similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/.project rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.project diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/.settings/org.eclipse.jdt.core.prefs b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/.settings/org.eclipse.jdt.core.prefs rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/.settings/org.eclipse.jdt.ui.prefs b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/.settings/org.eclipse.jdt.ui.prefs rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.settings/org.eclipse.jdt.ui.prefs diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/META-INF/MANIFEST.MF similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/META-INF/MANIFEST.MF rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/META-INF/MANIFEST.MF diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/about.html b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/about.html similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/about.html rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/about.html diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/build.properties b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/build.properties similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/build.properties rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/build.properties diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/icons/full/deco16/breakpoint_disabled.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/icons/full/deco16/breakpoint_disabled.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/icons/full/deco16/breakpoint_disabled.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/icons/full/deco16/breakpoint_disabled.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/icons/full/deco16/breakpoint_enabled.gif b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/icons/full/deco16/breakpoint_enabled.gif similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/icons/full/deco16/breakpoint_enabled.gif rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/icons/full/deco16/breakpoint_enabled.gif diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/plugin.properties b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/plugin.properties similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/plugin.properties rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/plugin.properties diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/plugin.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/plugin.xml similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/plugin.xml rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/plugin.xml diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/pom.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/pom.xml similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/pom.xml rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/pom.xml diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLDebugModelPresentation.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLDebugModelPresentation.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLDebugModelPresentation.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLToggleBreakpointsUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLToggleBreakpointsUtils.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DSLToggleBreakpointsUtils.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLToggleBreakpointsUtils.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DebugIdeUiPlugin.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DebugIdeUiPlugin.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/DebugIdeUiPlugin.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DebugIdeUiPlugin.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/EMFEditorUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/EMFEditorUtils.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/EMFEditorUtils.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/EMFEditorUtils.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/handler/AbstractToggleBreakpointHandler.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/handler/AbstractToggleBreakpointHandler.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/handler/AbstractToggleBreakpointHandler.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/handler/AbstractToggleBreakpointHandler.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/launch/DSLLaunchConfigurationTab.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/DSLLaunchConfigurationTab.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/launch/DSLLaunchConfigurationTab.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/DSLLaunchConfigurationTab.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/launch/FilteredFileContentProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/FilteredFileContentProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/launch/FilteredFileContentProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/FilteredFileContentProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/provider/DSLLabelDecorator.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DSLLabelDecorator.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/provider/DSLLabelDecorator.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DSLLabelDecorator.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/provider/DecoratingColumLabelProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DecoratingColumLabelProvider.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/provider/DecoratingColumLabelProvider.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DecoratingColumLabelProvider.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/provider/OverlayImageDescriptor.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/OverlayImageDescriptor.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide.ui/src/fr/obeo/dsl/debug/ide/ui/provider/OverlayImageDescriptor.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/OverlayImageDescriptor.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/.checkstyle b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.checkstyle similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/.checkstyle rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.checkstyle diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/.classpath b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.classpath similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/.classpath rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.classpath diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/.project b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.project similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/.project rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.project diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/.settings/org.eclipse.jdt.core.prefs b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/.settings/org.eclipse.jdt.core.prefs rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.settings/org.eclipse.jdt.core.prefs diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/.settings/org.eclipse.jdt.ui.prefs b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/.settings/org.eclipse.jdt.ui.prefs rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.settings/org.eclipse.jdt.ui.prefs diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/META-INF/MANIFEST.MF similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/META-INF/MANIFEST.MF rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/META-INF/MANIFEST.MF diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/about.html b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/about.html similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/about.html rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/about.html diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/build.properties b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/build.properties similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/build.properties rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/build.properties diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/plugin.properties b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/plugin.properties similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/plugin.properties rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/plugin.properties diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/plugin.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/plugin.xml similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/plugin.xml rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/plugin.xml diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/pom.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/pom.xml similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/pom.xml rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/pom.xml diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/schema/fr.obeo.dsl.debug.locator.exsd b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/schema/fr.obeo.dsl.debug.locator.exsd similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/schema/fr.obeo.dsl.debug.locator.exsd rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/schema/fr.obeo.dsl.debug.locator.exsd diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/AbstractDSLDebugger.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/AbstractDSLDebugger.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/AbstractDSLDebugger.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/AbstractDSLDebugger.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/Activator.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/Activator.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/Activator.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/Activator.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLBreakpoint.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLBreakpoint.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLBreakpoint.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLBreakpoint.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLEclipseDebugIntegration.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLEclipseDebugIntegration.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLEclipseDebugIntegration.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLEclipseDebugIntegration.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLSourceLocator.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLSourceLocator.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/DSLSourceLocator.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLSourceLocator.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/IDSLDebugger.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IDSLDebugger.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/IDSLDebugger.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IDSLDebugger.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/IModelUpdater.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IModelUpdater.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/IModelUpdater.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IModelUpdater.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/ModelUpdater.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ModelUpdater.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/ModelUpdater.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ModelUpdater.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/ThreadController.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ThreadController.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/ThreadController.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ThreadController.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/TransactionalModelUpdater.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/TransactionalModelUpdater.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/TransactionalModelUpdater.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/TransactionalModelUpdater.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/AbstractDSLDebugElementAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/AbstractDSLDebugElementAdapter.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/AbstractDSLDebugElementAdapter.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/AbstractDSLDebugElementAdapter.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLStackFrameAdapter.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLStackFrameAdapter.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLStackFrameAdapter.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLThreadAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLThreadAdapter.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLThreadAdapter.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLThreadAdapter.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLVariableAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLVariableAdapter.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/DSLVariableAdapter.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLVariableAdapter.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/IDSLCurrentInstructionListener.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/IDSLCurrentInstructionListener.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/IDSLCurrentInstructionListener.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/IDSLCurrentInstructionListener.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/ILocator.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/ILocator.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/ILocator.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/ILocator.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/AbstractDSLValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/AbstractDSLValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/AbstractDSLValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/AbstractDSLValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLArrayValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLArrayValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLArrayValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLBooleanArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLBooleanArrayValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLBooleanArrayValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLBooleanArrayValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLByteArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLByteArrayValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLByteArrayValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLByteArrayValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLCharArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLCharArrayValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLCharArrayValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLCharArrayValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLDoubleArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLDoubleArrayValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLDoubleArrayValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLDoubleArrayValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLEObjectValueAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLEObjectValueAdapter.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLEObjectValueAdapter.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLEObjectValueAdapter.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLFloatArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLFloatArrayValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLFloatArrayValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLFloatArrayValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLIntArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLIntArrayValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLIntArrayValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLIntArrayValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLLongArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLLongArrayValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLLongArrayValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLLongArrayValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLNullValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLNullValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLNullValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLNullValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLObjectValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLObjectValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLObjectValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLObjectValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLShortArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLShortArrayValue.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/value/DSLShortArrayValue.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLShortArrayValue.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/variable/DSLObjectVariable.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/variable/DSLObjectVariable.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/adapter/variable/DSLObjectVariable.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/variable/DSLObjectVariable.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/DSLDebugEventDispatcher.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/DSLDebugEventDispatcher.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/DSLDebugEventDispatcher.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/DSLDebugEventDispatcher.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/IDSLDebugEvent.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEvent.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/IDSLDebugEvent.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEvent.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/IDSLDebugEventProcessor.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEventProcessor.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/IDSLDebugEventProcessor.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEventProcessor.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/AbstractThreadReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractThreadReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/AbstractThreadReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractThreadReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/AbstractVariableReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractVariableReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/AbstractVariableReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractVariableReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/BreakpointReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/BreakpointReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/BreakpointReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/BreakpointReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/DeleteVariableReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/DeleteVariableReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/DeleteVariableReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/DeleteVariableReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/IDSLDebuggerReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/IDSLDebuggerReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/IDSLDebuggerReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/IDSLDebuggerReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/PopStackFrameReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PopStackFrameReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/PopStackFrameReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PopStackFrameReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/PushStackFrameReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PushStackFrameReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/PushStackFrameReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PushStackFrameReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/ResumingReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ResumingReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/ResumingReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ResumingReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/SetCurrentInstructionReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetCurrentInstructionReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/SetCurrentInstructionReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetCurrentInstructionReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/SetVariableValueReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetVariableValueReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/SetVariableValueReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetVariableValueReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/SpawnRunningThreadReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SpawnRunningThreadReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/SpawnRunningThreadReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SpawnRunningThreadReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/StepIntoResumingReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepIntoResumingReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/StepIntoResumingReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepIntoResumingReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/StepOverResumingReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepOverResumingReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/StepOverResumingReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepOverResumingReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/StepReturnResumingReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepReturnResumingReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/StepReturnResumingReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepReturnResumingReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/SteppedReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SteppedReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/SteppedReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SteppedReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/SuspendedReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SuspendedReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/SuspendedReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SuspendedReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/TerminatedReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/TerminatedReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/TerminatedReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/TerminatedReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/ValidateVariableValueReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ValidateVariableValueReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/ValidateVariableValueReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ValidateVariableValueReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/VariableReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/VariableReply.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/debugger/VariableReply.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/VariableReply.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/AbstractBreakpointRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractBreakpointRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/AbstractBreakpointRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractBreakpointRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/AbstractStepRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractStepRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/AbstractStepRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractStepRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/AbstractThreadRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractThreadRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/AbstractThreadRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractThreadRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/AbstractVariableRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractVariableRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/AbstractVariableRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractVariableRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/AddBreakpointRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AddBreakpointRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/AddBreakpointRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AddBreakpointRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/ChangeBreakPointRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ChangeBreakPointRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/ChangeBreakPointRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ChangeBreakPointRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/DisconnectRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/DisconnectRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/DisconnectRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/DisconnectRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/IDSLModelRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/IDSLModelRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/IDSLModelRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/IDSLModelRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/RemoveBreakpointRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/RemoveBreakpointRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/RemoveBreakpointRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/RemoveBreakpointRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/ResumeRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ResumeRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/ResumeRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ResumeRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/SetVariableValueRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SetVariableValueRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/SetVariableValueRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SetVariableValueRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/StartRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StartRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/StartRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StartRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/StepIntoRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepIntoRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/StepIntoRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepIntoRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/StepOverRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepOverRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/StepOverRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepOverRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/StepReturnRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepReturnRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/StepReturnRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepReturnRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/SuspendRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SuspendRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/SuspendRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SuspendRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/TerminateRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/TerminateRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/TerminateRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/TerminateRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/ValidateVariableValueRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ValidateVariableValueRequest.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/event/model/ValidateVariableValueRequest.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ValidateVariableValueRequest.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/launch/AbstractDSLLaunchConfigurationDelegate.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/launch/AbstractDSLLaunchConfigurationDelegate.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug.ide/src/fr/obeo/dsl/debug/ide/launch/AbstractDSLLaunchConfigurationDelegate.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/launch/AbstractDSLLaunchConfigurationDelegate.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/.checkstyle b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.checkstyle similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/.checkstyle rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.checkstyle diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/.classpath b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.classpath similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/.classpath rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.classpath diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/.project b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.project similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/.project rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.project diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/.settings/org.eclipse.jdt.core.prefs b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/.settings/org.eclipse.jdt.core.prefs rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.settings/org.eclipse.jdt.core.prefs diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/.settings/org.eclipse.jdt.ui.prefs b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/.settings/org.eclipse.jdt.ui.prefs rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.settings/org.eclipse.jdt.ui.prefs diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/META-INF/MANIFEST.MF similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/META-INF/MANIFEST.MF rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/META-INF/MANIFEST.MF diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/about.html b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/about.html similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/about.html rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/about.html diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/build.properties b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/build.properties similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/build.properties rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/build.properties diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/model/EMF_debug_model.png b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/model/EMF_debug_model.png similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/model/EMF_debug_model.png rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/model/EMF_debug_model.png diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/model/debug.ecore b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/model/debug.ecore similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/model/debug.ecore rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/model/debug.ecore diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/model/debug.genmodel b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/model/debug.genmodel similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/model/debug.genmodel rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/model/debug.genmodel diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/plugin.properties b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/plugin.properties similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/plugin.properties rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/plugin.properties diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/plugin.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/plugin.xml similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/plugin.xml rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/plugin.xml diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/pom.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/pom.xml similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/pom.xml rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/pom.xml diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/Contextual.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Contextual.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/Contextual.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Contextual.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/CurrentSession.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/CurrentSession.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/CurrentSession.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/CurrentSession.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/DebugFactory.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugFactory.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/DebugFactory.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugFactory.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/DebugPackage.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugPackage.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/DebugPackage.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugPackage.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/DebugTarget.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTarget.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/DebugTarget.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTarget.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/DebugTargetState.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTargetState.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/DebugTargetState.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTargetState.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/Register.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Register.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/Register.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Register.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/RegisterGroup.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/RegisterGroup.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/RegisterGroup.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/RegisterGroup.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/StackFrame.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/StackFrame.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/StackFrame.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/StackFrame.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/State.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/State.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/State.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/State.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/Thread.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Thread.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/Thread.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Thread.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/Variable.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Variable.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/Variable.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Variable.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/CurrentSessionImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/CurrentSessionImpl.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/CurrentSessionImpl.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/CurrentSessionImpl.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/DebugFactoryImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugFactoryImpl.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/DebugFactoryImpl.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugFactoryImpl.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/DebugPackageImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugPackageImpl.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/DebugPackageImpl.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugPackageImpl.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/DebugTargetImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugTargetImpl.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/DebugTargetImpl.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugTargetImpl.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/RegisterGroupImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterGroupImpl.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/RegisterGroupImpl.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterGroupImpl.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/RegisterImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterImpl.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/RegisterImpl.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterImpl.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/StackFrameImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/StackFrameImpl.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/StackFrameImpl.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/StackFrameImpl.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/ThreadImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/ThreadImpl.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/ThreadImpl.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/ThreadImpl.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/VariableImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/VariableImpl.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/impl/VariableImpl.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/VariableImpl.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/util/DebugAdapterFactory.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugAdapterFactory.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/util/DebugAdapterFactory.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugAdapterFactory.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/util/DebugSwitch.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugSwitch.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src-gen/fr/obeo/dsl/debug/util/DebugSwitch.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugSwitch.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src/fr/obeo/dsl/debug/DebugTargetUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/DebugTargetUtils.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src/fr/obeo/dsl/debug/DebugTargetUtils.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/DebugTargetUtils.java diff --git a/simulationmodelanimation/plugins/fr.obeo.dsl.debug/src/fr/obeo/dsl/debug/ThreadUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/ThreadUtils.java similarity index 100% rename from simulationmodelanimation/plugins/fr.obeo.dsl.debug/src/fr/obeo/dsl/debug/ThreadUtils.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/ThreadUtils.java diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/.project b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/.project similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/.project rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/.project diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/about.html b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/about.html similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/about.html rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/about.html diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/build.properties b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/build.properties similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/build.properties rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/build.properties diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/feature.xml b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/feature.xml similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/feature.xml rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/feature.xml diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/pom.xml b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/pom.xml similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.feature/pom.xml rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/pom.xml diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/.project b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/.project similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/.project rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/.project diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/about.html b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/about.html similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/about.html rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/about.html diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/build.properties b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/build.properties similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/build.properties rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/build.properties diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/feature.xml b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/feature.xml similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/feature.xml rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/feature.xml diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/pom.xml b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/pom.xml similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.sirius.ui.feature/pom.xml rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/pom.xml diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/.classpath b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/.classpath similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.target/.classpath rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/.classpath diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/.gitignore b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/.gitignore similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.target/.gitignore rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/.gitignore diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/.project b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/.project similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.target/.project rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/.project diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-luna.target b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/dsldebug-luna.target similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-luna.target rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/dsldebug-luna.target diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-luna.tpd b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/dsldebug-luna.tpd similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-luna.tpd rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/dsldebug-luna.tpd diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.target b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/dsldebug-neon.target similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.target rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/dsldebug-neon.target diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.tpd b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/dsldebug-neon.tpd similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.target/dsldebug-neon.tpd rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/dsldebug-neon.tpd diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/.project b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/.project similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/.project rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/.project diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/about.html b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/about.html similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/about.html rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/about.html diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/build.properties b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/build.properties similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/build.properties rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/build.properties diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/feature.xml b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/feature.xml similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/feature.xml rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/feature.xml diff --git a/simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/pom.xml b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/pom.xml similarity index 100% rename from simulationmodelanimation/releng/fr.obeo.dsl.debug.ui.feature/pom.xml rename to simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/pom.xml diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/.checkstyle b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.checkstyle similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/.checkstyle rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.checkstyle diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/.classpath b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.classpath similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/.classpath rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.classpath diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/.project b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.project similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/.project rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.project diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/.settings/org.eclipse.jdt.core.prefs b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/.settings/org.eclipse.jdt.core.prefs rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/.settings/org.eclipse.jdt.ui.prefs b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/.settings/org.eclipse.jdt.ui.prefs rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/META-INF/MANIFEST.MF b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/META-INF/MANIFEST.MF similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/META-INF/MANIFEST.MF rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/META-INF/MANIFEST.MF diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/about.html b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/about.html similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/about.html rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/about.html diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/build.properties b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/build.properties similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/build.properties rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/build.properties diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/fr.obeo.dsl.debug.ide.tests.launch b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/fr.obeo.dsl.debug.ide.tests.launch similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/fr.obeo.dsl.debug.ide.tests.launch rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/fr.obeo.dsl.debug.ide.tests.launch diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/plugin.properties b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/plugin.properties similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/plugin.properties rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/plugin.properties diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/pom.xml b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/pom.xml similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/pom.xml rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/pom.xml diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/AllTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/AllTests.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/AllTests.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/AllTests.java diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/DSLDebuggerTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/DSLDebuggerTests.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/DSLDebuggerTests.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/DSLDebuggerTests.java diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/TestDSLDebugger.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/TestDSLDebugger.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/TestDSLDebugger.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/TestDSLDebugger.java diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/adapter/AdapterTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/AdapterTests.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/adapter/AdapterTests.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/AdapterTests.java diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/adapter/DSLDebugTargetAdapterTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/DSLDebugTargetAdapterTests.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/adapter/DSLDebugTargetAdapterTests.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/DSLDebugTargetAdapterTests.java diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/adapter/TestDebugEventSetListener.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/TestDebugEventSetListener.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/adapter/TestDebugEventSetListener.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/TestDebugEventSetListener.java diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/event/TestEventProcessor.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/event/TestEventProcessor.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.ide.tests/src/fr/obeo/dsl/debug/ide/tests/event/TestEventProcessor.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/event/TestEventProcessor.java diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/.checkstyle b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.checkstyle similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/.checkstyle rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.checkstyle diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/.classpath b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.classpath similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/.classpath rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.classpath diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/.project b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.project similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/.project rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.project diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/.settings/org.eclipse.jdt.core.prefs b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/.settings/org.eclipse.jdt.core.prefs rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/.settings/org.eclipse.jdt.ui.prefs b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/.settings/org.eclipse.jdt.ui.prefs rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/META-INF/MANIFEST.MF b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/META-INF/MANIFEST.MF similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/META-INF/MANIFEST.MF rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/META-INF/MANIFEST.MF diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/about.html b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/about.html similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/about.html rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/about.html diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/build.properties b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/build.properties similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/build.properties rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/build.properties diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/fr.obeo.dsl.debug.tests.launch b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/fr.obeo.dsl.debug.tests.launch similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/fr.obeo.dsl.debug.tests.launch rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/fr.obeo.dsl.debug.tests.launch diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/plugin.properties b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/plugin.properties similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/plugin.properties rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/plugin.properties diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/pom.xml b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/pom.xml similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/pom.xml rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/pom.xml diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/src/fr/obeo/dsl/debug/tests/AbstractDebugTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AbstractDebugTests.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/src/fr/obeo/dsl/debug/tests/AbstractDebugTests.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AbstractDebugTests.java diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/src/fr/obeo/dsl/debug/tests/AllTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AllTests.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/src/fr/obeo/dsl/debug/tests/AllTests.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AllTests.java diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/src/fr/obeo/dsl/debug/tests/DebugTargetUtilsTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/DebugTargetUtilsTests.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/src/fr/obeo/dsl/debug/tests/DebugTargetUtilsTests.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/DebugTargetUtilsTests.java diff --git a/simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/src/fr/obeo/dsl/debug/tests/ThreadUtilsTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/ThreadUtilsTests.java similarity index 100% rename from simulationmodelanimation/tests/fr.obeo.dsl.debug.tests/src/fr/obeo/dsl/debug/tests/ThreadUtilsTests.java rename to simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/ThreadUtilsTests.java From c7c10d227379c1e9d26b7f540fb577f021bab2a7 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 11:00:44 +0200 Subject: [PATCH 235/267] rename fr.obeo.dsl.debug* in org.eclipse.gemoc.dsl.debug* --- .project | 11 + .../META-INF/MANIFEST.MF | 6 +- .../plugin.xml | 2 +- .../debugger/ui/OpenSemanticsHandler.java | 2 +- .../BreakpointDetailPaneFactory.java | 2 +- .../GemocToggleBreakpointAction.java | 6 +- .../META-INF/MANIFEST.MF | 4 +- .../debugger/AbstractGemocDebugger.java | 8 +- .../AbstractGemocDebuggerFactory.java | 2 +- .../debugger/GemocBreakpoint.java | 2 +- .../META-INF/MANIFEST.MF | 8 +- .../engine/ui/commons/RunConfiguration.java | 2 +- .../ui/launcher/AbstractGemocLauncher.java | 2 +- .../AbstractSequentialGemocLauncher.java | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../modelloader/DefaultModelLoader.java | 2 +- .../AbstractGemocAnimatorServices.java | 2 +- .../AbstractGemocDebuggerServices.java | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 8 +- .../plugin.xml | 2 +- .../GemocToggleBreakpointHandler.java | 4 +- .../debug/GenericSequentialModelDebugger.java | 4 +- ...scientGenericSequentialModelDebugger.xtend | 2 +- .../sirius/action/GemocSequentialDebugAs.java | 2 +- .../launcher/GemocDebugModelPresentation.java | 6 +- .../ui/launcher/GemocSourceLocator.java | 4 +- .../javaengine/ui/launcher/Launcher.java | 4 +- .../PlainK3DebugModelPresentation.java | 12 +- .../javaengine/ui/launcher/XtextLocator.java | 2 +- .../tabs/LaunchConfigurationMainTab.java | 4 +- .../pom.xml | 2 +- .../category.xml | 12 +- simulationmodelanimation/.project | 2 +- .../org.eclipse.gemoc.dsl.debug.edit/.project | 2 +- .../META-INF/MANIFEST.MF | 8 +- .../plugin.xml | 2 +- .../org.eclipse.gemoc.dsl.debug.edit/pom.xml | 4 +- .../provider/CurrentSessionItemProvider.java | 10 +- .../dsl/debug/provider/DebugEditPlugin.java | 2 +- .../DebugItemProviderAdapterFactory.java | 32 +- .../provider/DebugTargetItemProvider.java | 10 +- .../provider/RegisterGroupItemProvider.java | 10 +- .../debug/provider/RegisterItemProvider.java | 6 +- .../provider/StackFrameItemProvider.java | 10 +- .../debug/provider/ThreadItemProvider.java | 10 +- .../debug/provider/VariableItemProvider.java | 8 +- ...CustomDebugItemProviderAdapterFactory.java | 2 +- .../CustomDebugTargetItemProvider.java | 12 +- .../CustomStackFrameItemProvider.java | 8 +- .../provider/CustomThreadItemProvider.java | 12 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 18 +- .../pom.xml | 4 +- .../sirius/ui/DSLDebugModelPresentation.java | 12 +- .../sirius/ui/DSLToggleBreakpointsUtils.java | 8 +- .../ide/sirius/ui/DebugSiriusIdeUiPlugin.java | 4 +- .../ide/sirius/ui/SiriusEditorUtils.java | 2 +- .../ui/action/AbstractDebugAsAction.java | 6 +- .../AbstractToggleBreakpointAction.java | 6 +- ...tractDSLLaunchConfigurationDelegateUI.java | 12 +- .../ui/launch/DSLLaunchConfigurationTab.java | 12 +- .../services/AbstractDSLDebuggerServices.java | 22 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 16 +- .../plugin.xml | 4 +- .../pom.xml | 4 +- .../ide/ui/DSLDebugModelPresentation.java | 14 +- .../ide/ui/DSLToggleBreakpointsUtils.java | 4 +- .../dsl/debug/ide/ui/DebugIdeUiPlugin.java | 4 +- .../dsl/debug/ide/ui/EMFEditorUtils.java | 4 +- .../AbstractToggleBreakpointHandler.java | 6 +- ...tractDSLLaunchConfigurationDelegateUI.java | 6 +- .../ui/launch/DSLLaunchConfigurationTab.java | 6 +- .../launch/FilteredFileContentProvider.java | 2 +- .../ide/ui/provider/DSLLabelDecorator.java | 6 +- .../DecoratingColumLabelProvider.java | 2 +- .../ui/provider/OverlayImageDescriptor.java | 2 +- .../org.eclipse.gemoc.dsl.debug.ide/.project | 2 +- .../META-INF/MANIFEST.MF | 24 +- .../plugin.xml | 12 +- .../org.eclipse.gemoc.dsl.debug.ide/pom.xml | 4 +- .../dsl/debug/ide/AbstractDSLDebugger.java | 146 ++++----- .../gemoc/dsl/debug/ide/Activator.java | 8 +- .../gemoc/dsl/debug/ide/DSLBreakpoint.java | 8 +- .../debug/ide/DSLEclipseDebugIntegration.java | 68 ++--- .../gemoc/dsl/debug/ide/DSLSourceLocator.java | 4 +- .../gemoc/dsl/debug/ide/IDSLDebugger.java | 6 +- .../gemoc/dsl/debug/ide/IModelUpdater.java | 76 ++--- .../gemoc/dsl/debug/ide/ModelUpdater.java | 48 +-- .../gemoc/dsl/debug/ide/ThreadController.java | 4 +- .../debug/ide/TransactionalModelUpdater.java | 46 +-- .../AbstractDSLDebugElementAdapter.java | 4 +- .../ide/adapter/DSLDebugTargetAdapter.java | 74 ++--- .../ide/adapter/DSLStackFrameAdapter.java | 14 +- .../debug/ide/adapter/DSLThreadAdapter.java | 28 +- .../debug/ide/adapter/DSLVariableAdapter.java | 12 +- .../IDSLCurrentInstructionListener.java | 4 +- .../gemoc/dsl/debug/ide/adapter/ILocator.java | 2 +- .../ide/adapter/value/AbstractDSLValue.java | 6 +- .../ide/adapter/value/DSLArrayValue.java | 4 +- .../adapter/value/DSLBooleanArrayValue.java | 4 +- .../ide/adapter/value/DSLByteArrayValue.java | 4 +- .../ide/adapter/value/DSLCharArrayValue.java | 4 +- .../adapter/value/DSLDoubleArrayValue.java | 4 +- .../adapter/value/DSLEObjectValueAdapter.java | 4 +- .../ide/adapter/value/DSLFloatArrayValue.java | 4 +- .../ide/adapter/value/DSLIntArrayValue.java | 4 +- .../ide/adapter/value/DSLLongArrayValue.java | 4 +- .../debug/ide/adapter/value/DSLNullValue.java | 4 +- .../ide/adapter/value/DSLObjectValue.java | 4 +- .../ide/adapter/value/DSLShortArrayValue.java | 4 +- .../adapter/variable/DSLObjectVariable.java | 6 +- .../ide/event/DSLDebugEventDispatcher.java | 12 +- .../dsl/debug/ide/event/IDSLDebugEvent.java | 6 +- .../ide/event/IDSLDebugEventProcessor.java | 2 +- .../event/debugger/AbstractThreadReply.java | 12 +- .../event/debugger/AbstractVariableReply.java | 22 +- .../ide/event/debugger/BreakpointReply.java | 4 +- .../event/debugger/DeleteVariableReply.java | 6 +- .../ide/event/debugger/IDSLDebuggerReply.java | 8 +- .../event/debugger/PopStackFrameReply.java | 6 +- .../event/debugger/PushStackFrameReply.java | 6 +- .../ide/event/debugger/ResumingReply.java | 6 +- .../debugger/SetCurrentInstructionReply.java | 6 +- .../event/debugger/SetVariableValueReply.java | 10 +- .../debugger/SpawnRunningThreadReply.java | 4 +- .../event/debugger/StepIntoResumingReply.java | 6 +- .../event/debugger/StepOverResumingReply.java | 6 +- .../debugger/StepReturnResumingReply.java | 6 +- .../ide/event/debugger/SteppedReply.java | 4 +- .../ide/event/debugger/SuspendedReply.java | 4 +- .../ide/event/debugger/TerminatedReply.java | 8 +- .../debugger/ValidateVariableValueReply.java | 10 +- .../ide/event/debugger/VariableReply.java | 8 +- .../model/AbstractBreakpointRequest.java | 2 +- .../ide/event/model/AbstractStepRequest.java | 4 +- .../event/model/AbstractThreadRequest.java | 12 +- .../event/model/AbstractVariableRequest.java | 22 +- .../ide/event/model/AddBreakpointRequest.java | 2 +- .../event/model/ChangeBreakPointRequest.java | 2 +- .../ide/event/model/DisconnectRequest.java | 2 +- .../ide/event/model/IDSLModelRequest.java | 8 +- .../event/model/RemoveBreakpointRequest.java | 2 +- .../debug/ide/event/model/ResumeRequest.java | 4 +- .../event/model/SetVariableValueRequest.java | 8 +- .../debug/ide/event/model/StartRequest.java | 2 +- .../ide/event/model/StepIntoRequest.java | 4 +- .../ide/event/model/StepOverRequest.java | 4 +- .../ide/event/model/StepReturnRequest.java | 4 +- .../debug/ide/event/model/SuspendRequest.java | 4 +- .../ide/event/model/TerminateRequest.java | 4 +- .../model/ValidateVariableValueRequest.java | 8 +- ...bstractDSLLaunchConfigurationDelegate.java | 22 +- .../org.eclipse.gemoc.dsl.debug/.project | 2 +- .../META-INF/MANIFEST.MF | 8 +- .../org.eclipse.gemoc.dsl.debug/plugin.xml | 2 +- .../org.eclipse.gemoc.dsl.debug/pom.xml | 4 +- .../eclipse/gemoc/dsl/debug/Contextual.java | 10 +- .../gemoc/dsl/debug/CurrentSession.java | 10 +- .../eclipse/gemoc/dsl/debug/DebugFactory.java | 6 +- .../eclipse/gemoc/dsl/debug/DebugPackage.java | 278 +++++++++--------- .../eclipse/gemoc/dsl/debug/DebugTarget.java | 36 +-- .../gemoc/dsl/debug/DebugTargetState.java | 4 +- .../org/eclipse/gemoc/dsl/debug/Register.java | 14 +- .../gemoc/dsl/debug/RegisterGroup.java | 20 +- .../eclipse/gemoc/dsl/debug/StackFrame.java | 56 ++-- .../org/eclipse/gemoc/dsl/debug/State.java | 4 +- .../org/eclipse/gemoc/dsl/debug/Thread.java | 50 ++-- .../org/eclipse/gemoc/dsl/debug/Variable.java | 38 +-- .../dsl/debug/impl/CurrentSessionImpl.java | 10 +- .../dsl/debug/impl/DebugFactoryImpl.java | 24 +- .../dsl/debug/impl/DebugPackageImpl.java | 42 +-- .../gemoc/dsl/debug/impl/DebugTargetImpl.java | 26 +- .../dsl/debug/impl/RegisterGroupImpl.java | 12 +- .../gemoc/dsl/debug/impl/RegisterImpl.java | 10 +- .../gemoc/dsl/debug/impl/StackFrameImpl.java | 26 +- .../gemoc/dsl/debug/impl/ThreadImpl.java | 24 +- .../gemoc/dsl/debug/impl/VariableImpl.java | 12 +- .../dsl/debug/util/DebugAdapterFactory.java | 54 ++-- .../gemoc/dsl/debug/util/DebugSwitch.java | 24 +- .../gemoc/dsl/debug/DebugTargetUtils.java | 2 +- .../eclipse/gemoc/dsl/debug/ThreadUtils.java | 2 +- simulationmodelanimation/pom.xml | 24 +- .../.project | 2 +- .../feature.xml | 8 +- .../pom.xml | 4 +- .../.project | 2 +- .../feature.xml | 4 +- .../pom.xml | 4 +- .../.project | 2 +- .../.project | 2 +- .../feature.xml | 4 +- .../pom.xml | 4 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 8 +- .../pom.xml | 4 +- .../gemoc/dsl/debug/ide/tests/AllTests.java | 6 +- .../dsl/debug/ide/tests/DSLDebuggerTests.java | 62 ++-- .../dsl/debug/ide/tests/TestDSLDebugger.java | 112 +++---- .../debug/ide/tests/adapter/AdapterTests.java | 4 +- .../adapter/DSLDebugTargetAdapterTests.java | 92 +++--- .../adapter/TestDebugEventSetListener.java | 2 +- .../ide/tests/event/TestEventProcessor.java | 8 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../org.eclipse.gemoc.dsl.debug.tests/pom.xml | 4 +- .../dsl/debug/tests/AbstractDebugTests.java | 32 +- .../gemoc/dsl/debug/tests/AllTests.java | 4 +- .../debug/tests/DebugTargetUtilsTests.java | 16 +- .../dsl/debug/tests/ThreadUtilsTests.java | 20 +- .../META-INF/MANIFEST.MF | 4 +- 212 files changed, 1345 insertions(+), 1334 deletions(-) create mode 100644 .project diff --git a/.project b/.project new file mode 100644 index 000000000..a3725806c --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + ModelDebugging + + + + + + + + diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF index 4d6255d02..2b0b84673 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: com.google.guava, org.eclipse.gemoc.xdsmlframework.api, org.eclipse.jface, org.eclipse.debug.core, - fr.obeo.dsl.debug.ide, + org.eclipse.gemoc.dsl.debug.ide, org.eclipse.core.runtime;bundle-version="3.12.0", org.eclipse.gemoc.executionframework.engine, org.eclipse.gemoc.commons.eclipse.ui, @@ -23,10 +23,10 @@ Require-Bundle: com.google.guava, org.eclipse.ui.workbench, org.eclipse.xtext;bundle-version="2.10.0", org.eclipse.gemoc.executionframework.debugger;bundle-version="1.0.0", - fr.obeo.dsl.debug.ide.sirius.ui, + org.eclipse.gemoc.dsl.debug.ide.sirius.ui, org.eclipse.gemoc.executionframework.engine.ui, fr.inria.diverse.melange.resource, - fr.obeo.dsl.debug.ide.ui;bundle-version="2.3.0", + org.eclipse.gemoc.dsl.debug.ide.ui;bundle-version="2.3.0", org.eclipse.sirius;bundle-version="4.1.3", org.eclipse.debug.ui Bundle-ActivationPolicy: lazy diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml index f981adc78..bda965faf 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger.ui/plugin.xml @@ -8,7 +8,7 @@ value="true"> + type="org.eclipse.gemoc.dsl.debug.ide.breakpointMarker"> + point="org.eclipse.gemoc.dsl.debug.locator"> eclipse-feature - fr.obeo.dsl.debug.feature + org.eclipse.gemoc.dsl.debug.feature 1.0.0 diff --git a/releng/org.gemoc.siriusanimation.repository/category.xml b/releng/org.gemoc.siriusanimation.repository/category.xml index 07eced2d5..9f1194547 100644 --- a/releng/org.gemoc.siriusanimation.repository/category.xml +++ b/releng/org.gemoc.siriusanimation.repository/category.xml @@ -54,22 +54,22 @@ - + - + - + - + - + - + diff --git a/simulationmodelanimation/.project b/simulationmodelanimation/.project index 2d54e5b93..483b821f4 100644 --- a/simulationmodelanimation/.project +++ b/simulationmodelanimation/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.project b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.project index 680ba8dad..9fc910745 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.project +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.edit + org.eclipse.gemoc.dsl.debug.edit diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/META-INF/MANIFEST.MF index 6e1f28edd..dc4589d3e 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.obeo.dsl.debug.edit;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.dsl.debug.edit;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . -Bundle-Activator: fr.obeo.dsl.debug.provider.DebugEditPlugin$Implementation +Bundle-Activator: org.eclipse.gemoc.dsl.debug.provider.DebugEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: fr.obeo.dsl.debug.provider +Export-Package: org.eclipse.gemoc.dsl.debug.provider Require-Bundle: org.eclipse.core.runtime, - fr.obeo.dsl.debug;visibility:=reexport, + org.eclipse.gemoc.dsl.debug;visibility:=reexport, org.eclipse.emf.edit;visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/plugin.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/plugin.xml index c7b0c4814..e81759255 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/plugin.xml +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/plugin.xml @@ -18,7 +18,7 @@ Contributors: 4.0.0 - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent DSLDebugger 2.3.0-SNAPSHOT ../../ DSLDebugger - fr.obeo.dsl.debug.edit + org.eclipse.gemoc.dsl.debug.edit 2.3.0-SNAPSHOT eclipse-plugin diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/CurrentSessionItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/CurrentSessionItemProvider.java index 29d93bf73..25dfb6292 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/CurrentSessionItemProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/CurrentSessionItemProvider.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.CurrentSession; -import fr.obeo.dsl.debug.DebugFactory; -import fr.obeo.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.CurrentSession; +import org.eclipse.gemoc.dsl.debug.DebugFactory; +import org.eclipse.gemoc.dsl.debug.DebugPackage; import java.util.Collection; import java.util.List; @@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** - * This is the item provider adapter for a {@link fr.obeo.dsl.debug.CurrentSession} object. * * @generated diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugEditPlugin.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugEditPlugin.java index 9d4803b37..b84461143 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugEditPlugin.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugEditPlugin.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugItemProviderAdapterFactory.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugItemProviderAdapterFactory.java index 82d2b87cc..195a0e108 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugItemProviderAdapterFactory.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugItemProviderAdapterFactory.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.util.DebugAdapterFactory; +import org.eclipse.gemoc.dsl.debug.util.DebugAdapterFactory; import java.util.ArrayList; import java.util.Collection; @@ -83,7 +83,7 @@ public DebugItemProviderAdapterFactory() { } /** - * This keeps track of the one adapter used for all {@link fr.obeo.dsl.debug.DebugTarget} instances. * * @generated @@ -91,7 +91,7 @@ public DebugItemProviderAdapterFactory() { protected DebugTargetItemProvider debugTargetItemProvider; /** - * This creates an adapter for a {@link fr.obeo.dsl.debug.DebugTarget}. + * This creates an adapter for a {@link org.eclipse.gemoc.dsl.debug.DebugTarget}. * * @generated @@ -106,7 +106,7 @@ public Adapter createDebugTargetAdapter() { } /** - * This keeps track of the one adapter used for all {@link fr.obeo.dsl.debug.Thread} instances. * * @generated @@ -114,7 +114,7 @@ public Adapter createDebugTargetAdapter() { protected ThreadItemProvider threadItemProvider; /** - * This creates an adapter for a {@link fr.obeo.dsl.debug.Thread}. + * This creates an adapter for a {@link org.eclipse.gemoc.dsl.debug.Thread}. * * @generated @@ -129,7 +129,7 @@ public Adapter createThreadAdapter() { } /** - * This keeps track of the one adapter used for all {@link fr.obeo.dsl.debug.StackFrame} instances. * * @generated @@ -137,7 +137,7 @@ public Adapter createThreadAdapter() { protected StackFrameItemProvider stackFrameItemProvider; /** - * This creates an adapter for a {@link fr.obeo.dsl.debug.StackFrame}. + * This creates an adapter for a {@link org.eclipse.gemoc.dsl.debug.StackFrame}. * * @generated @@ -152,7 +152,7 @@ public Adapter createStackFrameAdapter() { } /** - * This keeps track of the one adapter used for all {@link fr.obeo.dsl.debug.Variable} instances. * * @generated @@ -160,7 +160,7 @@ public Adapter createStackFrameAdapter() { protected VariableItemProvider variableItemProvider; /** - * This creates an adapter for a {@link fr.obeo.dsl.debug.Variable}. + * This creates an adapter for a {@link org.eclipse.gemoc.dsl.debug.Variable}. * * @generated @@ -175,14 +175,14 @@ public Adapter createVariableAdapter() { } /** - * This keeps track of the one adapter used for all {@link fr.obeo.dsl.debug.CurrentSession} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.gemoc.dsl.debug.CurrentSession} instances. * * @generated */ protected CurrentSessionItemProvider currentSessionItemProvider; /** - * This creates an adapter for a {@link fr.obeo.dsl.debug.CurrentSession}. + * This creates an adapter for a {@link org.eclipse.gemoc.dsl.debug.CurrentSession}. * * @generated @@ -197,14 +197,14 @@ public Adapter createCurrentSessionAdapter() { } /** - * This keeps track of the one adapter used for all {@link fr.obeo.dsl.debug.RegisterGroup} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.gemoc.dsl.debug.RegisterGroup} instances. * * @generated */ protected RegisterGroupItemProvider registerGroupItemProvider; /** - * This creates an adapter for a {@link fr.obeo.dsl.debug.RegisterGroup}. + * This creates an adapter for a {@link org.eclipse.gemoc.dsl.debug.RegisterGroup}. * * @generated @@ -219,7 +219,7 @@ public Adapter createRegisterGroupAdapter() { } /** - * This keeps track of the one adapter used for all {@link fr.obeo.dsl.debug.Register} instances. * * @generated @@ -227,7 +227,7 @@ public Adapter createRegisterGroupAdapter() { protected RegisterItemProvider registerItemProvider; /** - * This creates an adapter for a {@link fr.obeo.dsl.debug.Register}. + * This creates an adapter for a {@link org.eclipse.gemoc.dsl.debug.Register}. * * @generated diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugTargetItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugTargetItemProvider.java index 6ea5997b5..3b7c75f1e 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugTargetItemProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/DebugTargetItemProvider.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.DebugFactory; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugFactory; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; import java.util.Collection; import java.util.List; @@ -33,7 +33,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** - * This is the item provider adapter for a {@link fr.obeo.dsl.debug.DebugTarget} object. + * This is the item provider adapter for a {@link org.eclipse.gemoc.dsl.debug.DebugTarget} object. * * @generated diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterGroupItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterGroupItemProvider.java index e6b10d313..2d27db168 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterGroupItemProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterGroupItemProvider.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.DebugFactory; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.RegisterGroup; +import org.eclipse.gemoc.dsl.debug.DebugFactory; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.RegisterGroup; import java.util.Collection; import java.util.List; @@ -33,7 +33,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** - * This is the item provider adapter for a {@link fr.obeo.dsl.debug.RegisterGroup} object. + * This is the item provider adapter for a {@link org.eclipse.gemoc.dsl.debug.RegisterGroup} object. * * @generated diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterItemProvider.java index 6b031a415..dffca86ab 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterItemProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/RegisterItemProvider.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.Register; +import org.eclipse.gemoc.dsl.debug.Register; import java.util.Collection; import java.util.List; @@ -20,7 +20,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; /** - * This is the item provider adapter for a {@link fr.obeo.dsl.debug.Register} object. + * This is the item provider adapter for a {@link org.eclipse.gemoc.dsl.debug.Register} object. * * * @generated diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/StackFrameItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/StackFrameItemProvider.java index 4124e82db..a06eb67b0 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/StackFrameItemProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/StackFrameItemProvider.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.DebugFactory; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.DebugFactory; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.StackFrame; import java.util.Collection; import java.util.List; @@ -33,7 +33,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** - * This is the item provider adapter for a {@link fr.obeo.dsl.debug.StackFrame} object. + * This is the item provider adapter for a {@link org.eclipse.gemoc.dsl.debug.StackFrame} object. * * @generated diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/ThreadItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/ThreadItemProvider.java index bac8332fd..019db152e 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/ThreadItemProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/ThreadItemProvider.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugPackage; import java.util.Collection; import java.util.List; @@ -30,7 +30,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** - * This is the item provider adapter for a {@link fr.obeo.dsl.debug.Thread} object. + * This is the item provider adapter for a {@link org.eclipse.gemoc.dsl.debug.Thread} object. * * * @generated @@ -218,7 +218,7 @@ public Object getImage(Object object) { */ @Override public String getText(Object object) { - String label = ((fr.obeo.dsl.debug.Thread)object).getName(); + String label = ((org.eclipse.gemoc.dsl.debug.Thread)object).getName(); return label == null || label.length() == 0 ? getString("_UI_Thread_type") : getString("_UI_Thread_type") + " " + label; @@ -235,7 +235,7 @@ public String getText(Object object) { public void notifyChanged(Notification notification) { updateChildren(notification); - switch (notification.getFeatureID(fr.obeo.dsl.debug.Thread.class)) { + switch (notification.getFeatureID(org.eclipse.gemoc.dsl.debug.Thread.class)) { case DebugPackage.THREAD__STATE: case DebugPackage.THREAD__NAME: case DebugPackage.THREAD__PRIORITY: diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/VariableItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/VariableItemProvider.java index 414a5c188..9ac07da05 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/VariableItemProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src-gen/org/eclipse/gemoc/dsl/debug/provider/VariableItemProvider.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.Variable; import java.util.Collection; import java.util.List; @@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; /** - * This is the item provider adapter for a {@link fr.obeo.dsl.debug.Variable} object. + * This is the item provider adapter for a {@link org.eclipse.gemoc.dsl.debug.Variable} object. * * * @generated diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugItemProviderAdapterFactory.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugItemProviderAdapterFactory.java index 8389d6c89..8bd0e3600 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugItemProviderAdapterFactory.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugItemProviderAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; import org.eclipse.emf.common.notify.Adapter; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugTargetItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugTargetItemProvider.java index 720521e2c..e3c646174 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugTargetItemProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomDebugTargetItemProvider.java @@ -8,12 +8,12 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.Contextual; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetState; -import fr.obeo.dsl.debug.DebugTargetUtils; +import org.eclipse.gemoc.dsl.debug.Contextual; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetState; +import org.eclipse.gemoc.dsl.debug.DebugTargetUtils; import java.util.ArrayList; import java.util.List; @@ -34,7 +34,7 @@ public class CustomDebugTargetItemProvider extends DebugTargetItemProvider { /** - * {@link ComposedAdapterFactory} to get {@link fr.obeo.dsl.debug.Contextual#getContext() context} image + * {@link ComposedAdapterFactory} to get {@link org.eclipse.gemoc.dsl.debug.Contextual#getContext() context} image * and text. */ private final ComposedAdapterFactory efactory; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomStackFrameItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomStackFrameItemProvider.java index b285af689..f439f95cf 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomStackFrameItemProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomStackFrameItemProvider.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.Contextual; -import fr.obeo.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.Contextual; +import org.eclipse.gemoc.dsl.debug.StackFrame; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.ecore.EObject; @@ -28,7 +28,7 @@ public class CustomStackFrameItemProvider extends StackFrameItemProvider { /** - * {@link ComposedAdapterFactory} to get {@link fr.obeo.dsl.debug.Contextual#getContext() context} image + * {@link ComposedAdapterFactory} to get {@link org.eclipse.gemoc.dsl.debug.Contextual#getContext() context} image * and text. */ private final ComposedAdapterFactory efactory; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomThreadItemProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomThreadItemProvider.java index 1d223dc7e..3b120835f 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomThreadItemProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.edit/src/org/eclipse/gemoc/dsl/debug/provider/CustomThreadItemProvider.java @@ -8,12 +8,12 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.provider; +package org.eclipse.gemoc.dsl.debug.provider; -import fr.obeo.dsl.debug.Contextual; -import fr.obeo.dsl.debug.State; -import fr.obeo.dsl.debug.Thread; -import fr.obeo.dsl.debug.ThreadUtils; +import org.eclipse.gemoc.dsl.debug.Contextual; +import org.eclipse.gemoc.dsl.debug.State; +import org.eclipse.gemoc.dsl.debug.Thread; +import org.eclipse.gemoc.dsl.debug.ThreadUtils; import java.util.ArrayList; import java.util.List; @@ -34,7 +34,7 @@ public class CustomThreadItemProvider extends ThreadItemProvider { /** - * {@link ComposedAdapterFactory} to get {@link fr.obeo.dsl.debug.Contextual#getContext() context} image + * {@link ComposedAdapterFactory} to get {@link org.eclipse.gemoc.dsl.debug.Contextual#getContext() context} image * and text. */ private final ComposedAdapterFactory efactory; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.project b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.project index b75a4a206..0ce8a2dfc 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.project +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.ide.sirius.ui + org.eclipse.gemoc.dsl.debug.ide.sirius.ui diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF index 04774b775..d8f8af437 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF @@ -1,18 +1,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.obeo.dsl.debug.ide.sirius.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.dsl.debug.ide.sirius.ui;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %providerName Require-Bundle: org.eclipse.debug.ui;bundle-version="3.7.0", org.eclipse.ui;bundle-version="3.7.0", org.eclipse.emf.edit.ui;bundle-version="2.7.0", - fr.obeo.dsl.debug.edit;bundle-version="1.0.0", - fr.obeo.dsl.debug.ide;bundle-version="1.0.0", + org.eclipse.gemoc.dsl.debug.edit;bundle-version="1.0.0", + org.eclipse.gemoc.dsl.debug.ide;bundle-version="1.0.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.ui.ide;bundle-version="3.7.0", - fr.obeo.dsl.debug.ide.ui;bundle-version="1.0.0", + org.eclipse.gemoc.dsl.debug.ide.ui;bundle-version="1.0.0", org.eclipse.sirius;bundle-version="4.1.1", org.eclipse.sirius.ui;bundle-version="4.0.0", org.eclipse.sirius.diagram;bundle-version="4.0.0", @@ -22,8 +22,8 @@ Require-Bundle: org.eclipse.debug.ui;bundle-version="3.7.0", org.eclipse.equinox.registry, fr.inria.diverse.trace.commons.model Bundle-ActivationPolicy: lazy -Bundle-Activator: fr.obeo.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin$Implementation -Export-Package: fr.obeo.dsl.debug.ide.sirius.ui, - fr.obeo.dsl.debug.ide.sirius.ui.action, - fr.obeo.dsl.debug.ide.sirius.ui.launch, - fr.obeo.dsl.debug.ide.sirius.ui.services +Bundle-Activator: org.eclipse.gemoc.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin$Implementation +Export-Package: org.eclipse.gemoc.dsl.debug.ide.sirius.ui, + org.eclipse.gemoc.dsl.debug.ide.sirius.ui.action, + org.eclipse.gemoc.dsl.debug.ide.sirius.ui.launch, + org.eclipse.gemoc.dsl.debug.ide.sirius.ui.services diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/pom.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/pom.xml index 59cd6580d..71db6f2ad 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/pom.xml +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/pom.xml @@ -13,13 +13,13 @@ Contributors: xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent DSLDebugger 2.3.0-SNAPSHOT ../../ DSLDebugger - fr.obeo.dsl.debug.ide.sirius.ui + org.eclipse.gemoc.dsl.debug.ide.sirius.ui 2.3.0-SNAPSHOT eclipse-plugin diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLDebugModelPresentation.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLDebugModelPresentation.java index 9d0793fed..6a658e40e 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLDebugModelPresentation.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLDebugModelPresentation.java @@ -8,12 +8,12 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.sirius.ui; +package org.eclipse.gemoc.dsl.debug.ide.sirius.ui; -import fr.obeo.dsl.debug.ide.DSLBreakpoint; -import fr.obeo.dsl.debug.ide.adapter.DSLDebugTargetAdapter; -import fr.obeo.dsl.debug.ide.adapter.DSLStackFrameAdapter; -import fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; +import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLDebugTargetAdapter; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLStackFrameAdapter; +import org.eclipse.gemoc.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; import java.util.List; @@ -37,7 +37,7 @@ * * @author Yvan Lussaud */ -public class DSLDebugModelPresentation extends fr.obeo.dsl.debug.ide.ui.DSLDebugModelPresentation { +public class DSLDebugModelPresentation extends org.eclipse.gemoc.dsl.debug.ide.ui.DSLDebugModelPresentation { // FIXME this code is ugly but should work... the right way to do this is to add // DialectUIManager.getEditorInput(...) and DialectUIManager.getEditorID(...) diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLToggleBreakpointsUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLToggleBreakpointsUtils.java index d950ba231..2a7dcfbcf 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLToggleBreakpointsUtils.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DSLToggleBreakpointsUtils.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.sirius.ui; +package org.eclipse.gemoc.dsl.debug.ide.sirius.ui; -import fr.obeo.dsl.debug.ide.DSLBreakpoint; +import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; @@ -29,12 +29,12 @@ * * @author Yvan Lussaud */ -public class DSLToggleBreakpointsUtils extends fr.obeo.dsl.debug.ide.ui.DSLToggleBreakpointsUtils { +public class DSLToggleBreakpointsUtils extends org.eclipse.gemoc.dsl.debug.ide.ui.DSLToggleBreakpointsUtils { /** * The annotation ID for debug {@link DRepresentation}. */ - public static final String ANNOTATION_ID = "fr.obeo.dsl.debug.ide.sirius.ui.breakpointAnnotation"; + public static final String ANNOTATION_ID = "org.eclipse.gemoc.dsl.debug.ide.sirius.ui.breakpointAnnotation"; /** * Constructor. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java index d74c15648..4895ccf64 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/DebugSiriusIdeUiPlugin.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.sirius.ui; +package org.eclipse.gemoc.dsl.debug.ide.sirius.ui; import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; @@ -24,7 +24,7 @@ public final class DebugSiriusIdeUiPlugin extends EMFPlugin { /** * The plug-in identifier. */ - public static final String ID = "fr.obeo.dsl.debug.ide.sirius.ui"; + public static final String ID = "org.eclipse.gemoc.dsl.debug.ide.sirius.ui"; /** * Keep track of the singleton. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java index ce6d9f80c..dfb43e286 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/SiriusEditorUtils.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.sirius.ui; +package org.eclipse.gemoc.dsl.debug.ide.sirius.ui; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractDebugAsAction.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractDebugAsAction.java index 7bd7ca08a..dde5744a3 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractDebugAsAction.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractDebugAsAction.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.sirius.ui.action; +package org.eclipse.gemoc.dsl.debug.ide.sirius.ui.action; -import fr.obeo.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin; -import fr.obeo.dsl.debug.ide.ui.launch.AbstractDSLLaunchConfigurationDelegateUI; +import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin; +import org.eclipse.gemoc.dsl.debug.ide.ui.launch.AbstractDSLLaunchConfigurationDelegateUI; import java.util.Collection; import java.util.HashSet; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractToggleBreakpointAction.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractToggleBreakpointAction.java index 5942eb8ea..c88b11ecc 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractToggleBreakpointAction.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/action/AbstractToggleBreakpointAction.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.sirius.ui.action; +package org.eclipse.gemoc.dsl.debug.ide.sirius.ui.action; -import fr.obeo.dsl.debug.ide.sirius.ui.DSLToggleBreakpointsUtils; -import fr.obeo.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin; +import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.DSLToggleBreakpointsUtils; +import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin; import java.util.Collection; import java.util.Map; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java index d42699398..def5c52b7 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.sirius.ui.launch; +package org.eclipse.gemoc.dsl.debug.ide.sirius.ui.launch; -import fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; -import fr.obeo.dsl.debug.ide.sirius.ui.services.AbstractDSLDebuggerServices; -import fr.obeo.dsl.debug.ide.ui.launch.DSLLaunchConfigurationTab; +import org.eclipse.gemoc.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; +import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.services.AbstractDSLDebuggerServices; +import org.eclipse.gemoc.dsl.debug.ide.ui.launch.DSLLaunchConfigurationTab; import java.util.Arrays; import java.util.List; @@ -31,13 +31,13 @@ import org.eclipse.ui.PlatformUI; /** - * A Sirius implementation of {@link fr.obeo.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate + * A Sirius implementation of {@link org.eclipse.gemoc.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate * AbstractDSLLaunchConfigurationDelegate} with {@link org.eclipse.debug.ui.ILaunchShortcut ILaunchShortcut} * support. * * @author Yvan Lussaud */ -public abstract class AbstractDSLLaunchConfigurationDelegateUI extends fr.obeo.dsl.debug.ide.ui.launch.AbstractDSLLaunchConfigurationDelegateUI { +public abstract class AbstractDSLLaunchConfigurationDelegateUI extends org.eclipse.gemoc.dsl.debug.ide.ui.launch.AbstractDSLLaunchConfigurationDelegateUI { /** * The Sirius {@link org.eclipse.emf.ecore.resource.Resource Resource} diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java index cbce55ad3..fcdff2a8b 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.sirius.ui.launch; +package org.eclipse.gemoc.dsl.debug.ide.sirius.ui.launch; -import fr.obeo.dsl.debug.ide.Activator; -import fr.obeo.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate; -import fr.obeo.dsl.debug.ide.ui.launch.FilteredFileContentProvider; +import org.eclipse.gemoc.dsl.debug.ide.Activator; +import org.eclipse.gemoc.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate; +import org.eclipse.gemoc.dsl.debug.ide.ui.launch.FilteredFileContentProvider; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; @@ -42,12 +42,12 @@ import org.eclipse.ui.model.WorkbenchLabelProvider; /** - * A Sirius implementation of {@link fr.obeo.dsl.debug.ide.ui.launch.DSLLaunchConfigurationTab + * A Sirius implementation of {@link org.eclipse.gemoc.dsl.debug.ide.ui.launch.DSLLaunchConfigurationTab * DSLLaunchConfigurationTab}. * * @author Yvan Lussaud */ -public class DSLLaunchConfigurationTab extends fr.obeo.dsl.debug.ide.ui.launch.DSLLaunchConfigurationTab { +public class DSLLaunchConfigurationTab extends org.eclipse.gemoc.dsl.debug.ide.ui.launch.DSLLaunchConfigurationTab { /** * The {@link Text} used for the {@link AbstractDSLLaunchConfigurationDelegateUI#SIRIUS_RESOURCE_URI}. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java index 32a5be762..418323efe 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java @@ -8,15 +8,15 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.sirius.ui.services; +package org.eclipse.gemoc.dsl.debug.ide.sirius.ui.services; import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; import fr.inria.diverse.trace.commons.model.trace.ParallelStep; import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.ide.DSLBreakpoint; -import fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; -import fr.obeo.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; +import org.eclipse.gemoc.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; +import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin; import java.util.ArrayList; import java.util.HashMap; @@ -436,8 +436,8 @@ public void addRepresentationToRefresh(String debugModelID, String representatio /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#currentInstructionChanged(String, - * fr.obeo.dsl.debug.StackFrame)) + * @see org.eclipse.gemoc.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#currentInstructionChanged(String, + * org.eclipse.gemoc.dsl.debug.StackFrame)) */ public void currentInstructionChanged(String debugModelID, StackFrame frame) { EObject currentInstruction = frame.getCurrentInstruction(); @@ -488,8 +488,8 @@ private void addMseOccurenceAndCallerToInstructionsURIs(Set instructionURIs /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#terminated(java.lang.String, - * fr.obeo.dsl.debug.StackFrame) + * @see org.eclipse.gemoc.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#terminated(java.lang.String, + * org.eclipse.gemoc.dsl.debug.StackFrame) */ public void terminated(String debugModelID, StackFrame frame) { final Set lastInstructions = CURRENT_INSTRUCTIONS_PER_FRAME.remove(frame); @@ -510,8 +510,8 @@ public StackFrame getCurrentFrame() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#setCurrentFrame(java.lang.String, - * fr.obeo.dsl.debug.StackFrame) + * @see org.eclipse.gemoc.dsl.debug.ide.adapter.IDSLCurrentInstructionListener#setCurrentFrame(java.lang.String, + * org.eclipse.gemoc.dsl.debug.StackFrame) */ public void setCurrentFrame(String debugModelID, StackFrame frame) { if (currentFrame != frame) { diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.project b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.project index ed9b0b40e..10dd90520 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.project +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.ide.ui + org.eclipse.gemoc.dsl.debug.ide.ui diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/META-INF/MANIFEST.MF index 46265329a..3b898d7bf 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/META-INF/MANIFEST.MF @@ -1,21 +1,21 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.obeo.dsl.debug.ide.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.dsl.debug.ide.ui;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.debug.ui;bundle-version="3.7.0", org.eclipse.ui;bundle-version="3.7.0", org.eclipse.emf.edit.ui;bundle-version="2.7.0", - fr.obeo.dsl.debug.edit;bundle-version="1.0.0", - fr.obeo.dsl.debug.ide;bundle-version="1.0.0", + org.eclipse.gemoc.dsl.debug.edit;bundle-version="1.0.0", + org.eclipse.gemoc.dsl.debug.ide;bundle-version="1.0.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.ui.ide;bundle-version="3.7.0", org.eclipse.emf.ecore.editor;bundle-version="2.7.0" -Export-Package: fr.obeo.dsl.debug.ide.ui, - fr.obeo.dsl.debug.ide.ui.handler, - fr.obeo.dsl.debug.ide.ui.launch, - fr.obeo.dsl.debug.ide.ui.provider +Export-Package: org.eclipse.gemoc.dsl.debug.ide.ui, + org.eclipse.gemoc.dsl.debug.ide.ui.handler, + org.eclipse.gemoc.dsl.debug.ide.ui.launch, + org.eclipse.gemoc.dsl.debug.ide.ui.provider Bundle-ActivationPolicy: lazy -Bundle-Activator: fr.obeo.dsl.debug.ide.ui.DebugIdeUiPlugin$Implementation +Bundle-Activator: org.eclipse.gemoc.dsl.debug.ide.ui.DebugIdeUiPlugin$Implementation diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/plugin.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/plugin.xml index ec34926b9..38043deb8 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/plugin.xml +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/plugin.xml @@ -5,8 +5,8 @@ point="org.eclipse.ui.ide.markerImageProviders"> + id="org.eclipse.gemoc.dsl.debug.ide.ui.breakpointImageProvider" + markertype="org.eclipse.gemoc.dsl.debug.ide.breakpointMarker"> diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/pom.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/pom.xml index 181d21eb9..d760c95e4 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/pom.xml +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/pom.xml @@ -13,13 +13,13 @@ Contributors: xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent DSLDebugger 2.3.0-SNAPSHOT ../../ DSLDebugger - fr.obeo.dsl.debug.ide.ui + org.eclipse.gemoc.dsl.debug.ide.ui 2.3.0-SNAPSHOT eclipse-plugin diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLDebugModelPresentation.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLDebugModelPresentation.java index 8031e087d..790426914 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLDebugModelPresentation.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLDebugModelPresentation.java @@ -8,14 +8,14 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui; +package org.eclipse.gemoc.dsl.debug.ide.ui; -import fr.obeo.dsl.debug.Variable; -import fr.obeo.dsl.debug.ide.DSLBreakpoint; -import fr.obeo.dsl.debug.ide.adapter.DSLStackFrameAdapter; -import fr.obeo.dsl.debug.ide.adapter.value.DSLObjectValue; -import fr.obeo.dsl.debug.ide.adapter.variable.DSLObjectVariable; -import fr.obeo.dsl.debug.provider.CustomDebugItemProviderAdapterFactory; +import org.eclipse.gemoc.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLStackFrameAdapter; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLObjectValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.variable.DSLObjectVariable; +import org.eclipse.gemoc.dsl.debug.provider.CustomDebugItemProviderAdapterFactory; import java.util.HashMap; import java.util.Map; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLToggleBreakpointsUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLToggleBreakpointsUtils.java index 8717d30af..f4a300e47 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLToggleBreakpointsUtils.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DSLToggleBreakpointsUtils.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui; +package org.eclipse.gemoc.dsl.debug.ide.ui; -import fr.obeo.dsl.debug.ide.DSLBreakpoint; +import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; import java.util.Iterator; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DebugIdeUiPlugin.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DebugIdeUiPlugin.java index 6be28a2ca..729138cef 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DebugIdeUiPlugin.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/DebugIdeUiPlugin.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui; +package org.eclipse.gemoc.dsl.debug.ide.ui; import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; @@ -23,7 +23,7 @@ public final class DebugIdeUiPlugin extends EMFPlugin { /** * The plug-in identifier. */ - public static final String ID = "fr.obeo.dsl.debug.ide.ui"; + public static final String ID = "org.eclipse.gemoc.dsl.debug.ide.ui"; /** * Keep track of the singleton. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/EMFEditorUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/EMFEditorUtils.java index a167407c1..9737c8945 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/EMFEditorUtils.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/EMFEditorUtils.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui; +package org.eclipse.gemoc.dsl.debug.ide.ui; -import fr.obeo.dsl.debug.ide.DSLBreakpoint; +import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; import java.util.ArrayList; import java.util.List; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/handler/AbstractToggleBreakpointHandler.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/handler/AbstractToggleBreakpointHandler.java index 55ea7595c..b4f64aaa8 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/handler/AbstractToggleBreakpointHandler.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/handler/AbstractToggleBreakpointHandler.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui.handler; +package org.eclipse.gemoc.dsl.debug.ide.ui.handler; -import fr.obeo.dsl.debug.ide.ui.DSLToggleBreakpointsUtils; +import org.eclipse.gemoc.dsl.debug.ide.ui.DSLToggleBreakpointsUtils; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -20,7 +20,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** - * Toggles a {@link fr.obeo.dsl.debug.ide.DSLBreakpoint DSLBreakpoint}. + * Toggles a {@link org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint DSLBreakpoint}. * * @author Yvan Lussaud */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java index 7fffe3e56..9ec5d0413 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui.launch; +package org.eclipse.gemoc.dsl.debug.ide.ui.launch; -import fr.obeo.dsl.debug.ide.Activator; -import fr.obeo.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate; +import org.eclipse.gemoc.dsl.debug.ide.Activator; +import org.eclipse.gemoc.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate; import java.util.ArrayList; import java.util.List; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/DSLLaunchConfigurationTab.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/DSLLaunchConfigurationTab.java index c70cb8ed6..a527e35d3 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/DSLLaunchConfigurationTab.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/DSLLaunchConfigurationTab.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui.launch; +package org.eclipse.gemoc.dsl.debug.ide.ui.launch; -import fr.obeo.dsl.debug.ide.Activator; -import fr.obeo.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate; +import org.eclipse.gemoc.dsl.debug.ide.Activator; +import org.eclipse.gemoc.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/FilteredFileContentProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/FilteredFileContentProvider.java index aa1bd6575..5dd6703d4 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/FilteredFileContentProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/launch/FilteredFileContentProvider.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui.launch; +package org.eclipse.gemoc.dsl.debug.ide.ui.launch; import java.util.ArrayList; import java.util.Arrays; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DSLLabelDecorator.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DSLLabelDecorator.java index ea3d3f7cb..f3773f3e2 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DSLLabelDecorator.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DSLLabelDecorator.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui.provider; +package org.eclipse.gemoc.dsl.debug.ide.ui.provider; -import fr.obeo.dsl.debug.ide.DSLBreakpoint; -import fr.obeo.dsl.debug.ide.ui.DebugIdeUiPlugin; +import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; +import org.eclipse.gemoc.dsl.debug.ide.ui.DebugIdeUiPlugin; import java.util.HashMap; import java.util.HashSet; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DecoratingColumLabelProvider.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DecoratingColumLabelProvider.java index 3df6ef864..14d3d3836 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DecoratingColumLabelProvider.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/DecoratingColumLabelProvider.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui.provider; +package org.eclipse.gemoc.dsl.debug.ide.ui.provider; import org.eclipse.jface.viewers.CellLabelProvider; import org.eclipse.jface.viewers.ColumnLabelProvider; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/OverlayImageDescriptor.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/OverlayImageDescriptor.java index 9071d1ffe..ca9c4de14 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/OverlayImageDescriptor.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.ui/src/org/eclipse/gemoc/dsl/debug/ide/ui/provider/OverlayImageDescriptor.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.ui.provider; +package org.eclipse.gemoc.dsl.debug.ide.ui.provider; import org.eclipse.jface.resource.CompositeImageDescriptor; import org.eclipse.swt.graphics.Image; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.project b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.project index 94e4d33d5..c8f90293f 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.project +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.ide + org.eclipse.gemoc.dsl.debug.ide diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/META-INF/MANIFEST.MF index 6f323fcc0..0ae3a3f7b 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/META-INF/MANIFEST.MF @@ -1,23 +1,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.obeo.dsl.debug.ide;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.dsl.debug.ide;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.debug.core;bundle-version="3.7.0", - fr.obeo.dsl.debug;bundle-version="1.0.0", + org.eclipse.gemoc.dsl.debug;bundle-version="1.0.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.emf.edit;bundle-version="2.7.0", - fr.obeo.dsl.debug.edit;bundle-version="1.0.0", + org.eclipse.gemoc.dsl.debug.edit;bundle-version="1.0.0", org.eclipse.emf.transaction;bundle-version="1.4.0" -Export-Package: fr.obeo.dsl.debug.ide, - fr.obeo.dsl.debug.ide.adapter, - fr.obeo.dsl.debug.ide.adapter.value, - fr.obeo.dsl.debug.ide.adapter.variable, - fr.obeo.dsl.debug.ide.event, - fr.obeo.dsl.debug.ide.event.debugger, - fr.obeo.dsl.debug.ide.event.model, - fr.obeo.dsl.debug.ide.launch -Bundle-Activator: fr.obeo.dsl.debug.ide.Activator +Export-Package: org.eclipse.gemoc.dsl.debug.ide, + org.eclipse.gemoc.dsl.debug.ide.adapter, + org.eclipse.gemoc.dsl.debug.ide.adapter.value, + org.eclipse.gemoc.dsl.debug.ide.adapter.variable, + org.eclipse.gemoc.dsl.debug.ide.event, + org.eclipse.gemoc.dsl.debug.ide.event.debugger, + org.eclipse.gemoc.dsl.debug.ide.event.model, + org.eclipse.gemoc.dsl.debug.ide.launch +Bundle-Activator: org.eclipse.gemoc.dsl.debug.ide.Activator diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/plugin.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/plugin.xml index ad5edf08d..afaf343fc 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/plugin.xml +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/plugin.xml @@ -1,12 +1,12 @@ - + @@ -32,9 +32,9 @@ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/pom.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/pom.xml index df3694c09..2bbb68cf4 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/pom.xml +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/pom.xml @@ -13,13 +13,13 @@ Contributors: xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent DSLDebugger 2.3.0-SNAPSHOT ../../ DSLDebugger - fr.obeo.dsl.debug.ide + org.eclipse.gemoc.dsl.debug.ide 2.3.0-SNAPSHOT eclipse-plugin diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/AbstractDSLDebugger.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/AbstractDSLDebugger.java index 5d182aba2..1746355c5 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/AbstractDSLDebugger.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/AbstractDSLDebugger.java @@ -8,40 +8,40 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide; - -import fr.obeo.dsl.debug.ide.event.IDSLDebugEvent; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor; -import fr.obeo.dsl.debug.ide.event.debugger.BreakpointReply; -import fr.obeo.dsl.debug.ide.event.debugger.DeleteVariableReply; -import fr.obeo.dsl.debug.ide.event.debugger.PopStackFrameReply; -import fr.obeo.dsl.debug.ide.event.debugger.PushStackFrameReply; -import fr.obeo.dsl.debug.ide.event.debugger.ResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.SetCurrentInstructionReply; -import fr.obeo.dsl.debug.ide.event.debugger.SetVariableValueReply; -import fr.obeo.dsl.debug.ide.event.debugger.SpawnRunningThreadReply; -import fr.obeo.dsl.debug.ide.event.debugger.StepIntoResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.StepOverResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.StepReturnResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.SteppedReply; -import fr.obeo.dsl.debug.ide.event.debugger.SuspendedReply; -import fr.obeo.dsl.debug.ide.event.debugger.TerminatedReply; -import fr.obeo.dsl.debug.ide.event.debugger.VariableReply; -import fr.obeo.dsl.debug.ide.event.model.AbstractBreakpointRequest; -import fr.obeo.dsl.debug.ide.event.model.AbstractStepRequest; -import fr.obeo.dsl.debug.ide.event.model.AddBreakpointRequest; -import fr.obeo.dsl.debug.ide.event.model.ChangeBreakPointRequest; -import fr.obeo.dsl.debug.ide.event.model.DisconnectRequest; -import fr.obeo.dsl.debug.ide.event.model.RemoveBreakpointRequest; -import fr.obeo.dsl.debug.ide.event.model.ResumeRequest; -import fr.obeo.dsl.debug.ide.event.model.SetVariableValueRequest; -import fr.obeo.dsl.debug.ide.event.model.StartRequest; -import fr.obeo.dsl.debug.ide.event.model.StepIntoRequest; -import fr.obeo.dsl.debug.ide.event.model.StepOverRequest; -import fr.obeo.dsl.debug.ide.event.model.StepReturnRequest; -import fr.obeo.dsl.debug.ide.event.model.SuspendRequest; -import fr.obeo.dsl.debug.ide.event.model.TerminateRequest; -import fr.obeo.dsl.debug.ide.event.model.ValidateVariableValueRequest; +package org.eclipse.gemoc.dsl.debug.ide; + +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.BreakpointReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.DeleteVariableReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.PopStackFrameReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.PushStackFrameReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.ResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SetCurrentInstructionReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SetVariableValueReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SpawnRunningThreadReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.StepIntoResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.StepOverResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.StepReturnResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SteppedReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SuspendedReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.TerminatedReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.VariableReply; +import org.eclipse.gemoc.dsl.debug.ide.event.model.AbstractBreakpointRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.AbstractStepRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.AddBreakpointRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.ChangeBreakPointRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.DisconnectRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.RemoveBreakpointRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.ResumeRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.SetVariableValueRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StartRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StepIntoRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StepOverRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StepReturnRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.SuspendRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.TerminateRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.ValidateVariableValueRequest; import java.io.Serializable; import java.util.HashMap; @@ -61,8 +61,8 @@ public abstract class AbstractDSLDebugger implements IDSLDebugger { /** - * The {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous - * communication or the {@link fr.obeo.dsl.debug.ide.DSLDebugTargetAdapter target} for synchronous + * The {@link org.eclipse.gemoc.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous + * communication or the {@link org.eclipse.gemoc.dsl.debug.ide.DSLDebugTargetAdapter target} for synchronous * communication. */ protected final IDSLDebugEventProcessor target; @@ -91,8 +91,8 @@ public abstract class AbstractDSLDebugger implements IDSLDebugger { * Constructor. * * @param target - * the {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous - * communication or the {@link fr.obeo.dsl.debug.ide.DSLDebugTargetAdapter target} for + * the {@link org.eclipse.gemoc.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous + * communication or the {@link org.eclipse.gemoc.dsl.debug.ide.DSLDebugTargetAdapter target} for * synchronous communication */ public AbstractDSLDebugger(IDSLDebugEventProcessor target) { @@ -102,7 +102,7 @@ public AbstractDSLDebugger(IDSLDebugEventProcessor target) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent) + * @see org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent) */ public Object handleEvent(IDSLDebugEvent event) { Object res = null; @@ -243,7 +243,7 @@ private void handleStepRequest(AbstractStepRequest stepRequest) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#stepped(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepped(java.lang.String) */ public void stepped(final String threadName) { target.handleEvent(new SteppedReply(threadName)); @@ -252,7 +252,7 @@ public void stepped(final String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#suspended(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#suspended(java.lang.String) */ public void suspended(String threadName) { target.handleEvent(new SuspendedReply(threadName)); @@ -261,7 +261,7 @@ public void suspended(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#breaked(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#breaked(java.lang.String) */ public void breaked(String threadName) { target.handleEvent(new BreakpointReply(threadName)); @@ -270,7 +270,7 @@ public void breaked(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#resuming(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#resuming(java.lang.String) */ public void resuming(String threadName) { target.handleEvent(new ResumingReply(threadName)); @@ -279,7 +279,7 @@ public void resuming(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#steppingInto(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#steppingInto(java.lang.String) */ public void steppingInto(String threadName) { target.handleEvent(new StepIntoResumingReply(threadName)); @@ -288,7 +288,7 @@ public void steppingInto(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#steppingOver(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#steppingOver(java.lang.String) */ public void steppingOver(String threadName) { target.handleEvent(new StepOverResumingReply(threadName)); @@ -297,7 +297,7 @@ public void steppingOver(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#steppingReturn(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#steppingReturn(java.lang.String) */ public void steppingReturn(String threadName) { target.handleEvent(new StepReturnResumingReply(threadName)); @@ -306,7 +306,7 @@ public void steppingReturn(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#terminated() + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#terminated() */ public void terminated() { target.handleEvent(new TerminatedReply()); @@ -315,7 +315,7 @@ public void terminated() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#spawnRunningThread(java.lang.String, + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#spawnRunningThread(java.lang.String, * org.eclipse.emf.ecore.EObject) */ public void spawnRunningThread(String threadName, EObject context) { @@ -340,7 +340,7 @@ protected ThreadController createThreadHandler(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#setTerminated(boolean) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#setTerminated(boolean) */ public void setTerminated(boolean terminated) { this.terminated = terminated; @@ -349,7 +349,7 @@ public void setTerminated(boolean terminated) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#isTerminated() + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#isTerminated() */ public boolean isTerminated() { return terminated; @@ -358,8 +358,8 @@ public boolean isTerminated() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#getNextInstruction(java.lang.String, - * org.eclipse.emf.ecore.EObject, fr.obeo.dsl.debug.ide.IDSLDebugger.Stepping) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#getNextInstruction(java.lang.String, + * org.eclipse.emf.ecore.EObject, org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger.Stepping) */ public EObject getNextInstruction(String threadName, EObject currentInstruction, Stepping stepping) { return null; @@ -368,7 +368,7 @@ public EObject getNextInstruction(String threadName, EObject currentInstruction, /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#shouldBreak(org.eclipse.emf.ecore.EObject) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#shouldBreak(org.eclipse.emf.ecore.EObject) */ public boolean shouldBreak(EObject instruction) { final boolean res; @@ -403,7 +403,7 @@ protected Serializable getBreakpointAttributes(EObject instruction, String attri /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#addBreakPoint(org.eclipse.emf.common.util.URI) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#addBreakPoint(org.eclipse.emf.common.util.URI) */ public void addBreakPoint(URI instruction) { breakpoints.put(instruction, new HashMap()); @@ -412,7 +412,7 @@ public void addBreakPoint(URI instruction) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#removeBreakPoint(org.eclipse.emf.common.util.URI) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#removeBreakPoint(org.eclipse.emf.common.util.URI) */ public void removeBreakPoint(URI instruction) { breakpoints.remove(instruction); @@ -421,7 +421,7 @@ public void removeBreakPoint(URI instruction) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#changeBreakPoint(org.eclipse.emf.common.util.URI, + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#changeBreakPoint(org.eclipse.emf.common.util.URI, * java.lang.String, java.io.Serializable) */ public void changeBreakPoint(URI instruction, String attribute, Serializable value) { @@ -432,7 +432,7 @@ public void changeBreakPoint(URI instruction, String attribute, Serializable val /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#control(java.lang.String, org.eclipse.emf.ecore.EObject) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#control(java.lang.String, org.eclipse.emf.ecore.EObject) */ public boolean control(String threadName, EObject instruction) { final boolean res; @@ -447,7 +447,7 @@ public boolean control(String threadName, EObject instruction) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#resume(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#resume(java.lang.String) */ public void resume(String threadName) { controllers.get(threadName).resume(); @@ -456,7 +456,7 @@ public void resume(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#stepInto(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepInto(java.lang.String) */ public void stepInto(String threadName) { controllers.get(threadName).stepInto(); @@ -465,7 +465,7 @@ public void stepInto(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#stepOver(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepOver(java.lang.String) */ public void stepOver(String threadName) { controllers.get(threadName).stepOver(); @@ -474,7 +474,7 @@ public void stepOver(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#stepReturn(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepReturn(java.lang.String) */ public void stepReturn(String threadName) { controllers.get(threadName).stepReturn(); @@ -483,7 +483,7 @@ public void stepReturn(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#suspend(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#suspend(java.lang.String) */ public void suspend(String threadName) { controllers.get(threadName).suspend(); @@ -492,7 +492,7 @@ public void suspend(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#terminate() + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#terminate() */ public void terminate() { setTerminated(true); @@ -507,7 +507,7 @@ public void terminate() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#terminate(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#terminate(java.lang.String) */ public void terminate(String threadName) { controllers.get(threadName).terminate(); @@ -516,7 +516,7 @@ public void terminate(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#suspend() + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#suspend() */ public void suspend() { for (ThreadController controler : controllers.values()) { @@ -527,7 +527,7 @@ public void suspend() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#resume() + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#resume() */ public void resume() { for (ThreadController controler : controllers.values()) { @@ -538,7 +538,7 @@ public void resume() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#variable(java.lang.String, java.lang.String, java.lang.String, + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#variable(java.lang.String, java.lang.String, java.lang.String, * java.lang.Object, boolean) */ public void variable(String threadName, String stackName, String declarationTypeName, @@ -550,7 +550,7 @@ public void variable(String threadName, String stackName, String declarationType /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#deleteVariable(java.lang.String, java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#deleteVariable(java.lang.String, java.lang.String) */ public void deleteVariable(String threadName, String name) { target.handleEvent(new DeleteVariableReply(threadName, name)); @@ -559,7 +559,7 @@ public void deleteVariable(String threadName, String name) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#pushStackFrame(java.lang.String, java.lang.String, + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#pushStackFrame(java.lang.String, java.lang.String, * org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject) */ public void pushStackFrame(String threadName, String frameName, EObject context, EObject instruction) { @@ -571,7 +571,7 @@ public void pushStackFrame(String threadName, String frameName, EObject context, /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#popStackFrame(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#popStackFrame(java.lang.String) */ public void popStackFrame(String threadName) { target.handleEvent(new PopStackFrameReply(threadName)); @@ -580,7 +580,7 @@ public void popStackFrame(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#setCurrentInstruction(java.lang.String, + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#setCurrentInstruction(java.lang.String, * org.eclipse.emf.ecore.EObject) */ public void setCurrentInstruction(String threadName, EObject instruction) { @@ -592,7 +592,7 @@ public void setCurrentInstruction(String threadName, EObject instruction) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#terminated(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#terminated(java.lang.String) */ public void terminated(String threadName) { target.handleEvent(new TerminatedReply(threadName)); @@ -606,7 +606,7 @@ public void terminated(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IDSLDebugger#isTerminated(java.lang.String) + * @see org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#isTerminated(java.lang.String) */ public boolean isTerminated(String threadName) { return !controllers.containsKey(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/Activator.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/Activator.java index f10f106be..5d5581658 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/Activator.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/Activator.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide; +package org.eclipse.gemoc.dsl.debug.ide; -import fr.obeo.dsl.debug.ide.adapter.ILocator; +import org.eclipse.gemoc.dsl.debug.ide.adapter.ILocator; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -37,7 +37,7 @@ public class Activator extends Plugin { /** * The plug-in ID. */ - public static final String PLUGIN_ID = "fr.obeo.dsl.debug.ide"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.dsl.debug.ide"; //$NON-NLS-1$ /** * The shared instance. @@ -63,7 +63,7 @@ public Activator() { public List retrieveLocators() { if (locators == null) { IExtensionRegistry reg = Platform.getExtensionRegistry(); - IExtensionPoint ep = reg.getExtensionPoint("fr.obeo.dsl.debug.locator"); + IExtensionPoint ep = reg.getExtensionPoint("org.eclipse.gemoc.dsl.debug.locator"); IExtension[] extensions = ep.getExtensions(); ArrayList contributors = new ArrayList(); for (int i = 0; i < extensions.length; i++) { diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLBreakpoint.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLBreakpoint.java index 6bc70741d..32931ef77 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLBreakpoint.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLBreakpoint.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide; +package org.eclipse.gemoc.dsl.debug.ide; -import fr.obeo.dsl.debug.provider.CustomDebugItemProviderAdapterFactory; -import fr.obeo.dsl.debug.provider.DebugEditPlugin; +import org.eclipse.gemoc.dsl.debug.provider.CustomDebugItemProviderAdapterFactory; +import org.eclipse.gemoc.dsl.debug.provider.DebugEditPlugin; import java.io.IOException; import java.net.MalformedURLException; @@ -49,7 +49,7 @@ public class DSLBreakpoint extends Breakpoint { /** * The marker type ID. */ - public static final String MARKER_ID = "fr.obeo.dsl.debug.ide.breakpointMarker"; + public static final String MARKER_ID = "org.eclipse.gemoc.dsl.debug.ide.breakpointMarker"; /** * The image attribute. It's the image {@link Object} from EMF item provider. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLEclipseDebugIntegration.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLEclipseDebugIntegration.java index 30cf8a1a8..f8f0e91ff 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLEclipseDebugIntegration.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLEclipseDebugIntegration.java @@ -8,32 +8,32 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide; - -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.Thread; -import fr.obeo.dsl.debug.Variable; -import fr.obeo.dsl.debug.ide.adapter.DSLDebugTargetAdapter; -import fr.obeo.dsl.debug.ide.adapter.DSLStackFrameAdapter; -import fr.obeo.dsl.debug.ide.adapter.DSLThreadAdapter; -import fr.obeo.dsl.debug.ide.adapter.DSLVariableAdapter; -import fr.obeo.dsl.debug.ide.adapter.value.DSLArrayValue; -import fr.obeo.dsl.debug.ide.adapter.value.DSLBooleanArrayValue; -import fr.obeo.dsl.debug.ide.adapter.value.DSLByteArrayValue; -import fr.obeo.dsl.debug.ide.adapter.value.DSLCharArrayValue; -import fr.obeo.dsl.debug.ide.adapter.value.DSLDoubleArrayValue; -import fr.obeo.dsl.debug.ide.adapter.value.DSLEObjectValueAdapter; -import fr.obeo.dsl.debug.ide.adapter.value.DSLFloatArrayValue; -import fr.obeo.dsl.debug.ide.adapter.value.DSLIntArrayValue; -import fr.obeo.dsl.debug.ide.adapter.value.DSLLongArrayValue; -import fr.obeo.dsl.debug.ide.adapter.value.DSLNullValue; -import fr.obeo.dsl.debug.ide.adapter.value.DSLObjectValue; -import fr.obeo.dsl.debug.ide.adapter.value.DSLShortArrayValue; -import fr.obeo.dsl.debug.ide.adapter.variable.DSLObjectVariable; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor; -import fr.obeo.dsl.debug.provider.DebugItemProviderAdapterFactory; -import fr.obeo.dsl.debug.util.DebugAdapterFactory; +package org.eclipse.gemoc.dsl.debug.ide; + +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.Thread; +import org.eclipse.gemoc.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLDebugTargetAdapter; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLStackFrameAdapter; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLThreadAdapter; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLVariableAdapter; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLArrayValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLBooleanArrayValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLByteArrayValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLCharArrayValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLDoubleArrayValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLEObjectValueAdapter; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLFloatArrayValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLIntArrayValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLLongArrayValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLNullValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLObjectValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.value.DSLShortArrayValue; +import org.eclipse.gemoc.dsl.debug.ide.adapter.variable.DSLObjectVariable; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor; +import org.eclipse.gemoc.dsl.debug.provider.DebugItemProviderAdapterFactory; +import org.eclipse.gemoc.dsl.debug.util.DebugAdapterFactory; import java.util.Collection; import java.util.HashSet; @@ -77,8 +77,8 @@ public class DSLEclipseDebugIntegration extends DebugAdapterFactory { private final ComposedAdapterFactory genericLabelFactory; /** - * The {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous - * communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} for synchronous + * The {@link org.eclipse.gemoc.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous + * communication or the {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger debugger} for synchronous * communication. */ private final IDSLDebugEventProcessor debugger; @@ -110,8 +110,8 @@ public class DSLEclipseDebugIntegration extends DebugAdapterFactory { * @param modelUpdater * the {@link IModelUpdater} * @param debugger - * the {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for - * asynchronous communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} + * the {@link org.eclipse.gemoc.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for + * asynchronous communication or the {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger debugger} * for synchronous communication */ public DSLEclipseDebugIntegration(String identifier, ILaunch launch, DebugTarget debugTarget, @@ -183,12 +183,12 @@ public ILaunch getLaunch() { } /** - * Gets the {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous - * communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} for synchronous + * Gets the {@link org.eclipse.gemoc.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous + * communication or the {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger debugger} for synchronous * communication. * - * @return the {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous - * communication or the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} for synchronous + * @return the {@link org.eclipse.gemoc.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous + * communication or the {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger debugger} for synchronous * communication */ public IDSLDebugEventProcessor getDebugger() { diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLSourceLocator.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLSourceLocator.java index e96ec6ed4..2484bd065 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLSourceLocator.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/DSLSourceLocator.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide; +package org.eclipse.gemoc.dsl.debug.ide; -import fr.obeo.dsl.debug.ide.adapter.DSLStackFrameAdapter; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLStackFrameAdapter; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IDSLDebugger.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IDSLDebugger.java index a2646dacc..2e589eebe 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IDSLDebugger.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IDSLDebugger.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide; +package org.eclipse.gemoc.dsl.debug.ide; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor; import java.io.Serializable; @@ -238,7 +238,7 @@ enum Stepping { * Spawn a running thread in the model. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param context * the {@link EObject} representing the current context of the thread */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IModelUpdater.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IModelUpdater.java index 24fd96a73..0a8e043ed 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IModelUpdater.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/IModelUpdater.java @@ -8,12 +8,12 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide; +package org.eclipse.gemoc.dsl.debug.ide; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.Thread; -import fr.obeo.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.Thread; +import org.eclipse.gemoc.dsl.debug.Variable; import org.eclipse.emf.ecore.EObject; @@ -26,8 +26,8 @@ public interface IModelUpdater { /** * Requests the termination the given {@link DebugTarget}. The {@link DebugTarget} - * {@link DebugTarget#getfr.obeo.dsl.debug.State() fr.obeo.dsl.debug.State} must be - * {@link fr.obeo.dsl.debug.DebugTargetfr.obeo.dsl.debug.State#CONNECTED connected}. + * {@link DebugTarget#getorg.eclipse.gemoc.dsl.debug.State() org.eclipse.gemoc.dsl.debug.State} must be + * {@link org.eclipse.gemoc.dsl.debug.DebugTargetorg.eclipse.gemoc.dsl.debug.State#CONNECTED connected}. * * @param target * the {@link DebugTarget} @@ -55,10 +55,10 @@ public interface IModelUpdater { void spawnRunningThreadReply(DebugTarget target, String threadName, EObject threadContext); /** - * Notify the {@link fr.obeo.dsl.debug.DebugTargetUtils#terminateRequest(DebugTarget) termination} is done + * Notify the {@link org.eclipse.gemoc.dsl.debug.DebugTargetUtils#terminateRequest(DebugTarget) termination} is done * for the given {@link DebugTarget}. The {@link DebugTarget} - * {@link DebugTarget#getfr.obeo.dsl.debug.State() fr.obeo.dsl.debug.State} must be - * {@link fr.obeo.dsl.debug.DebugTargetfr.obeo.dsl.debug.State#TERMINATING terminating}. + * {@link DebugTarget#getorg.eclipse.gemoc.dsl.debug.State() org.eclipse.gemoc.dsl.debug.State} must be + * {@link org.eclipse.gemoc.dsl.debug.DebugTargetorg.eclipse.gemoc.dsl.debug.State#TERMINATING terminating}. * * @param target * the {@link DebugTarget} @@ -66,13 +66,13 @@ public interface IModelUpdater { void terminatedReply(DebugTarget target); /** - * Notify the deletion of the {@link fr.obeo.dsl.debug.Variable Variable} with the given - * {@link fr.obeo.dsl.debug.Variable#getName() name} in the given {@link Thread}. + * Notify the deletion of the {@link org.eclipse.gemoc.dsl.debug.Variable Variable} with the given + * {@link org.eclipse.gemoc.dsl.debug.Variable#getName() name} in the given {@link Thread}. * * @param thread * the {@link Thread} * @param name - * the {@link fr.obeo.dsl.debug.Variable#getName() variable name} + * the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name} */ void deleteVariableReply(Thread thread, String name); @@ -86,19 +86,19 @@ public interface IModelUpdater { StackFrame popStackFrameReply(Thread thread); /** - * Notify pushing a new {@link fr.obeo.dsl.debug.StackFrame StackFrame} with the given - * {@link fr.obeo.dsl.debug.StackFrame#getName() name} in the given {@link Thread}. + * Notify pushing a new {@link org.eclipse.gemoc.dsl.debug.StackFrame StackFrame} with the given + * {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() name} in the given {@link Thread}. * * @param thread * the {@link Thread} * @param name - * the {@link fr.obeo.dsl.debug.StackFrame#getName() stack frame name} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack frame name} * @param context - * the {@link fr.obeo.dsl.debug.StackFrame#getContext() context} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getContext() context} * @param instruction - * the {@link fr.obeo.dsl.debug.StackFrame#getCurrentInstruction() current instruction} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getCurrentInstruction() current instruction} * @param canStepInto - * tells if we can {@link fr.obeo.dsl.debug.StackFrame#isCanStepIntoCurrentInstruction() step + * tells if we can {@link org.eclipse.gemoc.dsl.debug.StackFrame#isCanStepIntoCurrentInstruction() step * into} the current instruction * @return the pushed {@link StackFrame} */ @@ -107,8 +107,8 @@ StackFrame pushStackFrameReply(Thread thread, String name, EObject context, EObj /** * Request to step into the given {@link Thread}. The {@link Thread} - * {@link Thread#getfr.obeo.dsl.debug.State() fr.obeo.dsl.debug.State} must be - * {@link fr.obeo.dsl.debug.State#SUSPENDED suspended}. + * {@link Thread#getorg.eclipse.gemoc.dsl.debug.State() org.eclipse.gemoc.dsl.debug.State} must be + * {@link org.eclipse.gemoc.dsl.debug.State#SUSPENDED suspended}. * * @param thread * the {@link Thread} @@ -117,8 +117,8 @@ StackFrame pushStackFrameReply(Thread thread, String name, EObject context, EObj /** * Request to step over the given {@link Thread}. The {@link Thread} - * {@link Thread#getfr.obeo.dsl.debug.State() fr.obeo.dsl.debug.State} must be - * {@link fr.obeo.dsl.debug.State#SUSPENDED suspended}. + * {@link Thread#getorg.eclipse.gemoc.dsl.debug.State() org.eclipse.gemoc.dsl.debug.State} must be + * {@link org.eclipse.gemoc.dsl.debug.State#SUSPENDED suspended}. * * @param thread * the {@link Thread} @@ -127,9 +127,9 @@ StackFrame pushStackFrameReply(Thread thread, String name, EObject context, EObj /** * Request to step return the given {@link Thread}. The {@link Thread} - * {@link Thread#getfr.obeo.dsl.debug.State() fr.obeo.dsl.debug.State} must be - * {@link fr.obeo.dsl.debug.State#SUSPENDED suspended} and the {@link Thread#getTopStackFrame() top stack - * frame} must has a {@link fr.obeo.dsl.debug.StackFrame#getParentFrame() parent frame}. + * {@link Thread#getorg.eclipse.gemoc.dsl.debug.State() org.eclipse.gemoc.dsl.debug.State} must be + * {@link org.eclipse.gemoc.dsl.debug.State#SUSPENDED suspended} and the {@link Thread#getTopStackFrame() top stack + * frame} must has a {@link org.eclipse.gemoc.dsl.debug.StackFrame#getParentFrame() parent frame}. * * @param thread * the {@link Thread} @@ -137,8 +137,8 @@ StackFrame pushStackFrameReply(Thread thread, String name, EObject context, EObj void stepReturnReply(Thread thread); /** - * Requests resuming the given {@link Thread}. The {@link Thread} fr.obeo.dsl.debug.State must be - * {@link fr.obeo.dsl.debug.State#SUSPENDED suspended}. + * Requests resuming the given {@link Thread}. The {@link Thread} org.eclipse.gemoc.dsl.debug.State must be + * {@link org.eclipse.gemoc.dsl.debug.State#SUSPENDED suspended}. * * @param thread * the {@link Thread} @@ -146,22 +146,22 @@ StackFrame pushStackFrameReply(Thread thread, String name, EObject context, EObj void resumedReply(Thread thread); /** - * Sets the {@link fr.obeo.dsl.debug.StackFrame#getCurrentInstruction() current instruction} of the + * Sets the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getCurrentInstruction() current instruction} of the * {@link Thread#getTopStackFrame() top stack frame} of the given {@link Thread}. * * @param thread * the {@link Thread} * @param instruction - * the {@link fr.obeo.dsl.debug.StackFrame#getCurrentInstruction() current instruction} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getCurrentInstruction() current instruction} * @param canStepInto - * tells if we can {@link fr.obeo.dsl.debug.StackFrame#isCanStepIntoCurrentInstruction() step + * tells if we can {@link org.eclipse.gemoc.dsl.debug.StackFrame#isCanStepIntoCurrentInstruction() step * into the current instruction} */ void setCurrentInstructionReply(Thread thread, EObject instruction, boolean canStepInto); /** * Notify the suspension of the given {@link Thread} to the given - * {@link fr.obeo.dsl.debug.StackFrame#getCurrentInstruction() instruction}. + * {@link org.eclipse.gemoc.dsl.debug.StackFrame#getCurrentInstruction() instruction}. * * @param thread * the {@link Thread} @@ -170,8 +170,8 @@ StackFrame pushStackFrameReply(Thread thread, String name, EObject context, EObj /** * Notify the {@link terminateRequest termination} is done for the given {@link Thread} . The - * {@link Thread} {@link Thread#getfr.obeo.dsl.debug.State() fr.obeo.dsl.debug.State} must be - * {@link fr.obeo.dsl.debug.State#TERMINATING terminating}. + * {@link Thread} {@link Thread#getorg.eclipse.gemoc.dsl.debug.State() org.eclipse.gemoc.dsl.debug.State} must be + * {@link org.eclipse.gemoc.dsl.debug.State#TERMINATING terminating}. * * @param thread * the {@link Thread} @@ -179,16 +179,16 @@ StackFrame pushStackFrameReply(Thread thread, String name, EObject context, EObj void terminatedReply(Thread thread); /** - * Notify sets the {@link fr.obeo.dsl.debug.Variable Variable} with the given - * {@link fr.obeo.dsl.debug.Variable#getName() name} from the {@link Thread#getTopStackFrame() top stack + * Notify sets the {@link org.eclipse.gemoc.dsl.debug.Variable Variable} with the given + * {@link org.eclipse.gemoc.dsl.debug.Variable#getName() name} from the {@link Thread#getTopStackFrame() top stack * frame} of the given {@link Thread} to the given {@link EObject value}. * * @param stackFrame * the {@link StackFrame} * @param declarationTypeName - * the {@link fr.obeo.dsl.debug.Variable#getDeclarationType() declaration type name} + * the {@link org.eclipse.gemoc.dsl.debug.Variable#getDeclarationType() declaration type name} * @param variableName - * the {@link fr.obeo.dsl.debug.Variable#getName() variable name} + * the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name} * @param value * the {@link Object value} to set * @param supportModifications diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ModelUpdater.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ModelUpdater.java index 6cf08e3eb..448d71c29 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ModelUpdater.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ModelUpdater.java @@ -8,14 +8,14 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide; +package org.eclipse.gemoc.dsl.debug.ide; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetUtils; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.Thread; -import fr.obeo.dsl.debug.ThreadUtils; -import fr.obeo.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetUtils; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.Thread; +import org.eclipse.gemoc.dsl.debug.ThreadUtils; +import org.eclipse.gemoc.dsl.debug.Variable; import org.eclipse.emf.ecore.EObject; @@ -29,7 +29,7 @@ public class ModelUpdater implements IModelUpdater { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#terminateRequest(fr.obeo.dsl.debug.DebugTarget) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#terminateRequest(org.eclipse.gemoc.dsl.debug.DebugTarget) */ public void terminateRequest(DebugTarget target) { DebugTargetUtils.terminateRequest(target); @@ -38,7 +38,7 @@ public void terminateRequest(DebugTarget target) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#disconnectRequest(fr.obeo.dsl.debug.DebugTarget) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#disconnectRequest(org.eclipse.gemoc.dsl.debug.DebugTarget) */ public void disconnectRequest(DebugTarget target) { DebugTargetUtils.disconnectRequest(target); @@ -47,7 +47,7 @@ public void disconnectRequest(DebugTarget target) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#spawnRunningThreadReply(fr.obeo.dsl.debug.DebugTarget, + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#spawnRunningThreadReply(org.eclipse.gemoc.dsl.debug.DebugTarget, * java.lang.String, org.eclipse.emf.ecore.EObject) */ public void spawnRunningThreadReply(DebugTarget target, String threadName, EObject threadContext) { @@ -57,7 +57,7 @@ public void spawnRunningThreadReply(DebugTarget target, String threadName, EObje /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#terminatedReply(fr.obeo.dsl.debug.DebugTarget) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#terminatedReply(org.eclipse.gemoc.dsl.debug.DebugTarget) */ public void terminatedReply(DebugTarget target) { DebugTargetUtils.terminatedReply(target); @@ -66,7 +66,7 @@ public void terminatedReply(DebugTarget target) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#deleteVariableReply(fr.obeo.dsl.debug.Thread, + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#deleteVariableReply(org.eclipse.gemoc.dsl.debug.Thread, * java.lang.String) */ public void deleteVariableReply(Thread thread, String name) { @@ -76,7 +76,7 @@ public void deleteVariableReply(Thread thread, String name) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#popStackFrameReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#popStackFrameReply(org.eclipse.gemoc.dsl.debug.Thread) */ public StackFrame popStackFrameReply(Thread thread) { return ThreadUtils.popStackFrameReply(thread); @@ -85,7 +85,7 @@ public StackFrame popStackFrameReply(Thread thread) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#pushStackFrameReply(fr.obeo.dsl.debug.Thread, + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#pushStackFrameReply(org.eclipse.gemoc.dsl.debug.Thread, * java.lang.String, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject, boolean) */ public StackFrame pushStackFrameReply(Thread thread, String name, EObject context, EObject instruction, @@ -96,7 +96,7 @@ public StackFrame pushStackFrameReply(Thread thread, String name, EObject contex /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#stepIntoReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#stepIntoReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void stepIntoReply(Thread thread) { ThreadUtils.stepIntoReply(thread); @@ -105,7 +105,7 @@ public void stepIntoReply(Thread thread) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#stepOverReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#stepOverReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void stepOverReply(Thread thread) { ThreadUtils.stepOverReply(thread); @@ -114,7 +114,7 @@ public void stepOverReply(Thread thread) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#stepReturnReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#stepReturnReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void stepReturnReply(Thread thread) { ThreadUtils.stepReturnReply(thread); @@ -123,7 +123,7 @@ public void stepReturnReply(Thread thread) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#resumedReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#resumedReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void resumedReply(Thread thread) { ThreadUtils.resumedReply(thread); @@ -132,7 +132,7 @@ public void resumedReply(Thread thread) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#setCurrentInstructionReply(fr.obeo.dsl.debug.Thread, + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#setCurrentInstructionReply(org.eclipse.gemoc.dsl.debug.Thread, * org.eclipse.emf.ecore.EObject, boolean) */ public void setCurrentInstructionReply(Thread thread, EObject instruction, boolean canStepInto) { @@ -142,7 +142,7 @@ public void setCurrentInstructionReply(Thread thread, EObject instruction, boole /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#suspendedReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#suspendedReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void suspendedReply(Thread thread) { ThreadUtils.suspendedReply(thread); @@ -151,7 +151,7 @@ public void suspendedReply(Thread thread) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#terminatedReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#terminatedReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void terminatedReply(Thread thread) { ThreadUtils.terminatedReply(thread); @@ -160,7 +160,7 @@ public void terminatedReply(Thread thread) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#setVariableReply(fr.obeo.dsl.debug.StackFrame, + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#setVariableReply(org.eclipse.gemoc.dsl.debug.StackFrame, * java.lang.String, java.lang.String, java.lang.Object, boolean) */ public void setVariableReply(StackFrame stackFrame, String declarationTypeName, String variableName, @@ -172,7 +172,7 @@ public void setVariableReply(StackFrame stackFrame, String declarationTypeName, /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#setVariableValueReply(fr.obeo.dsl.debug.Variable, + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#setVariableValueReply(org.eclipse.gemoc.dsl.debug.Variable, * java.lang.Object) */ public void setVariableValueReply(Variable variable, Object value) { @@ -182,7 +182,7 @@ public void setVariableValueReply(Variable variable, Object value) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#terminateRequest(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#terminateRequest(org.eclipse.gemoc.dsl.debug.Thread) */ public void terminateRequest(Thread thread) { ThreadUtils.terminateRequest(thread); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ThreadController.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ThreadController.java index f6d6f987d..3f6b670e6 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ThreadController.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/ThreadController.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide; +package org.eclipse.gemoc.dsl.debug.ide; -import fr.obeo.dsl.debug.ide.IDSLDebugger.Stepping; +import org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger.Stepping; import org.eclipse.emf.ecore.EObject; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/TransactionalModelUpdater.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/TransactionalModelUpdater.java index 3a1e6a19e..a2b5a8d6b 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/TransactionalModelUpdater.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/TransactionalModelUpdater.java @@ -8,14 +8,14 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide; +package org.eclipse.gemoc.dsl.debug.ide; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetUtils; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.Thread; -import fr.obeo.dsl.debug.ThreadUtils; -import fr.obeo.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetUtils; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.Thread; +import org.eclipse.gemoc.dsl.debug.ThreadUtils; +import org.eclipse.gemoc.dsl.debug.Variable; import java.util.ArrayList; import java.util.Collection; @@ -60,7 +60,7 @@ protected void doExecute(Command command) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#terminateRequest(fr.obeo.dsl.debug.DebugTarget) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#terminateRequest(org.eclipse.gemoc.dsl.debug.DebugTarget) */ public void terminateRequest(final DebugTarget target) { final Command command = new RecordingCommand(domain, "Terminate Request") { @@ -77,7 +77,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#disconnectRequest(fr.obeo.dsl.debug.DebugTarget) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#disconnectRequest(org.eclipse.gemoc.dsl.debug.DebugTarget) */ public void disconnectRequest(final DebugTarget target) { final Command command = new RecordingCommand(domain, "Disconnect Request") { @@ -94,7 +94,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#spawnRunningThreadReply(fr.obeo.dsl.debug.DebugTarget, + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#spawnRunningThreadReply(org.eclipse.gemoc.dsl.debug.DebugTarget, * java.lang.String, org.eclipse.emf.ecore.EObject) */ public void spawnRunningThreadReply(final DebugTarget target, final String threadName, @@ -113,7 +113,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#terminatedReply(fr.obeo.dsl.debug.DebugTarget) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#terminatedReply(org.eclipse.gemoc.dsl.debug.DebugTarget) */ public void terminatedReply(final DebugTarget target) { final Command command = new RecordingCommand(domain, "Terminated Reply") { @@ -130,7 +130,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#deleteVariableReply(fr.obeo.dsl.debug.Thread, + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#deleteVariableReply(org.eclipse.gemoc.dsl.debug.Thread, * java.lang.String) */ public void deleteVariableReply(final Thread thread, final String name) { @@ -148,7 +148,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#popStackFrameReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#popStackFrameReply(org.eclipse.gemoc.dsl.debug.Thread) */ public StackFrame popStackFrameReply(final Thread thread) { final Command command = new RecordingCommand(domain, "Pop Stack Frame Reply") { @@ -174,7 +174,7 @@ public Collection getResult() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#pushStackFrameReply(fr.obeo.dsl.debug.Thread, + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#pushStackFrameReply(org.eclipse.gemoc.dsl.debug.Thread, * java.lang.String, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject, boolean) */ public StackFrame pushStackFrameReply(final Thread thread, final String name, final EObject context, @@ -202,7 +202,7 @@ public Collection getResult() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#stepIntoReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#stepIntoReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void stepIntoReply(final Thread thread) { final Command command = new RecordingCommand(domain, "Step Into Reply") { @@ -219,7 +219,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#stepOverReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#stepOverReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void stepOverReply(final Thread thread) { final Command command = new RecordingCommand(domain, "Step Over Reply") { @@ -236,7 +236,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#stepReturnReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#stepReturnReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void stepReturnReply(final Thread thread) { final Command command = new RecordingCommand(domain, "Step Return Reply") { @@ -253,7 +253,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#resumedReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#resumedReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void resumedReply(final Thread thread) { final Command command = new RecordingCommand(domain, "Resumed Reply") { @@ -270,7 +270,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#setCurrentInstructionReply(fr.obeo.dsl.debug.Thread, + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#setCurrentInstructionReply(org.eclipse.gemoc.dsl.debug.Thread, * org.eclipse.emf.ecore.EObject, boolean) */ public void setCurrentInstructionReply(final Thread thread, final EObject instruction, @@ -289,7 +289,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#suspendedReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#suspendedReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void suspendedReply(final Thread thread) { final Command command = new RecordingCommand(domain, "Suspended Reply") { @@ -306,7 +306,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#terminatedReply(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#terminatedReply(org.eclipse.gemoc.dsl.debug.Thread) */ public void terminatedReply(final Thread thread) { final Command command = new RecordingCommand(domain, "Terminated Reply") { @@ -323,7 +323,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.ModelUpdater#setVariableReply(fr.obeo.dsl.debug.StackFrame, + * @see org.eclipse.gemoc.dsl.debug.ide.ModelUpdater#setVariableReply(org.eclipse.gemoc.dsl.debug.StackFrame, * java.lang.String, java.lang.String, java.lang.Object, boolean) */ public void setVariableReply(final StackFrame stackFrame, final String declarationTypeName, @@ -356,7 +356,7 @@ protected void doExecute() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.IModelUpdater#terminateRequest(fr.obeo.dsl.debug.Thread) + * @see org.eclipse.gemoc.dsl.debug.ide.IModelUpdater#terminateRequest(org.eclipse.gemoc.dsl.debug.Thread) */ public void terminateRequest(final Thread thread) { final Command command = new RecordingCommand(domain, "Terminate Request") { diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/AbstractDSLDebugElementAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/AbstractDSLDebugElementAdapter.java index b16238fa0..c38a56868 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/AbstractDSLDebugElementAdapter.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/AbstractDSLDebugElementAdapter.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter; +package org.eclipse.gemoc.dsl.debug.ide.adapter; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.model.DebugElement; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java index d1ab974e8..f941ceb81 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLDebugTargetAdapter.java @@ -8,42 +8,42 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter; - -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetState; -import fr.obeo.dsl.debug.DebugTargetUtils; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.Thread; -import fr.obeo.dsl.debug.Variable; -import fr.obeo.dsl.debug.ide.Activator; -import fr.obeo.dsl.debug.ide.DSLBreakpoint; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEvent; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor; -import fr.obeo.dsl.debug.ide.event.debugger.BreakpointReply; -import fr.obeo.dsl.debug.ide.event.debugger.DeleteVariableReply; -import fr.obeo.dsl.debug.ide.event.debugger.PopStackFrameReply; -import fr.obeo.dsl.debug.ide.event.debugger.PushStackFrameReply; -import fr.obeo.dsl.debug.ide.event.debugger.ResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.SetCurrentInstructionReply; -import fr.obeo.dsl.debug.ide.event.debugger.SetVariableValueReply; -import fr.obeo.dsl.debug.ide.event.debugger.SpawnRunningThreadReply; -import fr.obeo.dsl.debug.ide.event.debugger.StepIntoResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.StepOverResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.StepReturnResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.SteppedReply; -import fr.obeo.dsl.debug.ide.event.debugger.SuspendedReply; -import fr.obeo.dsl.debug.ide.event.debugger.TerminatedReply; -import fr.obeo.dsl.debug.ide.event.debugger.VariableReply; -import fr.obeo.dsl.debug.ide.event.model.AddBreakpointRequest; -import fr.obeo.dsl.debug.ide.event.model.ChangeBreakPointRequest; -import fr.obeo.dsl.debug.ide.event.model.DisconnectRequest; -import fr.obeo.dsl.debug.ide.event.model.RemoveBreakpointRequest; -import fr.obeo.dsl.debug.ide.event.model.ResumeRequest; -import fr.obeo.dsl.debug.ide.event.model.StartRequest; -import fr.obeo.dsl.debug.ide.event.model.SuspendRequest; -import fr.obeo.dsl.debug.ide.event.model.TerminateRequest; +package org.eclipse.gemoc.dsl.debug.ide.adapter; + +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetState; +import org.eclipse.gemoc.dsl.debug.DebugTargetUtils; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.Thread; +import org.eclipse.gemoc.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.ide.Activator; +import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.BreakpointReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.DeleteVariableReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.PopStackFrameReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.PushStackFrameReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.ResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SetCurrentInstructionReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SetVariableValueReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SpawnRunningThreadReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.StepIntoResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.StepOverResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.StepReturnResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SteppedReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SuspendedReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.TerminatedReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.VariableReply; +import org.eclipse.gemoc.dsl.debug.ide.event.model.AddBreakpointRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.ChangeBreakPointRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.DisconnectRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.RemoveBreakpointRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.ResumeRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StartRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.SuspendRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.TerminateRequest; import java.io.Serializable; import java.util.ArrayList; @@ -370,7 +370,7 @@ public boolean supportsBreakpoint(IBreakpoint breakpoint) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent) + * @see org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent) */ public Object handleEvent(IDSLDebugEvent event) { Object res = null; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLStackFrameAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLStackFrameAdapter.java index 82d88cd1a..7b5667451 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLStackFrameAdapter.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLStackFrameAdapter.java @@ -8,13 +8,13 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter; +package org.eclipse.gemoc.dsl.debug.ide.adapter; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.ThreadUtils; -import fr.obeo.dsl.debug.Variable; -import fr.obeo.dsl.debug.ide.Activator; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.ThreadUtils; +import org.eclipse.gemoc.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.ide.Activator; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; import java.util.ArrayList; import java.util.List; @@ -190,7 +190,7 @@ public void terminate() throws DebugException { */ public IThread getThread() { if (thread == null) { - fr.obeo.dsl.debug.Thread hostThread = ThreadUtils.getThread(getHost()); + org.eclipse.gemoc.dsl.debug.Thread hostThread = ThreadUtils.getThread(getHost()); if (hostThread == null) { throw new IllegalStateException("can't addapt Thread to IThread."); } diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLThreadAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLThreadAdapter.java index aeee9790d..394ef5d88 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLThreadAdapter.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLThreadAdapter.java @@ -8,20 +8,20 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter; - -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.State; -import fr.obeo.dsl.debug.Thread; -import fr.obeo.dsl.debug.ThreadUtils; -import fr.obeo.dsl.debug.ide.DSLBreakpoint; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; -import fr.obeo.dsl.debug.ide.event.model.ResumeRequest; -import fr.obeo.dsl.debug.ide.event.model.StepIntoRequest; -import fr.obeo.dsl.debug.ide.event.model.StepOverRequest; -import fr.obeo.dsl.debug.ide.event.model.StepReturnRequest; -import fr.obeo.dsl.debug.ide.event.model.SuspendRequest; -import fr.obeo.dsl.debug.ide.event.model.TerminateRequest; +package org.eclipse.gemoc.dsl.debug.ide.adapter; + +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.State; +import org.eclipse.gemoc.dsl.debug.Thread; +import org.eclipse.gemoc.dsl.debug.ThreadUtils; +import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.event.model.ResumeRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StepIntoRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StepOverRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StepReturnRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.SuspendRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.TerminateRequest; import java.util.ArrayList; import java.util.List; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLVariableAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLVariableAdapter.java index 922858fac..e9a09d1a6 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLVariableAdapter.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/DSLVariableAdapter.java @@ -8,13 +8,13 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter; +package org.eclipse.gemoc.dsl.debug.ide.adapter; -import fr.obeo.dsl.debug.ThreadUtils; -import fr.obeo.dsl.debug.Variable; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; -import fr.obeo.dsl.debug.ide.event.model.SetVariableValueRequest; -import fr.obeo.dsl.debug.ide.event.model.ValidateVariableValueRequest; +import org.eclipse.gemoc.dsl.debug.ThreadUtils; +import org.eclipse.gemoc.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.event.model.SetVariableValueRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.ValidateVariableValueRequest; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValue; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/IDSLCurrentInstructionListener.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/IDSLCurrentInstructionListener.java index 9ceaf06d5..a3313cdeb 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/IDSLCurrentInstructionListener.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/IDSLCurrentInstructionListener.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter; +package org.eclipse.gemoc.dsl.debug.ide.adapter; -import fr.obeo.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.StackFrame; /** * A listener notified when a {@link DSLDebugTargetAdapter} current instructions are changed. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/ILocator.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/ILocator.java index f08c8a30a..3804833a4 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/ILocator.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/ILocator.java @@ -1,4 +1,4 @@ -package fr.obeo.dsl.debug.ide.adapter; +package org.eclipse.gemoc.dsl.debug.ide.adapter; import org.eclipse.emf.ecore.EObject; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/AbstractDSLValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/AbstractDSLValue.java index f2d5b3f56..ea56c1f52 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/AbstractDSLValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/AbstractDSLValue.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; -import fr.obeo.dsl.debug.ide.adapter.AbstractDSLDebugElementAdapter; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.adapter.AbstractDSLDebugElementAdapter; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValue; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLArrayValue.java index 5c468d10a..38b2b69ba 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLArrayValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLArrayValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; import java.util.Arrays; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLBooleanArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLBooleanArrayValue.java index 199356e3b..03a7520fa 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLBooleanArrayValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLBooleanArrayValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; /** * Array of boolean {@link org.eclipse.debug.core.model.IValue IValue}. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLByteArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLByteArrayValue.java index 7eac2b9ee..fd178cab2 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLByteArrayValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLByteArrayValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; /** * Array of byte {@link org.eclipse.debug.core.model.IValue IValue}. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLCharArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLCharArrayValue.java index ff4ce1ae4..f1256074b 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLCharArrayValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLCharArrayValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; /** * Array of char {@link org.eclipse.debug.core.model.IValue IValue}. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLDoubleArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLDoubleArrayValue.java index a4a076876..266a420e8 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLDoubleArrayValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLDoubleArrayValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; /** * Array of double {@link org.eclipse.debug.core.model.IValue IValue}. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLEObjectValueAdapter.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLEObjectValueAdapter.java index 1694e71c1..8d78f4d0c 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLEObjectValueAdapter.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLEObjectValueAdapter.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValue; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLFloatArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLFloatArrayValue.java index 30bfe9449..e64dc643c 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLFloatArrayValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLFloatArrayValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; /** * Array of float {@link org.eclipse.debug.core.model.IValue IValue}. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLIntArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLIntArrayValue.java index dc4ba97ac..a9b008829 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLIntArrayValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLIntArrayValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; /** * Array of int {@link org.eclipse.debug.core.model.IValue IValue}. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLLongArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLLongArrayValue.java index a375fb113..15f704b0a 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLLongArrayValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLLongArrayValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; /** * Array of long {@link org.eclipse.debug.core.model.IValue IValue}. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLNullValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLNullValue.java index cac4f4c4b..5ad7977d2 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLNullValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLNullValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IVariable; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLObjectValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLObjectValue.java index 83f230014..0f8414173 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLObjectValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLObjectValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IVariable; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLShortArrayValue.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLShortArrayValue.java index 7ff298827..eafbd114a 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLShortArrayValue.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/value/DSLShortArrayValue.java @@ -8,9 +8,9 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.value; +package org.eclipse.gemoc.dsl.debug.ide.adapter.value; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; /** * Array of short {@link org.eclipse.debug.core.model.IValue IValue}. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/variable/DSLObjectVariable.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/variable/DSLObjectVariable.java index b90d4e14c..83419131b 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/variable/DSLObjectVariable.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/adapter/variable/DSLObjectVariable.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.adapter.variable; +package org.eclipse.gemoc.dsl.debug.ide.adapter.variable; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; -import fr.obeo.dsl.debug.ide.adapter.AbstractDSLDebugElementAdapter; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.adapter.AbstractDSLDebugElementAdapter; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValue; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/DSLDebugEventDispatcher.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/DSLDebugEventDispatcher.java index c4ac55563..9c2a2915d 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/DSLDebugEventDispatcher.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/DSLDebugEventDispatcher.java @@ -8,12 +8,12 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event; +package org.eclipse.gemoc.dsl.debug.ide.event; -import fr.obeo.dsl.debug.ide.IDSLDebugger; -import fr.obeo.dsl.debug.ide.adapter.DSLDebugTargetAdapter; -import fr.obeo.dsl.debug.ide.event.debugger.IDSLDebuggerReply; -import fr.obeo.dsl.debug.ide.event.model.IDSLModelRequest; +import org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLDebugTargetAdapter; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.IDSLDebuggerReply; +import org.eclipse.gemoc.dsl.debug.ide.event.model.IDSLModelRequest; import java.util.ArrayList; import java.util.List; @@ -100,7 +100,7 @@ protected IStatus run(IProgressMonitor monitor) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent) + * @see org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent) */ public Object handleEvent(final IDSLDebugEvent event) { final Object res; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEvent.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEvent.java index d8aa5c81b..a73407c0d 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEvent.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEvent.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event; +package org.eclipse.gemoc.dsl.debug.ide.event; /** - * Communication events between the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} and the - * {@link fr.obeo.dsl.debug.ide.adapter.DSLDebugTargetAdapter debug target}. + * Communication events between the {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger debugger} and the + * {@link org.eclipse.gemoc.dsl.debug.ide.adapter.DSLDebugTargetAdapter debug target}. * * @author Yvan Lussaud */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEventProcessor.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEventProcessor.java index 3b30063a9..fe75d4e12 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEventProcessor.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/IDSLDebugEventProcessor.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event; +package org.eclipse.gemoc.dsl.debug.ide.event; /** diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractThreadReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractThreadReply.java index 6c6b58fd9..08c7bacb0 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractThreadReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractThreadReply.java @@ -8,17 +8,17 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** - * A {@link fr.obeo.dsl.debug.Thread thread} contextual {@link IDSLDebuggerReply reply}. + * A {@link org.eclipse.gemoc.dsl.debug.Thread thread} contextual {@link IDSLDebuggerReply reply}. * * @author Yvan Lussaud */ public abstract class AbstractThreadReply implements IDSLDebuggerReply { /** - * The {@link fr.obeo.dsl.debug.Thread#getName() thread name}. + * The {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name}. */ private final String threadName; @@ -26,16 +26,16 @@ public abstract class AbstractThreadReply implements IDSLDebuggerReply { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public AbstractThreadReply(String threadName) { this.threadName = threadName; } /** - * Gets the {@link fr.obeo.dsl.debug.Thread#getName() thread name}. + * Gets the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name}. * - * @return the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * @return the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public String getThreadName() { return threadName; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractVariableReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractVariableReply.java index 7290a8ad5..84f6db603 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractVariableReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/AbstractVariableReply.java @@ -8,17 +8,17 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** - * A {@link fr.obeo.dsl.debug.Varaible variable} contextual {@link IDSLDebuggerReply reply}. + * A {@link org.eclipse.gemoc.dsl.debug.Varaible variable} contextual {@link IDSLDebuggerReply reply}. * * @author Yvan Lussaud */ public abstract class AbstractVariableReply extends AbstractThreadReply { /** - * The {@link fr.obeo.dsl.debug.StackFrame#getName() stack frame name}. + * The {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack frame name}. */ private final String stackName; @@ -28,14 +28,14 @@ public abstract class AbstractVariableReply extends AbstractThreadReply { private final String variableName; /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param stackName - * the {@link fr.obeo.dsl.debug.StackFrame#getName() stack frame name} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack frame name} * @param variableName - * the {@link fr.obeo.dsl.debug.Variable#getName() variable name} + * the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name} */ public AbstractVariableReply(String threadName, String stackName, String variableName) { super(threadName); @@ -44,18 +44,18 @@ public AbstractVariableReply(String threadName, String stackName, String variabl } /** - * Gets the {@link fr.obeo.dsl.debug.StackFrame#getName() stack frame name}. + * Gets the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack frame name}. * - * @return the {@link fr.obeo.dsl.debug.StackFrame#getName() stack frame name} + * @return the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack frame name} */ public String getStackName() { return stackName; } /** - * Gets the {@link fr.obeo.dsl.debug.Variable#getName() variable name}. + * Gets the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name}. * - * @return the {@link fr.obeo.dsl.debug.Variable#getName() variable name} + * @return the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name} */ public String getVariableName() { return variableName; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/BreakpointReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/BreakpointReply.java index be17600aa..772004669 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/BreakpointReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/BreakpointReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** @@ -22,7 +22,7 @@ public class BreakpointReply extends SuspendedReply { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public BreakpointReply(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/DeleteVariableReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/DeleteVariableReply.java index 0573ea9d1..c2577cb64 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/DeleteVariableReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/DeleteVariableReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** * Reply sent when the thread has to delete a variable. @@ -23,10 +23,10 @@ public class DeleteVariableReply extends AbstractThreadReply { private final String name; /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param name * the variable name */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/IDSLDebuggerReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/IDSLDebuggerReply.java index de4b58017..d0ab6ca70 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/IDSLDebuggerReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/IDSLDebuggerReply.java @@ -8,13 +8,13 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEvent; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent; /** - * An {@link IDSLDebugEvent debugger event} from the {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger} to - * the {@link fr.obeo.dsl.debug.ide.adapter.DSLDebugTargetAdapter debug target}. + * An {@link IDSLDebugEvent debugger event} from the {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger debugger} to + * the {@link org.eclipse.gemoc.dsl.debug.ide.adapter.DSLDebugTargetAdapter debug target}. * * @author Yvan Lussaud */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PopStackFrameReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PopStackFrameReply.java index 2e4d690b5..1f151c006 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PopStackFrameReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PopStackFrameReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** @@ -19,10 +19,10 @@ public class PopStackFrameReply extends AbstractThreadReply { /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public PopStackFrameReply(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PushStackFrameReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PushStackFrameReply.java index 27c70dd22..32aa3df68 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PushStackFrameReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/PushStackFrameReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; import org.eclipse.emf.ecore.EObject; @@ -40,10 +40,10 @@ public class PushStackFrameReply extends AbstractThreadReply { private final boolean canStepInto; /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param name * the stack frame name * @param context diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ResumingReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ResumingReply.java index d2307c010..7450ee741 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ResumingReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ResumingReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** * Reply sent when the thread is resumed by a client request. @@ -18,10 +18,10 @@ public class ResumingReply extends AbstractThreadReply { /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public ResumingReply(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetCurrentInstructionReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetCurrentInstructionReply.java index be25731a8..6d1a527a4 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetCurrentInstructionReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetCurrentInstructionReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; import org.eclipse.emf.ecore.EObject; @@ -30,10 +30,10 @@ public class SetCurrentInstructionReply extends AbstractThreadReply { private final boolean canStepInto; /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param instruction * the current instruction * @param canStepInto diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetVariableValueReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetVariableValueReply.java index 75c6b07a8..49aab59f3 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetVariableValueReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SetVariableValueReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** * Reply sent when the value of a variable has been changed after a request. @@ -23,14 +23,14 @@ public class SetVariableValueReply extends AbstractVariableReply { Object value; /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param stackName - * the {@link fr.obeo.dsl.debug.StackFrame#getName() stack frame name} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack frame name} * @param variableName - * the {@link fr.obeo.dsl.debug.Variable#getName() variable name} + * the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name} * @param value * the value to set */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SpawnRunningThreadReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SpawnRunningThreadReply.java index 74f885aa3..c1b078908 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SpawnRunningThreadReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SpawnRunningThreadReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; import org.eclipse.emf.ecore.EObject; @@ -28,7 +28,7 @@ public class SpawnRunningThreadReply extends AbstractThreadReply { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param context * the {@link EObject} representing the current context of the thread */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepIntoResumingReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepIntoResumingReply.java index 05c4bde0a..c2c2fb7d7 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepIntoResumingReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepIntoResumingReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** * Reply sent when the thread is resumed by a step into. @@ -18,10 +18,10 @@ public class StepIntoResumingReply extends ResumingReply { /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public StepIntoResumingReply(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepOverResumingReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepOverResumingReply.java index 89fd48f52..3ee89b1ec 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepOverResumingReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepOverResumingReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** * Reply sent when the thread is resumed by a step over. @@ -18,10 +18,10 @@ public class StepOverResumingReply extends ResumingReply { /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public StepOverResumingReply(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepReturnResumingReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepReturnResumingReply.java index 64bbd2d35..a9326071c 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepReturnResumingReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/StepReturnResumingReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** * Reply sent when the thread is resumed by a step return. @@ -18,10 +18,10 @@ public class StepReturnResumingReply extends ResumingReply { /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public StepReturnResumingReply(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SteppedReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SteppedReply.java index 7cf00f475..c30703439 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SteppedReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SteppedReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** @@ -22,7 +22,7 @@ public class SteppedReply extends SuspendedReply { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public SteppedReply(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SuspendedReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SuspendedReply.java index f894f7d0a..e9c9c3cde 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SuspendedReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/SuspendedReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** @@ -22,7 +22,7 @@ public class SuspendedReply extends AbstractThreadReply { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public SuspendedReply(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/TerminatedReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/TerminatedReply.java index 50e1301a3..e52822a7c 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/TerminatedReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/TerminatedReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** @@ -19,17 +19,17 @@ public class TerminatedReply extends AbstractThreadReply { /** - * Constructor for {@link fr.obeo.dsl.debug.DebugTarget DebugTarget}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.DebugTarget DebugTarget}. */ public TerminatedReply() { this(null); } /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public TerminatedReply(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ValidateVariableValueReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ValidateVariableValueReply.java index a82199e24..42554caa4 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ValidateVariableValueReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/ValidateVariableValueReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** * Reply sent when the thread has a new variable. @@ -23,14 +23,14 @@ public class ValidateVariableValueReply extends AbstractVariableReply { boolean valid; /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param stackName - * the {@link fr.obeo.dsl.debug.StackFrame#getName() stack frame name} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack frame name} * @param variableName - * the {@link fr.obeo.dsl.debug.Variable#getName() variable name} + * the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name} * @param valid * tells if the value is valid */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/VariableReply.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/VariableReply.java index 7ec3bcc4c..8da4b86ff 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/VariableReply.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/debugger/VariableReply.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.debugger; +package org.eclipse.gemoc.dsl.debug.ide.event.debugger; /** * Reply sent when the thread has a new variable. @@ -33,12 +33,12 @@ public class VariableReply extends AbstractVariableReply { private final boolean supportModifications; /** - * Constructor for {@link fr.obeo.dsl.debug.Thread Thread}. + * Constructor for {@link org.eclipse.gemoc.dsl.debug.Thread Thread}. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param stackName - * the {@link fr.obeo.dsl.debug.StackFrame#getName() stack frame name} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack frame name} * @param declarationTypeName * the declaration type name * @param variableName diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractBreakpointRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractBreakpointRequest.java index d46b6629d..356797b71 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractBreakpointRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractBreakpointRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; import org.eclipse.emf.common.util.URI; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractStepRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractStepRequest.java index 1cf21564f..cc5d1fe3e 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractStepRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractStepRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; import org.eclipse.emf.ecore.EObject; @@ -29,7 +29,7 @@ public abstract class AbstractStepRequest extends AbstractThreadRequest { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param instruction * the {@link EObject} representing the current instruction */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractThreadRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractThreadRequest.java index 8721d65e5..d8ceeda88 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractThreadRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractThreadRequest.java @@ -8,17 +8,17 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; /** - * A {@link fr.obeo.dsl.debug.Thread thread} contextual {@link IDSLModelRequest request}. + * A {@link org.eclipse.gemoc.dsl.debug.Thread thread} contextual {@link IDSLModelRequest request}. * * @author Yvan Lussaud */ public abstract class AbstractThreadRequest implements IDSLModelRequest { /** - * The {@link fr.obeo.dsl.debug.Thread#getName() thread name}. + * The {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name}. */ private final String threadName; @@ -26,16 +26,16 @@ public abstract class AbstractThreadRequest implements IDSLModelRequest { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public AbstractThreadRequest(String threadName) { this.threadName = threadName; } /** - * Gets the {@link fr.obeo.dsl.debug.Thread#getName() thread name}. + * Gets the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name}. * - * @return the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * @return the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public String getThreadName() { return threadName; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractVariableRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractVariableRequest.java index 5badafe39..617da1466 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractVariableRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AbstractVariableRequest.java @@ -8,22 +8,22 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; /** - * A {@link fr.obeo.dsl.debug.Thread thread} contextual {@link IDSLModelRequest request}. + * A {@link org.eclipse.gemoc.dsl.debug.Thread thread} contextual {@link IDSLModelRequest request}. * * @author Yvan Lussaud */ public abstract class AbstractVariableRequest extends AbstractThreadRequest { /** - * The {@link fr.obeo.dsl.debug.StackFrame#getName() stack name}. + * The {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack name}. */ private final String stackName; /** - * The {@link fr.obeo.dsl.debug.Variable#getName() variable name}. + * The {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name}. */ private final String variableName; @@ -31,11 +31,11 @@ public abstract class AbstractVariableRequest extends AbstractThreadRequest { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param stackName - * the {@link fr.obeo.dsl.debug.StackFrame#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() thread name} * @param variableName - * the {@link fr.obeo.dsl.debug.Variable#getName() variable name} + * the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name} */ public AbstractVariableRequest(String threadName, String stackName, String variableName) { super(threadName); @@ -44,18 +44,18 @@ public AbstractVariableRequest(String threadName, String stackName, String varia } /** - * Gets the {@link fr.obeo.dsl.debug.StackFrame#getName() stack name}. + * Gets the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack name}. * - * @return the {@link fr.obeo.dsl.debug.StackFrame#getName() stack name} + * @return the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() stack name} */ public String getStackName() { return stackName; } /** - * Gets the {@link fr.obeo.dsl.debug.Variable#getName() variable name}. + * Gets the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name}. * - * @return the {@link fr.obeo.dsl.debug.Variable#getName() variable name} + * @return the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name} */ public String getVariableName() { return variableName; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AddBreakpointRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AddBreakpointRequest.java index 91d5fb831..bdb0e30d6 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AddBreakpointRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/AddBreakpointRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; import org.eclipse.emf.common.util.URI; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ChangeBreakPointRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ChangeBreakPointRequest.java index dd038c9b6..cc7c1a2d7 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ChangeBreakPointRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ChangeBreakPointRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; import java.io.Serializable; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/DisconnectRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/DisconnectRequest.java index a2ef0b5ff..8843fb17b 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/DisconnectRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/DisconnectRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; /** * Request sent to disconnect from the debugger. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/IDSLModelRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/IDSLModelRequest.java index 3081f61a0..b62fff211 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/IDSLModelRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/IDSLModelRequest.java @@ -8,14 +8,14 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEvent; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent; /** * An {@link IDSLDebugEvent debugger event} from the - * {@link fr.obeo.dsl.debug.ide.adapter.DSLDebugTargetAdapter debug target} to the - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger debugger}. + * {@link org.eclipse.gemoc.dsl.debug.ide.adapter.DSLDebugTargetAdapter debug target} to the + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger debugger}. * * @author Yvan Lussaud */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/RemoveBreakpointRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/RemoveBreakpointRequest.java index 67945ada2..4713d4e19 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/RemoveBreakpointRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/RemoveBreakpointRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; import org.eclipse.emf.common.util.URI; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ResumeRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ResumeRequest.java index f8e58f90c..dd36c2950 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ResumeRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ResumeRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; /** * Request sent to resume the execution of a thread or the debugger. @@ -28,7 +28,7 @@ public ResumeRequest() { * Constructor for thread. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public ResumeRequest(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SetVariableValueRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SetVariableValueRequest.java index b64d11827..3215a7f11 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SetVariableValueRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SetVariableValueRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; /** * Request sent to set a variable value. @@ -26,11 +26,11 @@ public class SetVariableValueRequest extends AbstractVariableRequest { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param stackName - * the {@link fr.obeo.dsl.debug.StackFrame#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() thread name} * @param variableName - * the {@link fr.obeo.dsl.debug.Variable#getName() variable name} + * the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name} * @param value * the value to validate */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StartRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StartRequest.java index 6f3b98dc6..31f402aae 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StartRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StartRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; /** * Request sent to start the debugger. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepIntoRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepIntoRequest.java index 8262165f6..505f3c9f6 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepIntoRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepIntoRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; import org.eclipse.emf.ecore.EObject; @@ -23,7 +23,7 @@ public class StepIntoRequest extends AbstractStepRequest { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param instruction * the {@link EObject} representing the current instruction */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepOverRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepOverRequest.java index 11a7d3ea2..d88344725 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepOverRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepOverRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; import org.eclipse.emf.ecore.EObject; @@ -23,7 +23,7 @@ public class StepOverRequest extends AbstractStepRequest { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param instruction * the {@link EObject} representing the current instruction */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepReturnRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepReturnRequest.java index 73439f0f2..3b8e0a54b 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepReturnRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/StepReturnRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; import org.eclipse.emf.ecore.EObject; @@ -23,7 +23,7 @@ public class StepReturnRequest extends AbstractStepRequest { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param instruction * the {@link EObject} representing the current instruction */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SuspendRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SuspendRequest.java index 5da780de7..14f7f007a 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SuspendRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/SuspendRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; /** * Request sent to suspend the execution of a thread or the debugger. @@ -28,7 +28,7 @@ public SuspendRequest() { * Constructor for thread. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public SuspendRequest(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/TerminateRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/TerminateRequest.java index d41f85ccb..0c65ee95b 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/TerminateRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/TerminateRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; /** * Request sent to terminate the execution of a thread or the debugger. @@ -28,7 +28,7 @@ public TerminateRequest() { * Constructor for thread. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} */ public TerminateRequest(String threadName) { super(threadName); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ValidateVariableValueRequest.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ValidateVariableValueRequest.java index 7615ff58e..5d33a623b 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ValidateVariableValueRequest.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/event/model/ValidateVariableValueRequest.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.event.model; +package org.eclipse.gemoc.dsl.debug.ide.event.model; /** * Request sent to validate a variable value. @@ -26,11 +26,11 @@ public class ValidateVariableValueRequest extends AbstractVariableRequest { * Constructor. * * @param threadName - * the {@link fr.obeo.dsl.debug.Thread#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.Thread#getName() thread name} * @param stackName - * the {@link fr.obeo.dsl.debug.StackFrame#getName() thread name} + * the {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName() thread name} * @param variableName - * the {@link fr.obeo.dsl.debug.Variable#getName() variable name} + * the {@link org.eclipse.gemoc.dsl.debug.Variable#getName() variable name} * @param value * the value to set */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/launch/AbstractDSLLaunchConfigurationDelegate.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/launch/AbstractDSLLaunchConfigurationDelegate.java index 660420fed..4743dba13 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/launch/AbstractDSLLaunchConfigurationDelegate.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide/src/org/eclipse/gemoc/dsl/debug/ide/launch/AbstractDSLLaunchConfigurationDelegate.java @@ -8,17 +8,17 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.launch; - -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetUtils; -import fr.obeo.dsl.debug.ide.Activator; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; -import fr.obeo.dsl.debug.ide.IDSLDebugger; -import fr.obeo.dsl.debug.ide.ModelUpdater; -import fr.obeo.dsl.debug.ide.adapter.DSLDebugTargetAdapter; -import fr.obeo.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; -import fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher; +package org.eclipse.gemoc.dsl.debug.ide.launch; + +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetUtils; +import org.eclipse.gemoc.dsl.debug.ide.Activator; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger; +import org.eclipse.gemoc.dsl.debug.ide.ModelUpdater; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLDebugTargetAdapter; +import org.eclipse.gemoc.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; +import org.eclipse.gemoc.dsl.debug.ide.event.DSLDebugEventDispatcher; import java.util.ArrayList; import java.util.List; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.project b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.project index 338b3a245..68e26ece9 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.project +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug + org.eclipse.gemoc.dsl.debug diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/META-INF/MANIFEST.MF index 6993dcdbe..66d369c44 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.obeo.dsl.debug;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.dsl.debug;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: fr.obeo.dsl.debug, - fr.obeo.dsl.debug.impl, - fr.obeo.dsl.debug.util +Export-Package: org.eclipse.gemoc.dsl.debug, + org.eclipse.gemoc.dsl.debug.impl, + org.eclipse.gemoc.dsl.debug.util Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/plugin.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/plugin.xml index b98c2bca2..d06551ce5 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/plugin.xml +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/plugin.xml @@ -20,7 +20,7 @@ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/pom.xml b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/pom.xml index 69e72d503..e088cc907 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/pom.xml +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/pom.xml @@ -13,13 +13,13 @@ Contributors: xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent DSLDebugger 2.3.0-SNAPSHOT ../../ DSLDebugger - fr.obeo.dsl.debug + org.eclipse.gemoc.dsl.debug 2.3.0-SNAPSHOT eclipse-plugin diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Contextual.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Contextual.java index e3bc609d7..9935c57bd 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Contextual.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Contextual.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import org.eclipse.emf.ecore.EObject; @@ -18,11 +18,11 @@ *

    * The following features are supported: *

      - *
    • {@link fr.obeo.dsl.debug.Contextual#getContext Context}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.Contextual#getContext Context}
      • *
    *

    * - * @see fr.obeo.dsl.debug.DebugPackage#getContextual() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getContextual() * @model interface="true" abstract="true" * @generated */ @@ -40,14 +40,14 @@ public interface Contextual extends EObject { * * @return the value of the 'Context' reference. * @see #setContext(EObject) - * @see fr.obeo.dsl.debug.DebugPackage#getContextual_Context() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getContextual_Context() * @model required="true" * @generated */ EObject getContext(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Contextual#getContext Context}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.Contextual#getContext Context}' reference. * * * @param value diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/CurrentSession.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/CurrentSession.java index 1b6720c0d..d542f24e8 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/CurrentSession.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/CurrentSession.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -19,11 +19,11 @@ *

    * The following features are supported: *

      - *
    • {@link fr.obeo.dsl.debug.CurrentSession#getDebugTargets Debug Targets}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.CurrentSession#getDebugTargets Debug Targets}
      • *
    *

    * - * @see fr.obeo.dsl.debug.DebugPackage#getCurrentSession() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getCurrentSession() * @model * @generated */ @@ -37,11 +37,11 @@ public interface CurrentSession extends EObject { /** * Returns the value of the 'Debug Targets' containment reference list. The list contents - * are of type {@link fr.obeo.dsl.debug.DebugTarget}. {@link DebugTarget Debug targets}. * * @return the value of the 'Debug Targets' containment reference list. - * @see fr.obeo.dsl.debug.DebugPackage#getCurrentSession_DebugTargets() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getCurrentSession_DebugTargets() * @model containment="true" * @generated */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugFactory.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugFactory.java index d966ab1dc..faa6845df 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugFactory.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugFactory.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import org.eclipse.emf.ecore.EFactory; @@ -16,7 +16,7 @@ * The Factory for the model. It provides a create method for each non-abstract * class of the model. * - * @see fr.obeo.dsl.debug.DebugPackage + * @see org.eclipse.gemoc.dsl.debug.DebugPackage * @generated */ public interface DebugFactory extends EFactory { @@ -32,7 +32,7 @@ public interface DebugFactory extends EFactory { * * @generated */ - DebugFactory eINSTANCE = fr.obeo.dsl.debug.impl.DebugFactoryImpl.init(); + DebugFactory eINSTANCE = org.eclipse.gemoc.dsl.debug.impl.DebugFactoryImpl.init(); /** * Returns a new object of class 'Target'. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugPackage.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugPackage.java index cd92399d9..57b527647 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugPackage.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugPackage.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -28,7 +28,7 @@ * * * - * @see fr.obeo.dsl.debug.DebugFactory + * @see org.eclipse.gemoc.dsl.debug.DebugFactory * @model kind="package" * @generated */ @@ -66,14 +66,14 @@ public interface DebugPackage extends EPackage { * * @generated */ - DebugPackage eINSTANCE = fr.obeo.dsl.debug.impl.DebugPackageImpl.init(); + DebugPackage eINSTANCE = org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl.init(); /** - * The meta object id for the '{@link fr.obeo.dsl.debug.Contextual Contextual}' class. * - * @see fr.obeo.dsl.debug.Contextual - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getContextual() + * @see org.eclipse.gemoc.dsl.debug.Contextual + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getContextual() * @generated */ int CONTEXTUAL = 0; @@ -97,11 +97,11 @@ public interface DebugPackage extends EPackage { int CONTEXTUAL_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link fr.obeo.dsl.debug.impl.DebugTargetImpl Target}' class. * - * @see fr.obeo.dsl.debug.impl.DebugTargetImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getDebugTarget() + * @see org.eclipse.gemoc.dsl.debug.impl.DebugTargetImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getDebugTarget() * @generated */ int DEBUG_TARGET = 1; @@ -150,11 +150,11 @@ public interface DebugPackage extends EPackage { int DEBUG_TARGET_FEATURE_COUNT = CONTEXTUAL_FEATURE_COUNT + 3; /** - * The meta object id for the '{@link fr.obeo.dsl.debug.impl.ThreadImpl Thread}' class. * - * @see fr.obeo.dsl.debug.impl.ThreadImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getThread() + * @see org.eclipse.gemoc.dsl.debug.impl.ThreadImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getThread() * @generated */ int THREAD = 2; @@ -230,11 +230,11 @@ public interface DebugPackage extends EPackage { int THREAD_FEATURE_COUNT = CONTEXTUAL_FEATURE_COUNT + 6; /** - * The meta object id for the '{@link fr.obeo.dsl.debug.impl.StackFrameImpl Stack Frame}' class. + * The meta object id for the '{@link org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl Stack Frame}' class. * * - * @see fr.obeo.dsl.debug.impl.StackFrameImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getStackFrame() + * @see org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getStackFrame() * @generated */ int STACK_FRAME = 3; @@ -320,11 +320,11 @@ public interface DebugPackage extends EPackage { int STACK_FRAME_FEATURE_COUNT = CONTEXTUAL_FEATURE_COUNT + 7; /** - * The meta object id for the '{@link fr.obeo.dsl.debug.impl.VariableImpl Variable}' class. * - * @see fr.obeo.dsl.debug.impl.VariableImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getVariable() + * @see org.eclipse.gemoc.dsl.debug.impl.VariableImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getVariable() * @generated */ int VARIABLE = 4; @@ -391,11 +391,11 @@ public interface DebugPackage extends EPackage { int VARIABLE_FEATURE_COUNT = 6; /** - * The meta object id for the '{@link fr.obeo.dsl.debug.impl.CurrentSessionImpl Current Session}' + * The meta object id for the '{@link org.eclipse.gemoc.dsl.debug.impl.CurrentSessionImpl Current Session}' * class. * - * @see fr.obeo.dsl.debug.impl.CurrentSessionImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getCurrentSession() + * @see org.eclipse.gemoc.dsl.debug.impl.CurrentSessionImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getCurrentSession() * @generated */ int CURRENT_SESSION = 5; @@ -419,11 +419,11 @@ public interface DebugPackage extends EPackage { int CURRENT_SESSION_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link fr.obeo.dsl.debug.impl.RegisterGroupImpl Register Group}' + * The meta object id for the '{@link org.eclipse.gemoc.dsl.debug.impl.RegisterGroupImpl Register Group}' * class. * - * @see fr.obeo.dsl.debug.impl.RegisterGroupImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getRegisterGroup() + * @see org.eclipse.gemoc.dsl.debug.impl.RegisterGroupImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getRegisterGroup() * @generated */ int REGISTER_GROUP = 6; @@ -455,11 +455,11 @@ public interface DebugPackage extends EPackage { int REGISTER_GROUP_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link fr.obeo.dsl.debug.impl.RegisterImpl Register}' class. * - * @see fr.obeo.dsl.debug.impl.RegisterImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getRegister() + * @see org.eclipse.gemoc.dsl.debug.impl.RegisterImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getRegister() * @generated */ int REGISTER = 7; @@ -535,21 +535,21 @@ public interface DebugPackage extends EPackage { int REGISTER_FEATURE_COUNT = VARIABLE_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link fr.obeo.dsl.debug.DebugTargetState Target State}' enum. + * The meta object id for the '{@link org.eclipse.gemoc.dsl.debug.DebugTargetState Target State}' enum. * * - * @see fr.obeo.dsl.debug.DebugTargetState - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getDebugTargetState() + * @see org.eclipse.gemoc.dsl.debug.DebugTargetState + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getDebugTargetState() * @generated */ int DEBUG_TARGET_STATE = 8; /** - * The meta object id for the '{@link fr.obeo.dsl.debug.State State}' enum. * - * @see fr.obeo.dsl.debug.State - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getState() + * @see org.eclipse.gemoc.dsl.debug.State + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getState() * @generated */ int STATE = 9; @@ -558,59 +558,59 @@ public interface DebugPackage extends EPackage { * The meta object id for the 'Object' data type. * * @see java.lang.Object - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getObject() + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getObject() * @generated */ int OBJECT = 10; /** - * Returns the meta object for class '{@link fr.obeo.dsl.debug.Contextual Contextual}'. * * @return the meta object for class 'Contextual'. - * @see fr.obeo.dsl.debug.Contextual + * @see org.eclipse.gemoc.dsl.debug.Contextual * @generated */ EClass getContextual(); /** - * Returns the meta object for the reference '{@link fr.obeo.dsl.debug.Contextual#getContext + * Returns the meta object for the reference '{@link org.eclipse.gemoc.dsl.debug.Contextual#getContext * Context}'. * * @return the meta object for the reference 'Context'. - * @see fr.obeo.dsl.debug.Contextual#getContext() + * @see org.eclipse.gemoc.dsl.debug.Contextual#getContext() * @see #getContextual() * @generated */ EReference getContextual_Context(); /** - * Returns the meta object for class '{@link fr.obeo.dsl.debug.DebugTarget Target}'. * * @return the meta object for class 'Target'. - * @see fr.obeo.dsl.debug.DebugTarget + * @see org.eclipse.gemoc.dsl.debug.DebugTarget * @generated */ EClass getDebugTarget(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.DebugTarget#getName Name} + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.DebugTarget#getName Name} * '. * * @return the meta object for the attribute 'Name'. - * @see fr.obeo.dsl.debug.DebugTarget#getName() + * @see org.eclipse.gemoc.dsl.debug.DebugTarget#getName() * @see #getDebugTarget() * @generated */ EAttribute getDebugTarget_Name(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.DebugTarget#getState + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.DebugTarget#getState * State}'. * * @return the meta object for the attribute 'State'. - * @see fr.obeo.dsl.debug.DebugTarget#getState() + * @see org.eclipse.gemoc.dsl.debug.DebugTarget#getState() * @see #getDebugTarget() * @generated */ @@ -618,110 +618,110 @@ public interface DebugPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link fr.obeo.dsl.debug.DebugTarget#getThreads Threads}'. * * @return the meta object for the containment reference list 'Threads'. - * @see fr.obeo.dsl.debug.DebugTarget#getThreads() + * @see org.eclipse.gemoc.dsl.debug.DebugTarget#getThreads() * @see #getDebugTarget() * @generated */ EReference getDebugTarget_Threads(); /** - * Returns the meta object for class '{@link fr.obeo.dsl.debug.Thread Thread}'. * * @return the meta object for class 'Thread'. - * @see fr.obeo.dsl.debug.Thread + * @see org.eclipse.gemoc.dsl.debug.Thread * @generated */ EClass getThread(); /** * Returns the meta object for the containment reference ' - * {@link fr.obeo.dsl.debug.Thread#getBottomStackFrame Bottom Stack Frame}'. * * @return the meta object for the containment reference 'Bottom Stack Frame'. - * @see fr.obeo.dsl.debug.Thread#getBottomStackFrame() + * @see org.eclipse.gemoc.dsl.debug.Thread#getBottomStackFrame() * @see #getThread() * @generated */ EReference getThread_BottomStackFrame(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.Thread#getState State}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.Thread#getState State}'. * * * @return the meta object for the attribute 'State'. - * @see fr.obeo.dsl.debug.Thread#getState() + * @see org.eclipse.gemoc.dsl.debug.Thread#getState() * @see #getThread() * @generated */ EAttribute getThread_State(); /** - * Returns the meta object for the reference '{@link fr.obeo.dsl.debug.Thread#getTopStackFrame + * Returns the meta object for the reference '{@link org.eclipse.gemoc.dsl.debug.Thread#getTopStackFrame * Top Stack Frame}'. * * @return the meta object for the reference 'Top Stack Frame'. - * @see fr.obeo.dsl.debug.Thread#getTopStackFrame() + * @see org.eclipse.gemoc.dsl.debug.Thread#getTopStackFrame() * @see #getThread() * @generated */ EReference getThread_TopStackFrame(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.Thread#getName Name}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.Thread#getName Name}'. * * * @return the meta object for the attribute 'Name'. - * @see fr.obeo.dsl.debug.Thread#getName() + * @see org.eclipse.gemoc.dsl.debug.Thread#getName() * @see #getThread() * @generated */ EAttribute getThread_Name(); /** - * Returns the meta object for the container reference '{@link fr.obeo.dsl.debug.Thread#getDebugTarget + * Returns the meta object for the container reference '{@link org.eclipse.gemoc.dsl.debug.Thread#getDebugTarget * Debug Target}'. * * @return the meta object for the container reference 'Debug Target'. - * @see fr.obeo.dsl.debug.Thread#getDebugTarget() + * @see org.eclipse.gemoc.dsl.debug.Thread#getDebugTarget() * @see #getThread() * @generated */ EReference getThread_DebugTarget(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.Thread#getPriority + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.Thread#getPriority * Priority}'. * * @return the meta object for the attribute 'Priority'. - * @see fr.obeo.dsl.debug.Thread#getPriority() + * @see org.eclipse.gemoc.dsl.debug.Thread#getPriority() * @see #getThread() * @generated */ EAttribute getThread_Priority(); /** - * Returns the meta object for class '{@link fr.obeo.dsl.debug.StackFrame Stack Frame}'. * * @return the meta object for class 'Stack Frame'. - * @see fr.obeo.dsl.debug.StackFrame + * @see org.eclipse.gemoc.dsl.debug.StackFrame * @generated */ EClass getStackFrame(); /** * Returns the meta object for the containment reference list ' - * {@link fr.obeo.dsl.debug.StackFrame#getVariables Variables}'. * * @return the meta object for the containment reference list 'Variables'. - * @see fr.obeo.dsl.debug.StackFrame#getVariables() + * @see org.eclipse.gemoc.dsl.debug.StackFrame#getVariables() * @see #getStackFrame() * @generated */ @@ -729,33 +729,33 @@ public interface DebugPackage extends EPackage { /** * Returns the meta object for the containment reference ' - * {@link fr.obeo.dsl.debug.StackFrame#getChildFrame Child Frame}'. * * @return the meta object for the containment reference 'Child Frame'. - * @see fr.obeo.dsl.debug.StackFrame#getChildFrame() + * @see org.eclipse.gemoc.dsl.debug.StackFrame#getChildFrame() * @see #getStackFrame() * @generated */ EReference getStackFrame_ChildFrame(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.StackFrame#getName Name}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.StackFrame#getName Name}'. * * * @return the meta object for the attribute 'Name'. - * @see fr.obeo.dsl.debug.StackFrame#getName() + * @see org.eclipse.gemoc.dsl.debug.StackFrame#getName() * @see #getStackFrame() * @generated */ EAttribute getStackFrame_Name(); /** - * Returns the meta object for the reference '{@link fr.obeo.dsl.debug.StackFrame#getCurrentInstruction + * Returns the meta object for the reference '{@link org.eclipse.gemoc.dsl.debug.StackFrame#getCurrentInstruction * Current Instruction}'. * * @return the meta object for the reference 'Current Instruction'. - * @see fr.obeo.dsl.debug.StackFrame#getCurrentInstruction() + * @see org.eclipse.gemoc.dsl.debug.StackFrame#getCurrentInstruction() * @see #getStackFrame() * @generated */ @@ -763,11 +763,11 @@ public interface DebugPackage extends EPackage { /** * Returns the meta object for the attribute ' - * {@link fr.obeo.dsl.debug.StackFrame#isCanStepIntoCurrentInstruction + * {@link org.eclipse.gemoc.dsl.debug.StackFrame#isCanStepIntoCurrentInstruction * Can Step Into Current Instruction}'. * * @return the meta object for the attribute 'Can Step Into Current Instruction'. - * @see fr.obeo.dsl.debug.StackFrame#isCanStepIntoCurrentInstruction() + * @see org.eclipse.gemoc.dsl.debug.StackFrame#isCanStepIntoCurrentInstruction() * @see #getStackFrame() * @generated */ @@ -775,11 +775,11 @@ public interface DebugPackage extends EPackage { /** * Returns the meta object for the container reference ' - * {@link fr.obeo.dsl.debug.StackFrame#getParentFrame Parent Frame}'. + * {@link org.eclipse.gemoc.dsl.debug.StackFrame#getParentFrame Parent Frame}'. * * * @return the meta object for the container reference 'Parent Frame'. - * @see fr.obeo.dsl.debug.StackFrame#getParentFrame() + * @see org.eclipse.gemoc.dsl.debug.StackFrame#getParentFrame() * @see #getStackFrame() * @generated */ @@ -787,130 +787,130 @@ public interface DebugPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link fr.obeo.dsl.debug.StackFrame#getRegisterGroups Register Groups}'. * * @return the meta object for the containment reference list 'Register Groups'. - * @see fr.obeo.dsl.debug.StackFrame#getRegisterGroups() + * @see org.eclipse.gemoc.dsl.debug.StackFrame#getRegisterGroups() * @see #getStackFrame() * @generated */ EReference getStackFrame_RegisterGroups(); /** - * Returns the meta object for class '{@link fr.obeo.dsl.debug.Variable Variable}'. * * @return the meta object for class 'Variable'. - * @see fr.obeo.dsl.debug.Variable + * @see org.eclipse.gemoc.dsl.debug.Variable * @generated */ EClass getVariable(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.Variable#getName Name}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.Variable#getName Name}'. * * * @return the meta object for the attribute 'Name'. - * @see fr.obeo.dsl.debug.Variable#getName() + * @see org.eclipse.gemoc.dsl.debug.Variable#getName() * @see #getVariable() * @generated */ EAttribute getVariable_Name(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.Variable#getValue Value}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.Variable#getValue Value}'. * * * @return the meta object for the attribute 'Value'. - * @see fr.obeo.dsl.debug.Variable#getValue() + * @see org.eclipse.gemoc.dsl.debug.Variable#getValue() * @see #getVariable() * @generated */ EAttribute getVariable_Value(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.Variable#isValueChanged + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.Variable#isValueChanged * Value Changed}'. * * @return the meta object for the attribute 'Value Changed'. - * @see fr.obeo.dsl.debug.Variable#isValueChanged() + * @see org.eclipse.gemoc.dsl.debug.Variable#isValueChanged() * @see #getVariable() * @generated */ EAttribute getVariable_ValueChanged(); /** - * Returns the meta object for the container reference '{@link fr.obeo.dsl.debug.Variable#getFrame + * Returns the meta object for the container reference '{@link org.eclipse.gemoc.dsl.debug.Variable#getFrame * Frame}'. * * @return the meta object for the container reference 'Frame'. - * @see fr.obeo.dsl.debug.Variable#getFrame() + * @see org.eclipse.gemoc.dsl.debug.Variable#getFrame() * @see #getVariable() * @generated */ EReference getVariable_Frame(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.Variable#getDeclarationType + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.Variable#getDeclarationType * Declaration Type}'. * * @return the meta object for the attribute 'Declaration Type'. - * @see fr.obeo.dsl.debug.Variable#getDeclarationType() + * @see org.eclipse.gemoc.dsl.debug.Variable#getDeclarationType() * @see #getVariable() * @generated */ EAttribute getVariable_DeclarationType(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.Variable#isSupportModifications + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.Variable#isSupportModifications * Support Modifications}'. * * @return the meta object for the attribute 'Support Modifications'. - * @see fr.obeo.dsl.debug.Variable#isSupportModifications() + * @see org.eclipse.gemoc.dsl.debug.Variable#isSupportModifications() * @see #getVariable() * @generated */ EAttribute getVariable_SupportModifications(); /** - * Returns the meta object for class '{@link fr.obeo.dsl.debug.CurrentSession Current Session}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.dsl.debug.CurrentSession Current Session}'. * * * @return the meta object for class 'Current Session'. - * @see fr.obeo.dsl.debug.CurrentSession + * @see org.eclipse.gemoc.dsl.debug.CurrentSession * @generated */ EClass getCurrentSession(); /** * Returns the meta object for the containment reference list ' - * {@link fr.obeo.dsl.debug.CurrentSession#getDebugTargets Debug Targets}'. * * @return the meta object for the containment reference list 'Debug Targets'. - * @see fr.obeo.dsl.debug.CurrentSession#getDebugTargets() + * @see org.eclipse.gemoc.dsl.debug.CurrentSession#getDebugTargets() * @see #getCurrentSession() * @generated */ EReference getCurrentSession_DebugTargets(); /** - * Returns the meta object for class '{@link fr.obeo.dsl.debug.RegisterGroup Register Group}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.dsl.debug.RegisterGroup Register Group}'. * * * @return the meta object for class 'Register Group'. - * @see fr.obeo.dsl.debug.RegisterGroup + * @see org.eclipse.gemoc.dsl.debug.RegisterGroup * @generated */ EClass getRegisterGroup(); /** - * Returns the meta object for the attribute '{@link fr.obeo.dsl.debug.RegisterGroup#getName + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.dsl.debug.RegisterGroup#getName * Name}'. * * @return the meta object for the attribute 'Name'. - * @see fr.obeo.dsl.debug.RegisterGroup#getName() + * @see org.eclipse.gemoc.dsl.debug.RegisterGroup#getName() * @see #getRegisterGroup() * @generated */ @@ -918,54 +918,54 @@ public interface DebugPackage extends EPackage { /** * Returns the meta object for the containment reference list ' - * {@link fr.obeo.dsl.debug.RegisterGroup#getRegisters Registers}'. * * @return the meta object for the containment reference list 'Registers'. - * @see fr.obeo.dsl.debug.RegisterGroup#getRegisters() + * @see org.eclipse.gemoc.dsl.debug.RegisterGroup#getRegisters() * @see #getRegisterGroup() * @generated */ EReference getRegisterGroup_Registers(); /** - * Returns the meta object for class '{@link fr.obeo.dsl.debug.Register Register}'. * * @return the meta object for class 'Register'. - * @see fr.obeo.dsl.debug.Register + * @see org.eclipse.gemoc.dsl.debug.Register * @generated */ EClass getRegister(); /** * Returns the meta object for the container reference ' - * {@link fr.obeo.dsl.debug.Register#getRegisterGroup Register Group}'. + * {@link org.eclipse.gemoc.dsl.debug.Register#getRegisterGroup Register Group}'. * * * @return the meta object for the container reference 'Register Group'. - * @see fr.obeo.dsl.debug.Register#getRegisterGroup() + * @see org.eclipse.gemoc.dsl.debug.Register#getRegisterGroup() * @see #getRegister() * @generated */ EReference getRegister_RegisterGroup(); /** - * Returns the meta object for enum '{@link fr.obeo.dsl.debug.DebugTargetState Target State}'. + * Returns the meta object for enum '{@link org.eclipse.gemoc.dsl.debug.DebugTargetState Target State}'. * * * @return the meta object for enum 'Target State'. - * @see fr.obeo.dsl.debug.DebugTargetState + * @see org.eclipse.gemoc.dsl.debug.DebugTargetState * @generated */ EEnum getDebugTargetState(); /** - * Returns the meta object for enum '{@link fr.obeo.dsl.debug.State State}'. * * @return the meta object for enum 'State'. - * @see fr.obeo.dsl.debug.State + * @see org.eclipse.gemoc.dsl.debug.State * @generated */ EEnum getState(); @@ -1004,11 +1004,11 @@ public interface DebugPackage extends EPackage { */ interface Literals { /** - * The meta object literal for the '{@link fr.obeo.dsl.debug.Contextual Contextual}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.dsl.debug.Contextual Contextual}' class. * * - * @see fr.obeo.dsl.debug.Contextual - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getContextual() + * @see org.eclipse.gemoc.dsl.debug.Contextual + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getContextual() * @generated */ EClass CONTEXTUAL = eINSTANCE.getContextual(); @@ -1022,11 +1022,11 @@ interface Literals { EReference CONTEXTUAL__CONTEXT = eINSTANCE.getContextual_Context(); /** - * The meta object literal for the '{@link fr.obeo.dsl.debug.impl.DebugTargetImpl Target}' + * The meta object literal for the '{@link org.eclipse.gemoc.dsl.debug.impl.DebugTargetImpl Target}' * class. * - * @see fr.obeo.dsl.debug.impl.DebugTargetImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getDebugTarget() + * @see org.eclipse.gemoc.dsl.debug.impl.DebugTargetImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getDebugTarget() * @generated */ EClass DEBUG_TARGET = eINSTANCE.getDebugTarget(); @@ -1056,11 +1056,11 @@ interface Literals { EReference DEBUG_TARGET__THREADS = eINSTANCE.getDebugTarget_Threads(); /** - * The meta object literal for the '{@link fr.obeo.dsl.debug.impl.ThreadImpl Thread}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.dsl.debug.impl.ThreadImpl Thread}' class. * * - * @see fr.obeo.dsl.debug.impl.ThreadImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getThread() + * @see org.eclipse.gemoc.dsl.debug.impl.ThreadImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getThread() * @generated */ EClass THREAD = eINSTANCE.getThread(); @@ -1114,11 +1114,11 @@ interface Literals { EAttribute THREAD__PRIORITY = eINSTANCE.getThread_Priority(); /** - * The meta object literal for the '{@link fr.obeo.dsl.debug.impl.StackFrameImpl Stack Frame} + * The meta object literal for the '{@link org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl Stack Frame} * ' class. * - * @see fr.obeo.dsl.debug.impl.StackFrameImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getStackFrame() + * @see org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getStackFrame() * @generated */ EClass STACK_FRAME = eINSTANCE.getStackFrame(); @@ -1181,11 +1181,11 @@ interface Literals { EReference STACK_FRAME__REGISTER_GROUPS = eINSTANCE.getStackFrame_RegisterGroups(); /** - * The meta object literal for the '{@link fr.obeo.dsl.debug.impl.VariableImpl Variable}' + * The meta object literal for the '{@link org.eclipse.gemoc.dsl.debug.impl.VariableImpl Variable}' * class. * - * @see fr.obeo.dsl.debug.impl.VariableImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getVariable() + * @see org.eclipse.gemoc.dsl.debug.impl.VariableImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getVariable() * @generated */ EClass VARIABLE = eINSTANCE.getVariable(); @@ -1239,11 +1239,11 @@ interface Literals { EAttribute VARIABLE__SUPPORT_MODIFICATIONS = eINSTANCE.getVariable_SupportModifications(); /** - * The meta object literal for the '{@link fr.obeo.dsl.debug.impl.CurrentSessionImpl + * The meta object literal for the '{@link org.eclipse.gemoc.dsl.debug.impl.CurrentSessionImpl * Current Session}' class. * - * @see fr.obeo.dsl.debug.impl.CurrentSessionImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getCurrentSession() + * @see org.eclipse.gemoc.dsl.debug.impl.CurrentSessionImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getCurrentSession() * @generated */ EClass CURRENT_SESSION = eINSTANCE.getCurrentSession(); @@ -1257,11 +1257,11 @@ interface Literals { EReference CURRENT_SESSION__DEBUG_TARGETS = eINSTANCE.getCurrentSession_DebugTargets(); /** - * The meta object literal for the '{@link fr.obeo.dsl.debug.impl.RegisterGroupImpl + * The meta object literal for the '{@link org.eclipse.gemoc.dsl.debug.impl.RegisterGroupImpl * Register Group}' class. * - * @see fr.obeo.dsl.debug.impl.RegisterGroupImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getRegisterGroup() + * @see org.eclipse.gemoc.dsl.debug.impl.RegisterGroupImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getRegisterGroup() * @generated */ EClass REGISTER_GROUP = eINSTANCE.getRegisterGroup(); @@ -1283,11 +1283,11 @@ interface Literals { EReference REGISTER_GROUP__REGISTERS = eINSTANCE.getRegisterGroup_Registers(); /** - * The meta object literal for the '{@link fr.obeo.dsl.debug.impl.RegisterImpl Register}' + * The meta object literal for the '{@link org.eclipse.gemoc.dsl.debug.impl.RegisterImpl Register}' * class. * - * @see fr.obeo.dsl.debug.impl.RegisterImpl - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getRegister() + * @see org.eclipse.gemoc.dsl.debug.impl.RegisterImpl + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getRegister() * @generated */ EClass REGISTER = eINSTANCE.getRegister(); @@ -1301,21 +1301,21 @@ interface Literals { EReference REGISTER__REGISTER_GROUP = eINSTANCE.getRegister_RegisterGroup(); /** - * The meta object literal for the '{@link fr.obeo.dsl.debug.DebugTargetState Target State}' + * The meta object literal for the '{@link org.eclipse.gemoc.dsl.debug.DebugTargetState Target State}' * enum. * - * @see fr.obeo.dsl.debug.DebugTargetState - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getDebugTargetState() + * @see org.eclipse.gemoc.dsl.debug.DebugTargetState + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getDebugTargetState() * @generated */ EEnum DEBUG_TARGET_STATE = eINSTANCE.getDebugTargetState(); /** - * The meta object literal for the '{@link fr.obeo.dsl.debug.State State}' enum. * - * @see fr.obeo.dsl.debug.State - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getState() + * @see org.eclipse.gemoc.dsl.debug.State + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getState() * @generated */ EEnum STATE = eINSTANCE.getState(); @@ -1325,7 +1325,7 @@ interface Literals { * end-user-doc --> * * @see java.lang.Object - * @see fr.obeo.dsl.debug.impl.DebugPackageImpl#getObject() + * @see org.eclipse.gemoc.dsl.debug.impl.DebugPackageImpl#getObject() * @generated */ EDataType OBJECT = eINSTANCE.getObject(); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTarget.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTarget.java index f310ec493..75323e81a 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTarget.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTarget.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import org.eclipse.emf.common.util.EList; @@ -19,14 +19,14 @@ *

    * The following features are supported: *

      - *
    • {@link fr.obeo.dsl.debug.DebugTarget#getName Name}
      • - *
    • {@link fr.obeo.dsl.debug.DebugTarget#getState State}
      • - *
    • {@link fr.obeo.dsl.debug.DebugTarget#getThreads Threads}
      • - *
    • {@link fr.obeo.dsl.debug.DebugTarget#getContext Context}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.DebugTarget#getName Name}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.DebugTarget#getState State}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.DebugTarget#getThreads Threads}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.DebugTarget#getContext Context}
      • *
    *

    * - * @see fr.obeo.dsl.debug.DebugPackage#getDebugTarget() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getDebugTarget() * @model * @generated */ @@ -44,14 +44,14 @@ public interface DebugTarget extends Contextual { * * @return the value of the 'Name' attribute. * @see #setName(String) - * @see fr.obeo.dsl.debug.DebugPackage#getDebugTarget_Name() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getDebugTarget_Name() * @model required="true" * @generated */ String getName(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.DebugTarget#getName Name}' attribute. * * @param value @@ -63,26 +63,26 @@ public interface DebugTarget extends Contextual { /** * Returns the value of the 'State' attribute. The literals are from the enumeration - * {@link fr.obeo.dsl.debug.DebugTargetState}. The current {@link TargetState} of this {@link DebugerTarget}. * * @return the value of the 'State' attribute. - * @see fr.obeo.dsl.debug.DebugTargetState + * @see org.eclipse.gemoc.dsl.debug.DebugTargetState * @see #setState(DebugTargetState) - * @see fr.obeo.dsl.debug.DebugPackage#getDebugTarget_State() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getDebugTarget_State() * @model * @generated */ DebugTargetState getState(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.DebugTarget#getState State}' attribute. * * @param value * the new value of the 'State' attribute. - * @see fr.obeo.dsl.debug.DebugTargetState + * @see org.eclipse.gemoc.dsl.debug.DebugTargetState * @see #getState() * @generated */ @@ -90,17 +90,17 @@ public interface DebugTarget extends Contextual { /** * Returns the value of the 'Threads' containment reference list. The list contents are of - * type {@link fr.obeo.dsl.debug.Thread}. It is bidirectional and its opposite is ' - * {@link fr.obeo.dsl.debug.Thread#getParent Parent}'. Current {@link Thread threads} running in this {@link DebugerTarget}. * * @return the value of the 'Threads' containment reference list. - * @see fr.obeo.dsl.debug.DebugPackage#getDebugTarget_Threads() - * @see fr.obeo.dsl.debug.Thread#getParent + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getDebugTarget_Threads() + * @see org.eclipse.gemoc.dsl.debug.Thread#getParent * @model opposite="parent" containment="true" * @generated */ - EList getThreads(); + EList getThreads(); } // DebugTarget diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTargetState.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTargetState.java index 043e0cb69..a9128b2c6 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTargetState.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/DebugTargetState.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import java.util.Arrays; import java.util.Collections; @@ -21,7 +21,7 @@ * and utility methods for working with them. Possible States * of a {@link DebugTarget} {@link DebugTarget#getState() state}. * - * @see fr.obeo.dsl.debug.DebugPackage#getDebugTargetState() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getDebugTargetState() * @model * @generated */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Register.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Register.java index b9052965c..c6c64422b 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Register.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Register.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; /** * A representation of the model object 'Register'. *

    * If the meaning of the 'Register Group' container reference isn't clear, there really should be @@ -44,15 +44,15 @@ public interface Register extends Variable { * * @return the value of the 'Register Group' container reference. * @see #setRegisterGroup(RegisterGroup) - * @see fr.obeo.dsl.debug.DebugPackage#getRegister_RegisterGroup() - * @see fr.obeo.dsl.debug.RegisterGroup#getRegisters + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getRegister_RegisterGroup() + * @see org.eclipse.gemoc.dsl.debug.RegisterGroup#getRegisters * @model opposite="registers" transient="false" * @generated */ RegisterGroup getRegisterGroup(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Register#getRegisterGroup Register Group}' + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.Register#getRegisterGroup Register Group}' * container reference. * * @param value diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/RegisterGroup.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/RegisterGroup.java index cd3a3a580..bb5c81e0a 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/RegisterGroup.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/RegisterGroup.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -19,12 +19,12 @@ *

    * The following features are supported: *

      - *
    • {@link fr.obeo.dsl.debug.RegisterGroup#getName Name}
      • - *
    • {@link fr.obeo.dsl.debug.RegisterGroup#getRegisters Registers}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.RegisterGroup#getName Name}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.RegisterGroup#getRegisters Registers}
      • *
    *

    * - * @see fr.obeo.dsl.debug.DebugPackage#getRegisterGroup() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getRegisterGroup() * @model * @generated */ @@ -42,14 +42,14 @@ public interface RegisterGroup extends EObject { * * @return the value of the 'Name' attribute. * @see #setName(String) - * @see fr.obeo.dsl.debug.DebugPackage#getRegisterGroup_Name() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getRegisterGroup_Name() * @model required="true" * @generated */ String getName(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.RegisterGroup#getName Name}' attribute. * * @param value @@ -61,14 +61,14 @@ public interface RegisterGroup extends EObject { /** * Returns the value of the 'Registers' containment reference list. The list contents are - * of type {@link fr.obeo.dsl.debug.Register}. It is bidirectional and its opposite is ' - * {@link fr.obeo.dsl.debug.Register#getRegisterGroup Register Group}'. + * of type {@link org.eclipse.gemoc.dsl.debug.Register}. It is bidirectional and its opposite is ' + * {@link org.eclipse.gemoc.dsl.debug.Register#getRegisterGroup Register Group}'. * {@link Register Registers} grouped in this * {@link RegisterGroup}. * * @return the value of the 'Registers' containment reference list. - * @see fr.obeo.dsl.debug.DebugPackage#getRegisterGroup_Registers() - * @see fr.obeo.dsl.debug.Register#getRegisterGroup + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getRegisterGroup_Registers() + * @see org.eclipse.gemoc.dsl.debug.Register#getRegisterGroup * @model opposite="registerGroup" containment="true" * @generated */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/StackFrame.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/StackFrame.java index 51f8c2f05..adb81dddc 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/StackFrame.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/StackFrame.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -20,18 +20,18 @@ *

    * The following features are supported: *

      - *
    • {@link fr.obeo.dsl.debug.StackFrame#getVariables Variables}
      • - *
    • {@link fr.obeo.dsl.debug.StackFrame#getChildFrame Child Frame}
      • - *
    • {@link fr.obeo.dsl.debug.StackFrame#getState State}
      • - *
    • {@link fr.obeo.dsl.debug.StackFrame#getParent Parent}
      • - *
    • {@link fr.obeo.dsl.debug.StackFrame#getName Name}
      • - *
    • {@link fr.obeo.dsl.debug.StackFrame#getCurrentInstruction Current Instruction}
      • - *
    • {@link fr.obeo.dsl.debug.StackFrame#getParentFrame Parent Frame}
      • - *
    • {@link fr.obeo.dsl.debug.StackFrame#getRegisterGroups Register Groups}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.StackFrame#getVariables Variables}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.StackFrame#getChildFrame Child Frame}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.StackFrame#getState State}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.StackFrame#getParent Parent}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.StackFrame#getName Name}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.StackFrame#getCurrentInstruction Current Instruction}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.StackFrame#getParentFrame Parent Frame}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.StackFrame#getRegisterGroups Register Groups}
      • *
    *

    * - * @see fr.obeo.dsl.debug.DebugPackage#getStackFrame() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getStackFrame() * @model * @generated */ @@ -45,12 +45,12 @@ public interface StackFrame extends Contextual { /** * Returns the value of the 'Variables' containment reference list. The list contents are - * of type {@link fr.obeo.dsl.debug.Variable}. {@link Variable Variables} accessible in this {@link StackFrame}. * * @return the value of the 'Variables' containment reference list. - * @see fr.obeo.dsl.debug.DebugPackage#getStackFrame_Variables() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getStackFrame_Variables() * @model containment="true" * @generated */ @@ -58,21 +58,21 @@ public interface StackFrame extends Contextual { /** * Returns the value of the 'Child Frame' containment reference. It is bidirectional and - * its opposite is '{@link fr.obeo.dsl.debug.StackFrame#getParentFrame Parent Frame}'. The current child {@link StackFrame} * of this {@link StackFrame}. * * @return the value of the 'Child Frame' containment reference. * @see #setChildFrame(StackFrame) - * @see fr.obeo.dsl.debug.DebugPackage#getStackFrame_ChildFrame() - * @see fr.obeo.dsl.debug.StackFrame#getParentFrame + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getStackFrame_ChildFrame() + * @see org.eclipse.gemoc.dsl.debug.StackFrame#getParentFrame * @model opposite="parentFrame" containment="true" * @generated */ StackFrame getChildFrame(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.StackFrame#getChildFrame Child Frame}' + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.StackFrame#getChildFrame Child Frame}' * containment reference. * * @param value @@ -88,14 +88,14 @@ public interface StackFrame extends Contextual { * * @return the value of the 'Name' attribute. * @see #setName(String) - * @see fr.obeo.dsl.debug.DebugPackage#getStackFrame_Name() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getStackFrame_Name() * @model required="true" * @generated */ String getName(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.StackFrame#getName Name}' attribute. * * @param value @@ -112,14 +112,14 @@ public interface StackFrame extends Contextual { * * @return the value of the 'Current Instruction' reference. * @see #setCurrentInstruction(EObject) - * @see fr.obeo.dsl.debug.DebugPackage#getStackFrame_CurrentInstruction() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getStackFrame_CurrentInstruction() * @model * @generated */ EObject getCurrentInstruction(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.StackFrame#getCurrentInstruction + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.StackFrame#getCurrentInstruction * Current Instruction}' reference. * * @param value @@ -140,14 +140,14 @@ public interface StackFrame extends Contextual { * * @return the value of the 'Can Step Into Current Instruction' attribute. * @see #setCanStepIntoCurrentInstruction(boolean) - * @see fr.obeo.dsl.debug.DebugPackage#getStackFrame_CanStepIntoCurrentInstruction() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getStackFrame_CanStepIntoCurrentInstruction() * @model default="false" required="true" * @generated */ boolean isCanStepIntoCurrentInstruction(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.StackFrame#isCanStepIntoCurrentInstruction + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.StackFrame#isCanStepIntoCurrentInstruction * Can Step Into Current Instruction}' attribute. * * @param value @@ -159,21 +159,21 @@ public interface StackFrame extends Contextual { /** * Returns the value of the 'Parent Frame' container reference. It is bidirectional and - * its opposite is '{@link fr.obeo.dsl.debug.StackFrame#getChildFrame Child Frame}'. The current parent {@link StackFrame} * of this {@link StackFrame}. * * @return the value of the 'Parent Frame' container reference. * @see #setParentFrame(StackFrame) - * @see fr.obeo.dsl.debug.DebugPackage#getStackFrame_ParentFrame() - * @see fr.obeo.dsl.debug.StackFrame#getChildFrame + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getStackFrame_ParentFrame() + * @see org.eclipse.gemoc.dsl.debug.StackFrame#getChildFrame * @model opposite="childFrame" transient="false" * @generated */ StackFrame getParentFrame(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.StackFrame#getParentFrame Parent Frame}' + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.StackFrame#getParentFrame Parent Frame}' * container reference. * * @param value @@ -185,12 +185,12 @@ public interface StackFrame extends Contextual { /** * Returns the value of the 'Register Groups' containment reference list. The list - * contents are of type {@link fr.obeo.dsl.debug.RegisterGroup}. {@link RegisterGroup Register groups} accessible in this * {@link StackFrame}. * * @return the value of the 'Register Groups' containment reference list. - * @see fr.obeo.dsl.debug.DebugPackage#getStackFrame_RegisterGroups() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getStackFrame_RegisterGroups() * @model containment="true" * @generated */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/State.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/State.java index e5445ceac..418803243 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/State.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/State.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import java.util.Arrays; import java.util.Collections; @@ -21,7 +21,7 @@ * utility methods for working with them. Possible States of a * {@link StackFrame} {@link StackFrame#getState() state}. * - * @see fr.obeo.dsl.debug.DebugPackage#getState() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getState() * @model * @generated */ diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Thread.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Thread.java index 6883fb169..b492cc4d3 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Thread.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Thread.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; /** * A representation of the model object 'Thread'. * * @param value @@ -63,25 +63,25 @@ public interface Thread extends Contextual { /** * Returns the value of the 'State' attribute. The literals are from the enumeration - * {@link fr.obeo.dsl.debug.State}. + * {@link org.eclipse.gemoc.dsl.debug.State}. * The current {@link Thread} of this {@link StackFrame}. * * @return the value of the 'State' attribute. - * @see fr.obeo.dsl.debug.State + * @see org.eclipse.gemoc.dsl.debug.State * @see #setState(State) - * @see fr.obeo.dsl.debug.DebugPackage#getThread_State() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getThread_State() * @model required="true" * @generated */ State getState(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Thread#getState State}' attribute. * * @param value * the new value of the 'State' attribute. - * @see fr.obeo.dsl.debug.State + * @see org.eclipse.gemoc.dsl.debug.State * @see #getState() * @generated */ @@ -93,14 +93,14 @@ public interface Thread extends Contextual { * * @return the value of the 'Top Stack Frame' reference. * @see #setTopStackFrame(StackFrame) - * @see fr.obeo.dsl.debug.DebugPackage#getThread_TopStackFrame() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getThread_TopStackFrame() * @model required="true" * @generated */ StackFrame getTopStackFrame(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Thread#getTopStackFrame Top Stack Frame}' + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.Thread#getTopStackFrame Top Stack Frame}' * reference. * * @param value @@ -117,14 +117,14 @@ public interface Thread extends Contextual { * * @return the value of the 'Name' attribute. * @see #setName(String) - * @see fr.obeo.dsl.debug.DebugPackage#getThread_Name() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getThread_Name() * @model required="true" * @generated */ String getName(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Thread#getName Name}' attribute. * * @param value @@ -136,21 +136,21 @@ public interface Thread extends Contextual { /** * Returns the value of the 'Debug Target' container reference. It is bidirectional and - * its opposite is '{@link fr.obeo.dsl.debug.DebugTarget#getThreads Threads}'. The {@link DebugTarget} of this * {@link StackFrame}. * * @return the value of the 'Debug Target' container reference. * @see #setDebugTarget(DebugTarget) - * @see fr.obeo.dsl.debug.DebugPackage#getThread_DebugTarget() - * @see fr.obeo.dsl.debug.DebugTarget#getThreads + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getThread_DebugTarget() + * @see org.eclipse.gemoc.dsl.debug.DebugTarget#getThreads * @model opposite="threads" transient="false" * @generated */ DebugTarget getDebugTarget(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Thread#getDebugTarget Debug Target}' container + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.Thread#getDebugTarget Debug Target}' container * reference. * * @param value @@ -167,14 +167,14 @@ public interface Thread extends Contextual { * * @return the value of the 'Priority' attribute. * @see #setPriority(int) - * @see fr.obeo.dsl.debug.DebugPackage#getThread_Priority() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getThread_Priority() * @model default="0" required="true" * @generated */ int getPriority(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Thread#getPriority Priority}' attribute. * * @param value diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Variable.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Variable.java index 2dff680d3..31fe19ff2 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Variable.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/Variable.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import org.eclipse.emf.ecore.EObject; @@ -19,12 +19,12 @@ *

    * The following features are supported: *

      - *
    • {@link fr.obeo.dsl.debug.Variable#getName Name}
      • - *
    • {@link fr.obeo.dsl.debug.Variable#getElements Elements}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.Variable#getName Name}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.Variable#getElements Elements}
      • *
    *

    * - * @see fr.obeo.dsl.debug.DebugPackage#getVariable() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getVariable() * @model * @generated */ @@ -42,14 +42,14 @@ public interface Variable extends EObject { * * @return the value of the 'Name' attribute. * @see #setName(String) - * @see fr.obeo.dsl.debug.DebugPackage#getVariable_Name() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getVariable_Name() * @model required="true" * @generated */ String getName(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Variable#getName Name}' attribute. * * @param value @@ -65,14 +65,14 @@ public interface Variable extends EObject { * * @return the value of the 'Value' attribute. * @see #setValue(Object) - * @see fr.obeo.dsl.debug.DebugPackage#getVariable_Value() - * @model dataType="fr.obeo.dsl.debug.Object" transient="true" + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getVariable_Value() + * @model dataType="org.eclipse.gemoc.dsl.debug.Object" transient="true" * @generated */ Object getValue(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Variable#getValue Value}' attribute. * * @param value @@ -93,14 +93,14 @@ public interface Variable extends EObject { * * @return the value of the 'Value Changed' attribute. * @see #setValueChanged(boolean) - * @see fr.obeo.dsl.debug.DebugPackage#getVariable_ValueChanged() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getVariable_ValueChanged() * @model default="false" required="true" * @generated */ boolean isValueChanged(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Variable#isValueChanged Value Changed}' + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.Variable#isValueChanged Value Changed}' * attribute. * * @param value @@ -112,7 +112,7 @@ public interface Variable extends EObject { /** * Returns the value of the 'Frame' container reference. It is bidirectional and its - * opposite is '{@link fr.obeo.dsl.debug.StackFrame#getVariables Variables}'. *

    * If the meaning of the 'Frame' container reference isn't clear, there really should be more of @@ -122,15 +122,15 @@ public interface Variable extends EObject { * * @return the value of the 'Frame' container reference. * @see #setFrame(StackFrame) - * @see fr.obeo.dsl.debug.DebugPackage#getVariable_Frame() - * @see fr.obeo.dsl.debug.StackFrame#getVariables + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getVariable_Frame() + * @see org.eclipse.gemoc.dsl.debug.StackFrame#getVariables * @model opposite="variables" transient="false" * @generated */ StackFrame getFrame(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Variable#getFrame Frame}' container reference. + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.Variable#getFrame Frame}' container reference. * * * @param value @@ -146,14 +146,14 @@ public interface Variable extends EObject { * * @return the value of the 'Declaration Type' attribute. * @see #setDeclarationType(String) - * @see fr.obeo.dsl.debug.DebugPackage#getVariable_DeclarationType() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getVariable_DeclarationType() * @model required="true" * @generated */ String getDeclarationType(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Variable#getDeclarationType Declaration Type}' + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.Variable#getDeclarationType Declaration Type}' * attribute. * * @param value @@ -170,14 +170,14 @@ public interface Variable extends EObject { * * @return the value of the 'Support Modifications' attribute. * @see #setSupportModifications(boolean) - * @see fr.obeo.dsl.debug.DebugPackage#getVariable_SupportModifications() + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#getVariable_SupportModifications() * @model required="true" * @generated */ boolean isSupportModifications(); /** - * Sets the value of the '{@link fr.obeo.dsl.debug.Variable#isSupportModifications + * Sets the value of the '{@link org.eclipse.gemoc.dsl.debug.Variable#isSupportModifications * Support Modifications}' attribute. * * @param value diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/CurrentSessionImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/CurrentSessionImpl.java index 2fc57888c..b056d519f 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/CurrentSessionImpl.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/CurrentSessionImpl.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.impl; +package org.eclipse.gemoc.dsl.debug.impl; -import fr.obeo.dsl.debug.CurrentSession; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.CurrentSession; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; import java.util.Collection; @@ -30,7 +30,7 @@ *

    * The following features are implemented: *

      - *
    • {@link fr.obeo.dsl.debug.impl.CurrentSessionImpl#getDebugTargets Debug Targets}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.CurrentSessionImpl#getDebugTargets Debug Targets}
      • *
    *

    * diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugFactoryImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugFactoryImpl.java index bdcc7571d..7a8eb88dc 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugFactoryImpl.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugFactoryImpl.java @@ -8,18 +8,18 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.impl; +package org.eclipse.gemoc.dsl.debug.impl; -import fr.obeo.dsl.debug.CurrentSession; -import fr.obeo.dsl.debug.DebugFactory; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetState; -import fr.obeo.dsl.debug.Register; -import fr.obeo.dsl.debug.RegisterGroup; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.State; -import fr.obeo.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.CurrentSession; +import org.eclipse.gemoc.dsl.debug.DebugFactory; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetState; +import org.eclipse.gemoc.dsl.debug.Register; +import org.eclipse.gemoc.dsl.debug.RegisterGroup; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.State; +import org.eclipse.gemoc.dsl.debug.Variable; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -147,7 +147,7 @@ public DebugTarget createDebugTarget() { * * @generated */ - public fr.obeo.dsl.debug.Thread createThread() { + public org.eclipse.gemoc.dsl.debug.Thread createThread() { ThreadImpl thread = new ThreadImpl(); return thread; } diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugPackageImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugPackageImpl.java index ed8e4aef2..7339acffc 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugPackageImpl.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugPackageImpl.java @@ -8,19 +8,19 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.impl; - -import fr.obeo.dsl.debug.Contextual; -import fr.obeo.dsl.debug.CurrentSession; -import fr.obeo.dsl.debug.DebugFactory; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetState; -import fr.obeo.dsl.debug.Register; -import fr.obeo.dsl.debug.RegisterGroup; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.State; -import fr.obeo.dsl.debug.Variable; +package org.eclipse.gemoc.dsl.debug.impl; + +import org.eclipse.gemoc.dsl.debug.Contextual; +import org.eclipse.gemoc.dsl.debug.CurrentSession; +import org.eclipse.gemoc.dsl.debug.DebugFactory; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetState; +import org.eclipse.gemoc.dsl.debug.Register; +import org.eclipse.gemoc.dsl.debug.RegisterGroup; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.State; +import org.eclipse.gemoc.dsl.debug.Variable; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -129,7 +129,7 @@ public class DebugPackageImpl extends EPackageImpl implements DebugPackage { * exists. * * @see org.eclipse.emf.ecore.EPackage.Registry - * @see fr.obeo.dsl.debug.DebugPackage#eNS_URI + * @see org.eclipse.gemoc.dsl.debug.DebugPackage#eNS_URI * @see #init() * @generated */ @@ -655,26 +655,26 @@ public void initializePackageContents() { null, 0, -1, DebugTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(threadEClass, fr.obeo.dsl.debug.Thread.class, "Thread", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(threadEClass, org.eclipse.gemoc.dsl.debug.Thread.class, "Thread", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getThread_BottomStackFrame(), this.getStackFrame(), null, "bottomStackFrame", null, 1, - 1, fr.obeo.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + 1, org.eclipse.gemoc.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getThread_State(), this.getState(), "state", null, 1, 1, - fr.obeo.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, + org.eclipse.gemoc.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getThread_TopStackFrame(), this.getStackFrame(), null, "topStackFrame", null, 1, 1, - fr.obeo.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + org.eclipse.gemoc.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getThread_Name(), ecorePackage.getEString(), "name", null, 1, 1, - fr.obeo.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, + org.eclipse.gemoc.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getThread_DebugTarget(), this.getDebugTarget(), this.getDebugTarget_Threads(), - "debugTarget", null, 1, 1, fr.obeo.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, + "debugTarget", null, 1, 1, org.eclipse.gemoc.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getThread_Priority(), ecorePackage.getEInt(), "priority", "0", 1, 1, - fr.obeo.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, + org.eclipse.gemoc.dsl.debug.Thread.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(stackFrameEClass, StackFrame.class, "StackFrame", !IS_ABSTRACT, !IS_INTERFACE, diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugTargetImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugTargetImpl.java index 1963c56a2..2ce2e7355 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugTargetImpl.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/DebugTargetImpl.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.impl; +package org.eclipse.gemoc.dsl.debug.impl; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetState; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetState; import java.util.Collection; @@ -33,10 +33,10 @@ *

    * The following features are implemented: *

      - *
    • {@link fr.obeo.dsl.debug.impl.DebugTargetImpl#getName Name}
      • - *
    • {@link fr.obeo.dsl.debug.impl.DebugTargetImpl#getState State}
      • - *
    • {@link fr.obeo.dsl.debug.impl.DebugTargetImpl#getThreads Threads}
      • - *
    • {@link fr.obeo.dsl.debug.impl.DebugTargetImpl#getContext Context}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.DebugTargetImpl#getName Name}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.DebugTargetImpl#getState State}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.DebugTargetImpl#getThreads Threads}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.DebugTargetImpl#getContext Context}
      • *
    *

    * @@ -108,7 +108,7 @@ public class DebugTargetImpl extends EObjectImpl implements DebugTarget { * @generated * @ordered */ - protected EList threads; + protected EList threads; /** * @@ -178,10 +178,10 @@ public void setState(DebugTargetState newState) { * * @generated */ - public EList getThreads() { + public EList getThreads() { if (threads == null) { - threads = new EObjectContainmentWithInverseEList( - fr.obeo.dsl.debug.Thread.class, this, DebugPackage.DEBUG_TARGET__THREADS, + threads = new EObjectContainmentWithInverseEList( + org.eclipse.gemoc.dsl.debug.Thread.class, this, DebugPackage.DEBUG_TARGET__THREADS, DebugPackage.THREAD__DEBUG_TARGET); } return threads; @@ -299,7 +299,7 @@ public void eSet(int featureID, Object newValue) { return; case DebugPackage.DEBUG_TARGET__THREADS: getThreads().clear(); - getThreads().addAll((Collection)newValue); + getThreads().addAll((Collection)newValue); return; } super.eSet(featureID, newValue); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterGroupImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterGroupImpl.java index 54f4cd3bc..9126410a9 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterGroupImpl.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterGroupImpl.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.impl; +package org.eclipse.gemoc.dsl.debug.impl; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.Register; -import fr.obeo.dsl.debug.RegisterGroup; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.Register; +import org.eclipse.gemoc.dsl.debug.RegisterGroup; import java.util.Collection; @@ -32,8 +32,8 @@ *

    * The following features are implemented: *

      - *
    • {@link fr.obeo.dsl.debug.impl.RegisterGroupImpl#getName Name}
      • - *
    • {@link fr.obeo.dsl.debug.impl.RegisterGroupImpl#getRegisters Registers}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.RegisterGroupImpl#getName Name}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.RegisterGroupImpl#getRegisters Registers}
      • *
    *

    * diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterImpl.java index 50cdc4cca..26b566783 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterImpl.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/RegisterImpl.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.impl; +package org.eclipse.gemoc.dsl.debug.impl; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.Register; -import fr.obeo.dsl.debug.RegisterGroup; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.Register; +import org.eclipse.gemoc.dsl.debug.RegisterGroup; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -27,7 +27,7 @@ *

    * The following features are implemented: *

      - *
    • {@link fr.obeo.dsl.debug.impl.RegisterImpl#getRegisterGroup Register Group}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.RegisterImpl#getRegisterGroup Register Group}
      • *
    *

    * diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/StackFrameImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/StackFrameImpl.java index b6d26b6e6..483ae8779 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/StackFrameImpl.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/StackFrameImpl.java @@ -8,12 +8,12 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.impl; +package org.eclipse.gemoc.dsl.debug.impl; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.RegisterGroup; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.RegisterGroup; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.Variable; import java.util.Collection; @@ -36,15 +36,15 @@ *

    * The following features are implemented: *

      - *
    • {@link fr.obeo.dsl.debug.impl.StackFrameImpl#getContext Context}
      • - *
    • {@link fr.obeo.dsl.debug.impl.StackFrameImpl#getVariables Variables}
      • - *
    • {@link fr.obeo.dsl.debug.impl.StackFrameImpl#getChildFrame Child Frame}
      • - *
    • {@link fr.obeo.dsl.debug.impl.StackFrameImpl#getName Name}
      • - *
    • {@link fr.obeo.dsl.debug.impl.StackFrameImpl#getCurrentInstruction Current Instruction}
      • - *
    • {@link fr.obeo.dsl.debug.impl.StackFrameImpl#isCanStepIntoCurrentInstruction Can Step Into Current + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl#getContext Context}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl#getVariables Variables}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl#getChildFrame Child Frame}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl#getName Name}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl#getCurrentInstruction Current Instruction}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl#isCanStepIntoCurrentInstruction Can Step Into Current * Instruction}
      • - *
    • {@link fr.obeo.dsl.debug.impl.StackFrameImpl#getParentFrame Parent Frame}
      • - *
    • {@link fr.obeo.dsl.debug.impl.StackFrameImpl#getRegisterGroups Register Groups}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl#getParentFrame Parent Frame}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.StackFrameImpl#getRegisterGroups Register Groups}
      • *
    *

    * diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/ThreadImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/ThreadImpl.java index 1b59bcdc8..1fb9e87a5 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/ThreadImpl.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/ThreadImpl.java @@ -8,12 +8,12 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.impl; +package org.eclipse.gemoc.dsl.debug.impl; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.State; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.State; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -30,18 +30,18 @@ *

    * The following features are implemented: *

      - *
    • {@link fr.obeo.dsl.debug.impl.ThreadImpl#getBottomStackFrame Bottom Stack Frame}
      • - *
    • {@link fr.obeo.dsl.debug.impl.ThreadImpl#getTopStackFrame Top Stack Frame}
      • - *
    • {@link fr.obeo.dsl.debug.impl.ThreadImpl#getName Name}
      • - *
    • {@link fr.obeo.dsl.debug.impl.ThreadImpl#getParent Parent}
      • - *
    • {@link fr.obeo.dsl.debug.impl.ThreadImpl#getBreakpoints Breakpoints}
      • - *
    • {@link fr.obeo.dsl.debug.impl.ThreadImpl#getContext Context}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.ThreadImpl#getBottomStackFrame Bottom Stack Frame}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.ThreadImpl#getTopStackFrame Top Stack Frame}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.ThreadImpl#getName Name}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.ThreadImpl#getParent Parent}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.ThreadImpl#getBreakpoints Breakpoints}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.ThreadImpl#getContext Context}
      • *
    *

    * * @generated */ -public class ThreadImpl extends EObjectImpl implements fr.obeo.dsl.debug.Thread { +public class ThreadImpl extends EObjectImpl implements org.eclipse.gemoc.dsl.debug.Thread { /** * * diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/VariableImpl.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/VariableImpl.java index fe2eac406..757bce044 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/VariableImpl.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/impl/VariableImpl.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.impl; +package org.eclipse.gemoc.dsl.debug.impl; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.Variable; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -28,8 +28,8 @@ *

    * The following features are implemented: *

      - *
    • {@link fr.obeo.dsl.debug.impl.VariableImpl#getName Name}
      • - *
    • {@link fr.obeo.dsl.debug.impl.VariableImpl#getElements Elements}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.VariableImpl#getName Name}
      • + *
    • {@link org.eclipse.gemoc.dsl.debug.impl.VariableImpl#getElements Elements}
      • *
    *

    * diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugAdapterFactory.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugAdapterFactory.java index a666d66d0..7bce0e094 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugAdapterFactory.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugAdapterFactory.java @@ -8,16 +8,16 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.util; +package org.eclipse.gemoc.dsl.debug.util; -import fr.obeo.dsl.debug.Contextual; -import fr.obeo.dsl.debug.CurrentSession; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.Register; -import fr.obeo.dsl.debug.RegisterGroup; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.Contextual; +import org.eclipse.gemoc.dsl.debug.CurrentSession; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.Register; +import org.eclipse.gemoc.dsl.debug.RegisterGroup; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.Variable; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -28,7 +28,7 @@ * The Adapter Factory for the model. It provides an adapter * createXXX method for each class of the model. * - * @see fr.obeo.dsl.debug.DebugPackage + * @see org.eclipse.gemoc.dsl.debug.DebugPackage * @generated */ public class DebugAdapterFactory extends AdapterFactoryImpl { @@ -94,7 +94,7 @@ public Adapter caseDebugTarget(DebugTarget object) { } @Override - public Adapter caseThread(fr.obeo.dsl.debug.Thread object) { + public Adapter caseThread(org.eclipse.gemoc.dsl.debug.Thread object) { return createThreadAdapter(); } @@ -143,12 +143,12 @@ public Adapter createAdapter(Notifier target) { } /** - * Creates a new adapter for an object of class '{@link fr.obeo.dsl.debug.Contextual Contextual} + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.dsl.debug.Contextual Contextual} * '. This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.obeo.dsl.debug.Contextual + * @see org.eclipse.gemoc.dsl.debug.Contextual * @generated */ public Adapter createContextualAdapter() { @@ -156,12 +156,12 @@ public Adapter createContextualAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.obeo.dsl.debug.DebugTarget Target}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.dsl.debug.DebugTarget Target}'. * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.obeo.dsl.debug.DebugTarget + * @see org.eclipse.gemoc.dsl.debug.DebugTarget * @generated */ public Adapter createDebugTargetAdapter() { @@ -169,12 +169,12 @@ public Adapter createDebugTargetAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.obeo.dsl.debug.Thread Thread}'. This default implementation returns null so that we can easily ignore cases; it's * useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.obeo.dsl.debug.Thread + * @see org.eclipse.gemoc.dsl.debug.Thread * @generated */ public Adapter createThreadAdapter() { @@ -182,12 +182,12 @@ public Adapter createThreadAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.obeo.dsl.debug.StackFrame Stack Frame} + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.dsl.debug.StackFrame Stack Frame} * '. This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.obeo.dsl.debug.StackFrame + * @see org.eclipse.gemoc.dsl.debug.StackFrame * @generated */ public Adapter createStackFrameAdapter() { @@ -195,12 +195,12 @@ public Adapter createStackFrameAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.obeo.dsl.debug.Variable Variable}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.dsl.debug.Variable Variable}'. * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.obeo.dsl.debug.Variable + * @see org.eclipse.gemoc.dsl.debug.Variable * @generated */ public Adapter createVariableAdapter() { @@ -208,13 +208,13 @@ public Adapter createVariableAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.obeo.dsl.debug.CurrentSession + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.dsl.debug.CurrentSession * Current Session}'. This default implementation returns null so that we * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. * * * @return the new adapter. - * @see fr.obeo.dsl.debug.CurrentSession + * @see org.eclipse.gemoc.dsl.debug.CurrentSession * @generated */ public Adapter createCurrentSessionAdapter() { @@ -222,13 +222,13 @@ public Adapter createCurrentSessionAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.obeo.dsl.debug.RegisterGroup + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.dsl.debug.RegisterGroup * Register Group}'. This default implementation returns null so that we * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. * * * @return the new adapter. - * @see fr.obeo.dsl.debug.RegisterGroup + * @see org.eclipse.gemoc.dsl.debug.RegisterGroup * @generated */ public Adapter createRegisterGroupAdapter() { @@ -236,12 +236,12 @@ public Adapter createRegisterGroupAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.obeo.dsl.debug.Register Register}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.dsl.debug.Register Register}'. * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.obeo.dsl.debug.Register + * @see org.eclipse.gemoc.dsl.debug.Register * @generated */ public Adapter createRegisterAdapter() { diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugSwitch.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugSwitch.java index 62ea77b0d..f97c4b687 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugSwitch.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src-gen/org/eclipse/gemoc/dsl/debug/util/DebugSwitch.java @@ -8,16 +8,16 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.util; +package org.eclipse.gemoc.dsl.debug.util; -import fr.obeo.dsl.debug.Contextual; -import fr.obeo.dsl.debug.CurrentSession; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.Register; -import fr.obeo.dsl.debug.RegisterGroup; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.Contextual; +import org.eclipse.gemoc.dsl.debug.CurrentSession; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.Register; +import org.eclipse.gemoc.dsl.debug.RegisterGroup; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.Variable; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -29,7 +29,7 @@ * model, starting with the actual class of the object and proceeding up the inheritance hierarchy until a * non-null result is returned, which is the result of the switch. * - * @see fr.obeo.dsl.debug.DebugPackage + * @see org.eclipse.gemoc.dsl.debug.DebugPackage * @generated */ public class DebugSwitch extends Switch { @@ -97,7 +97,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { return result; } case DebugPackage.THREAD: { - fr.obeo.dsl.debug.Thread thread = (fr.obeo.dsl.debug.Thread)theEObject; + org.eclipse.gemoc.dsl.debug.Thread thread = (org.eclipse.gemoc.dsl.debug.Thread)theEObject; T result = caseThread(thread); if (result == null) result = caseContextual(thread); @@ -190,7 +190,7 @@ public T caseDebugTarget(DebugTarget object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseThread(fr.obeo.dsl.debug.Thread object) { + public T caseThread(org.eclipse.gemoc.dsl.debug.Thread object) { return null; } diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/DebugTargetUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/DebugTargetUtils.java index 388e1b259..cd782be6a 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/DebugTargetUtils.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/DebugTargetUtils.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import org.eclipse.emf.ecore.EObject; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/ThreadUtils.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/ThreadUtils.java index 35b20b5c4..487508f19 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/ThreadUtils.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug/src/org/eclipse/gemoc/dsl/debug/ThreadUtils.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug; +package org.eclipse.gemoc.dsl.debug; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; diff --git a/simulationmodelanimation/pom.xml b/simulationmodelanimation/pom.xml index 390ffa48f..c94ddbaef 100644 --- a/simulationmodelanimation/pom.xml +++ b/simulationmodelanimation/pom.xml @@ -12,7 +12,7 @@ DSLDebugger - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent 2.3.0-SNAPSHOT pom @@ -33,20 +33,20 @@ - plugins/fr.obeo.dsl.debug - plugins/fr.obeo.dsl.debug.edit - plugins/fr.obeo.dsl.debug.ide - plugins/fr.obeo.dsl.debug.ide.sirius.ui - plugins/fr.obeo.dsl.debug.ide.ui + plugins/org.eclipse.gemoc.dsl.debug + plugins/org.eclipse.gemoc.dsl.debug.edit + plugins/org.eclipse.gemoc.dsl.debug.ide + plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui + plugins/org.eclipse.gemoc.dsl.debug.ide.ui - tests/fr.obeo.dsl.debug.tests - + tests/org.eclipse.gemoc.dsl.debug.tests + - releng/fr.obeo.dsl.debug.feature - releng/fr.obeo.dsl.debug.ui.feature - releng/fr.obeo.dsl.debug.sirius.ui.feature + releng/org.eclipse.gemoc.dsl.debug.feature + releng/org.eclipse.gemoc.dsl.debug.ui.feature + releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature @@ -90,7 +90,7 @@ ${project.artifactId} ${project.version} - ../../releng/fr.obeo.dsl.debug.target/dsldebug-neon + ../../releng/org.eclipse.gemoc.dsl.debug.target/dsldebug-neon diff --git a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/.project b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/.project index 7b5e2333d..7eb2ae543 100644 --- a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/.project +++ b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.feature + org.eclipse.gemoc.dsl.debug.feature diff --git a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/feature.xml b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/feature.xml index cb6761c2c..20db1a649 100644 --- a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/feature.xml +++ b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.feature/feature.xml @@ -1,6 +1,6 @@ @@ -25,21 +25,21 @@ Contributors: 4.0.0 - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent DSLDebugger 2.3.0-SNAPSHOT ../../ DSLDebugger - fr.obeo.dsl.debug.feature + org.eclipse.gemoc.dsl.debug.feature 2.3.0-SNAPSHOT eclipse-feature diff --git a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/.project b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/.project index f356efa5b..c11d989d6 100644 --- a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/.project +++ b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.sirius.ui.feature + org.eclipse.gemoc.dsl.debug.sirius.ui.feature diff --git a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/feature.xml b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/feature.xml index 2487ddedf..e7365884e 100644 --- a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/feature.xml +++ b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.sirius.ui.feature/feature.xml @@ -1,6 +1,6 @@ @@ -25,7 +25,7 @@ Contributors: 4.0.0 - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent DSLDebugger 2.3.0-SNAPSHOT ../../ DSLDebugger - fr.obeo.dsl.debug.sirius.ui.feature + org.eclipse.gemoc.dsl.debug.sirius.ui.feature 2.3.0-SNAPSHOT eclipse-feature diff --git a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/.project b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/.project index 1b9b2ab8e..45c3782e3 100644 --- a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/.project +++ b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.target/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.target + org.eclipse.gemoc.dsl.debug.target diff --git a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/.project b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/.project index 3f01338ae..0800288a6 100644 --- a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/.project +++ b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.ui.feature + org.eclipse.gemoc.dsl.debug.ui.feature diff --git a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/feature.xml b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/feature.xml index cfd62f90d..4943c2f8d 100644 --- a/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/feature.xml +++ b/simulationmodelanimation/releng/org.eclipse.gemoc.dsl.debug.ui.feature/feature.xml @@ -1,6 +1,6 @@ @@ -26,7 +26,7 @@ Contributors: 4.0.0 - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent DSLDebugger 2.3.0-SNAPSHOT ../../ DSLDebugger - fr.obeo.dsl.debug.ui.feature + org.eclipse.gemoc.dsl.debug.ui.feature 2.3.0-SNAPSHOT eclipse-feature diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.project b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.project index 91d3c9f02..a332b6032 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.project +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.ide.tests + org.eclipse.gemoc.dsl.debug.ide.tests diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/META-INF/MANIFEST.MF b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/META-INF/MANIFEST.MF index e27e50116..55cf97412 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.obeo.dsl.debug.ide.tests +Bundle-SymbolicName: org.eclipse.gemoc.dsl.debug.ide.tests Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName -Require-Bundle: fr.obeo.dsl.debug.ide;bundle-version="1.0.0", - fr.obeo.dsl.debug;bundle-version="1.0.0", +Require-Bundle: org.eclipse.gemoc.dsl.debug.ide;bundle-version="1.0.0", + org.eclipse.gemoc.dsl.debug;bundle-version="1.0.0", org.eclipse.debug.core;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", - fr.obeo.dsl.debug.tests;bundle-version="1.0.0", + org.eclipse.gemoc.dsl.debug.tests;bundle-version="1.0.0", org.junit;bundle-version="4.0.0" diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/pom.xml b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/pom.xml index 428f42364..baafd0497 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/pom.xml +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/pom.xml @@ -13,13 +13,13 @@ Contributors: xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent DSLDebugger 2.3.0-SNAPSHOT ../../ DSLDebugger - fr.obeo.dsl.debug.ide.tests + org.eclipse.gemoc.dsl.debug.ide.tests 2.3.0-SNAPSHOT eclipse-test-plugin diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/AllTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/AllTests.java index 2082315a4..277fbf506 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/AllTests.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/AllTests.java @@ -8,16 +8,16 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.tests; +package org.eclipse.gemoc.dsl.debug.ide.tests; -import fr.obeo.dsl.debug.ide.tests.adapter.AdapterTests; +import org.eclipse.gemoc.dsl.debug.ide.tests.adapter.AdapterTests; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; /** - * Aggregates tests for the fr.obeo.dsl.debug.ide plug-in. + * Aggregates tests for the org.eclipse.gemoc.dsl.debug.ide plug-in. * * @author Yvan Lussaud */ diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/DSLDebuggerTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/DSLDebuggerTests.java index d5123445b..de8a0301a 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/DSLDebuggerTests.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/DSLDebuggerTests.java @@ -8,23 +8,23 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.tests; - -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.Variable; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEvent; -import fr.obeo.dsl.debug.ide.event.debugger.TerminatedReply; -import fr.obeo.dsl.debug.ide.event.model.DisconnectRequest; -import fr.obeo.dsl.debug.ide.event.model.ResumeRequest; -import fr.obeo.dsl.debug.ide.event.model.SetVariableValueRequest; -import fr.obeo.dsl.debug.ide.event.model.StartRequest; -import fr.obeo.dsl.debug.ide.event.model.StepIntoRequest; -import fr.obeo.dsl.debug.ide.event.model.StepOverRequest; -import fr.obeo.dsl.debug.ide.event.model.StepReturnRequest; -import fr.obeo.dsl.debug.ide.event.model.SuspendRequest; -import fr.obeo.dsl.debug.ide.event.model.TerminateRequest; -import fr.obeo.dsl.debug.ide.event.model.ValidateVariableValueRequest; -import fr.obeo.dsl.debug.ide.tests.event.TestEventProcessor; +package org.eclipse.gemoc.dsl.debug.ide.tests; + +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.Variable; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.TerminatedReply; +import org.eclipse.gemoc.dsl.debug.ide.event.model.DisconnectRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.ResumeRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.SetVariableValueRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StartRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StepIntoRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StepOverRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StepReturnRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.SuspendRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.TerminateRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.ValidateVariableValueRequest; +import org.eclipse.gemoc.dsl.debug.ide.tests.event.TestEventProcessor; import org.junit.Test; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertTrue; /** - * Tests {@link fr.obeo.dsl.debug.ide.AbstractDSLDebugger AbstractDSLDebugger} class. + * Tests {@link org.eclipse.gemoc.dsl.debug.ide.AbstractDSLDebugger AbstractDSLDebugger} class. * * @author Yvan Lussaud */ @@ -40,7 +40,7 @@ public class DSLDebuggerTests { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventStartRequest() { @@ -54,7 +54,7 @@ public void handleEventStartRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventTerminateRequest() { @@ -73,7 +73,7 @@ public void handleEventTerminateRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventTerminateThreadRequest() { @@ -88,7 +88,7 @@ public void handleEventTerminateThreadRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventSuspendRequest() { @@ -102,7 +102,7 @@ public void handleEventSuspendRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventSuspendThreadRequest() { @@ -117,7 +117,7 @@ public void handleEventSuspendThreadRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventResume() { @@ -131,7 +131,7 @@ public void handleEventResume() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventResumeThreadRequest() { @@ -146,7 +146,7 @@ public void handleEventResumeThreadRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventStepIntoRequest() { @@ -163,7 +163,7 @@ public void handleEventStepIntoRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventStepOverRequest() { @@ -180,7 +180,7 @@ public void handleEventStepOverRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventStepReturnRequest() { @@ -197,7 +197,7 @@ public void handleEventStepReturnRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventDisconnectRequest() { @@ -214,7 +214,7 @@ public void handleEventDisconnectRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventSetVariableValueRequest() { @@ -232,7 +232,7 @@ public void handleEventSetVariableValueRequest() { /** * Tests - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. */ @Test public void handleEventValidateVariableValueRequest() { diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/TestDSLDebugger.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/TestDSLDebugger.java index 8a6755a6e..88a76f8f4 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/TestDSLDebugger.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/TestDSLDebugger.java @@ -8,11 +8,11 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.tests; +package org.eclipse.gemoc.dsl.debug.ide.tests; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.ide.AbstractDSLDebugger; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.ide.AbstractDSLDebugger; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor; import org.eclipse.emf.ecore.EObject; @@ -79,86 +79,86 @@ public void run() { public static final EObject[] INSTRUCTIONS = new EObject[] {INSTRUCTION_1, INSTRUCTION_2, INSTRUCTION_3, }; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#disconnect()} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#disconnect()} call has been made. */ private boolean disconnectCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#start()} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#start()} call has been made. */ private boolean startCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#stepInto(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepInto(String)} call has been made. */ private boolean stepIntoCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#stepOver(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepOver(String)} call has been made. */ private boolean stepOverCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#stepReturn(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepReturn(String)} call has been made. */ private boolean stepReturnCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#resume()} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#resume()} call has been made. */ private boolean resumeCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#resume(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#resume(String)} call has been made. */ private boolean resumeThreadCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#suspend()} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#suspend()} call has been made. */ private boolean suspendCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#suspend(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#suspend(String)} call has been made. */ private boolean suspendThreadCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#terminate()} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#terminate()} call has been made. */ private boolean terminateCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#terminate(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#terminate(String)} call has been made. */ private boolean terminateThreadCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#updateData(String, EObject)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#updateData(String, EObject)} call has been made. */ private boolean updateDataCall; /** * A call to - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#getNextInstruction(String, EObject, fr.obeo.dsl.debug.ide.IDSLDebugger.Stepping)} + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#getNextInstruction(String, EObject, org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger.Stepping)} * call has been made. */ private boolean getNextInstructionCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#validateVariableValue(String, String, String)} call + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#validateVariableValue(String, String, String)} call * has been made. */ private boolean validateVariableValueCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#getVariableValue(String, String, String, String)} + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#getVariableValue(String, String, String, String)} * call has been made. */ private boolean getVariableValueCall; /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#setVariableValue(String, String, String, Object)} + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#setVariableValue(String, String, String, Object)} * call has been made. */ private boolean setVariableValueCall; @@ -167,8 +167,8 @@ public void run() { * Constructor. * * @param target - * the {@link fr.obeo.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous - * communication or the {@link fr.obeo.dsl.debug.ide.DSLDebugTargetAdapter target} for + * the {@link org.eclipse.gemoc.dsl.debug.ide.event.DSLDebugEventDispatcher dispatcher} for asynchronous + * communication or the {@link org.eclipse.gemoc.dsl.debug.ide.DSLDebugTargetAdapter target} for * synchronous communication */ public TestDSLDebugger(IDSLDebugEventProcessor target) { @@ -178,7 +178,7 @@ public TestDSLDebugger(IDSLDebugEventProcessor target) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.fr.obeo.dsl.debug.ide.IDSLDebugger#start() + * @see org.eclipse.gemoc.dsl.debug.ide.org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#start() */ public void start() { startCall = true; @@ -189,7 +189,7 @@ public void start() { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.fr.obeo.dsl.debug.ide.IDSLDebugger#disconnect() + * @see org.eclipse.gemoc.dsl.debug.ide.org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#disconnect() */ public void disconnect() { disconnectCall = true; @@ -252,7 +252,7 @@ public void terminate(String threadName) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.fr.obeo.dsl.debug.ide.IDSLDebugger#canStepInto(java.lang.String, + * @see org.eclipse.gemoc.dsl.debug.ide.org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#canStepInto(java.lang.String, * org.eclipse.emf.ecore.EObject) */ public boolean canStepInto(String threadName, EObject instruction) { @@ -262,7 +262,7 @@ public boolean canStepInto(String threadName, EObject instruction) { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.fr.obeo.dsl.debug.ide.IDSLDebugger#updateData(java.lang.String, + * @see org.eclipse.gemoc.dsl.debug.ide.org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#updateData(java.lang.String, * org.eclipse.emf.ecore.EObject) */ public void updateData(String threadName, EObject instruction) { @@ -290,9 +290,9 @@ public void setVariableValue(String threadName, String stackName, String variabl } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#disconnect()} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#disconnect()} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#disconnect()} has been + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#disconnect()} has been * made. */ public boolean hasDisconnectCall() { @@ -300,9 +300,9 @@ public boolean hasDisconnectCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#start()} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#start()} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#start()} has been + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#start()} has been * made. */ public boolean hasStartCall() { @@ -310,9 +310,9 @@ public boolean hasStartCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#stepInto(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepInto(String)} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#stepInto(String)} has + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepInto(String)} has * been made. */ public boolean hasStepIntoCall() { @@ -320,9 +320,9 @@ public boolean hasStepIntoCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#stepOver(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepOver(String)} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#stepOver(String)} has + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepOver(String)} has * been made. */ public boolean hasStepOverCall() { @@ -330,9 +330,9 @@ public boolean hasStepOverCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#stepReturn(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepReturn(String)} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#stepReturn(String)} + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#stepReturn(String)} * has been made. */ public boolean hasStepReturnCall() { @@ -340,9 +340,9 @@ public boolean hasStepReturnCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#resume()} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#resume()} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#resume()} has been + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#resume()} has been * made. */ public boolean hasResumeCall() { @@ -350,9 +350,9 @@ public boolean hasResumeCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#resume(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#resume(String)} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#resume(String)} has + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#resume(String)} has * been made. */ public boolean hasResumeThreadCall() { @@ -360,9 +360,9 @@ public boolean hasResumeThreadCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#suspend()} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#suspend()} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#suspend()} has been + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#suspend()} has been * made. */ public boolean hasSuspendCall() { @@ -370,9 +370,9 @@ public boolean hasSuspendCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#suspend(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#suspend(String)} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#suspend(String)} has + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#suspend(String)} has * been made. */ public boolean hasSuspendThreadCall() { @@ -380,9 +380,9 @@ public boolean hasSuspendThreadCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#terminate()} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#terminate()} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#terminate()} has been + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#terminate()} has been * made. */ public boolean hasTerminateCall() { @@ -390,9 +390,9 @@ public boolean hasTerminateCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#terminate(String)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#terminate(String)} call has been made. * - * @return true if a call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#terminate(String)} has + * @return true if a call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#terminate(String)} has * been made. */ public boolean hasTerminateThreadCall() { @@ -400,10 +400,10 @@ public boolean hasTerminateThreadCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#updateData(String, EObject)} call has been made. + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#updateData(String, EObject)} call has been made. * * @return true if a call to - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#updateData(String, EObject)} has been made + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#updateData(String, EObject)} has been made */ public boolean hasUpdateDataCall() { return updateDataCall; @@ -411,11 +411,11 @@ public boolean hasUpdateDataCall() { /** * A call to - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#getNextInstruction(String, EObject, fr.obeo.dsl.debug.ide.IDSLDebugger.Stepping)} + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#getNextInstruction(String, EObject, org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger.Stepping)} * call has been made. * * @return true if a call to - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#getNextInstruction(String, EObject, fr.obeo.dsl.debug.ide.IDSLDebugger.Stepping)} + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#getNextInstruction(String, EObject, org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger.Stepping)} * has been made */ public boolean hasGetNextInstructionCall() { @@ -423,11 +423,11 @@ public boolean hasGetNextInstructionCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#validateVariableValue(String, String, String)} call + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#validateVariableValue(String, String, String)} call * has been made. * * @return true if a call to - * {@link fr.obeo.dsl.debug.ide.IDSLDebugger#validateVariableValue(String, String, String)} call + * {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#validateVariableValue(String, String, String)} call * has been made */ public boolean hasValidateVariableValueCall() { @@ -435,7 +435,7 @@ public boolean hasValidateVariableValueCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#getVariableValue(String, String, String, String)} + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#getVariableValue(String, String, String, String)} * call has been made. */ public boolean hasGetVariableValueCall() { @@ -443,7 +443,7 @@ public boolean hasGetVariableValueCall() { } /** - * A call to {@link fr.obeo.dsl.debug.ide.IDSLDebugger#setVariableValue(String, String, String, Object)} + * A call to {@link org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger#setVariableValue(String, String, String, Object)} * call has been made. */ public boolean hasSetVariableValueCall() { diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/AdapterTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/AdapterTests.java index 535b969b9..cfa4a48ae 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/AdapterTests.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/AdapterTests.java @@ -8,14 +8,14 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.tests.adapter; +package org.eclipse.gemoc.dsl.debug.ide.tests.adapter; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; /** - * Aggregates tests fr.obeo.dsl.debug.ide.tests.adapter package. + * Aggregates tests org.eclipse.gemoc.dsl.debug.ide.tests.adapter package. * * @author Yvan Lussaud */ diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/DSLDebugTargetAdapterTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/DSLDebugTargetAdapterTests.java index f197191fa..c5c31be01 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/DSLDebugTargetAdapterTests.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/DSLDebugTargetAdapterTests.java @@ -8,36 +8,36 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.tests.adapter; - -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetState; -import fr.obeo.dsl.debug.ThreadUtils; -import fr.obeo.dsl.debug.ide.DSLEclipseDebugIntegration; -import fr.obeo.dsl.debug.ide.ModelUpdater; -import fr.obeo.dsl.debug.ide.adapter.DSLDebugTargetAdapter; -import fr.obeo.dsl.debug.ide.event.debugger.BreakpointReply; -import fr.obeo.dsl.debug.ide.event.debugger.DeleteVariableReply; -import fr.obeo.dsl.debug.ide.event.debugger.PopStackFrameReply; -import fr.obeo.dsl.debug.ide.event.debugger.PushStackFrameReply; -import fr.obeo.dsl.debug.ide.event.debugger.ResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.SetCurrentInstructionReply; -import fr.obeo.dsl.debug.ide.event.debugger.SetVariableValueReply; -import fr.obeo.dsl.debug.ide.event.debugger.SpawnRunningThreadReply; -import fr.obeo.dsl.debug.ide.event.debugger.StepIntoResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.StepOverResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.StepReturnResumingReply; -import fr.obeo.dsl.debug.ide.event.debugger.SteppedReply; -import fr.obeo.dsl.debug.ide.event.debugger.SuspendedReply; -import fr.obeo.dsl.debug.ide.event.debugger.TerminatedReply; -import fr.obeo.dsl.debug.ide.event.debugger.VariableReply; -import fr.obeo.dsl.debug.ide.event.model.ResumeRequest; -import fr.obeo.dsl.debug.ide.event.model.StartRequest; -import fr.obeo.dsl.debug.ide.event.model.SuspendRequest; -import fr.obeo.dsl.debug.ide.event.model.TerminateRequest; -import fr.obeo.dsl.debug.ide.tests.event.TestEventProcessor; -import fr.obeo.dsl.debug.tests.AbstractDebugTests; +package org.eclipse.gemoc.dsl.debug.ide.tests.adapter; + +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetState; +import org.eclipse.gemoc.dsl.debug.ThreadUtils; +import org.eclipse.gemoc.dsl.debug.ide.DSLEclipseDebugIntegration; +import org.eclipse.gemoc.dsl.debug.ide.ModelUpdater; +import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLDebugTargetAdapter; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.BreakpointReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.DeleteVariableReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.PopStackFrameReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.PushStackFrameReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.ResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SetCurrentInstructionReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SetVariableValueReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SpawnRunningThreadReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.StepIntoResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.StepOverResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.StepReturnResumingReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SteppedReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.SuspendedReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.TerminatedReply; +import org.eclipse.gemoc.dsl.debug.ide.event.debugger.VariableReply; +import org.eclipse.gemoc.dsl.debug.ide.event.model.ResumeRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.StartRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.SuspendRequest; +import org.eclipse.gemoc.dsl.debug.ide.event.model.TerminateRequest; +import org.eclipse.gemoc.dsl.debug.ide.tests.event.TestEventProcessor; +import org.eclipse.gemoc.dsl.debug.tests.AbstractDebugTests; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; @@ -220,7 +220,7 @@ public void getName() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -265,7 +265,7 @@ public void handleEventSuspendedReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -310,7 +310,7 @@ public void handleEventSteppedReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -355,7 +355,7 @@ public void handleEventBreakpointReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -392,7 +392,7 @@ public void handleEventTerminatedReplyThread() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -427,7 +427,7 @@ public void handleEventTerminatedReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -466,7 +466,7 @@ public void handleEventSpawnRunningThreadReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -511,7 +511,7 @@ public void handleEventResumingReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -560,7 +560,7 @@ public void handleEventStepReturnResumingReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -605,7 +605,7 @@ public void handleEventStepOverResumingReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -652,7 +652,7 @@ public void handleEventStepIntoResumingReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -694,7 +694,7 @@ public void handleEventVariableReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -737,7 +737,7 @@ public void handleEventDeleteVariableReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -780,7 +780,7 @@ public void handleEventPushStackFrameReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -825,7 +825,7 @@ public void handleEventPopStackFrameReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail @@ -867,7 +867,7 @@ public void handleEventSetCurrentInstructionReply() throws DebugException { } /** - * Test {@link DSLDebugTargetAdapter#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent)}. + * Test {@link DSLDebugTargetAdapter#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent)}. * * @throws DebugException * if fail diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/TestDebugEventSetListener.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/TestDebugEventSetListener.java index 60f52ba2f..a06870065 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/TestDebugEventSetListener.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/adapter/TestDebugEventSetListener.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.tests.adapter; +package org.eclipse.gemoc.dsl.debug.ide.tests.adapter; import java.util.ArrayList; import java.util.List; diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/event/TestEventProcessor.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/event/TestEventProcessor.java index eee11a9b2..9fc2d4e6c 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/event/TestEventProcessor.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.ide.tests/src/org/eclipse/gemoc/dsl/debug/ide/tests/event/TestEventProcessor.java @@ -8,10 +8,10 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.ide.tests.event; +package org.eclipse.gemoc.dsl.debug.ide.tests.event; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEvent; -import fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent; +import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor; import java.util.ArrayList; import java.util.List; @@ -32,7 +32,7 @@ public class TestEventProcessor implements IDSLDebugEventProcessor { /** * {@inheritDoc} * - * @see fr.obeo.dsl.debug.ide.event.IDSLDebugEventProcessor#handleEvent(fr.obeo.dsl.debug.ide.event.IDSLDebugEvent) + * @see org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor#handleEvent(org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEvent) */ public Object handleEvent(IDSLDebugEvent event) { events.add(event); diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.project b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.project index 4e4c17afc..e1be638f2 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.project +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/.project @@ -1,6 +1,6 @@ - fr.obeo.dsl.debug.tests + org.eclipse.gemoc.dsl.debug.tests diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/META-INF/MANIFEST.MF b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/META-INF/MANIFEST.MF index 6f5bbec61..7a963974f 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.obeo.dsl.debug.tests;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.dsl.debug.tests;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Require-Bundle: fr.obeo.dsl.debug;bundle-version="1.0.0", +Require-Bundle: org.eclipse.gemoc.dsl.debug;bundle-version="1.0.0", org.junit;bundle-version="4.0.0" -Export-Package: fr.obeo.dsl.debug.tests +Export-Package: org.eclipse.gemoc.dsl.debug.tests diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/pom.xml b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/pom.xml index 3b819815a..27754d6d9 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/pom.xml +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/pom.xml @@ -13,13 +13,13 @@ Contributors: xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - fr.obeo.dsl.debug.parent + org.eclipse.gemoc.dsl.debug.parent DSLDebugger 2.3.0-SNAPSHOT ../../ DSLDebugger - fr.obeo.dsl.debug.tests + org.eclipse.gemoc.dsl.debug.tests 2.3.0-SNAPSHOT eclipse-test-plugin diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AbstractDebugTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AbstractDebugTests.java index 805a2896a..70a8591d4 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AbstractDebugTests.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AbstractDebugTests.java @@ -8,13 +8,13 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.tests; +package org.eclipse.gemoc.dsl.debug.tests; -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.State; -import fr.obeo.dsl.debug.Thread; +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.State; +import org.eclipse.gemoc.dsl.debug.Thread; /** * Class containing tests utility methods. @@ -72,7 +72,7 @@ public abstract class AbstractDebugTests { protected final int terminatedThreadIndex = 7; /** - * Creates {@link Thread} in the given {@link fr.obeo.dsl.debug.DebugTargetState DebugTargetState}: + * Creates {@link Thread} in the given {@link org.eclipse.gemoc.dsl.debug.DebugTargetState DebugTargetState}: *
      *
    • 0 {@link State#RUNNING}.
      • *
    • 1 {@link State#SUSPENDING}.
      • @@ -85,7 +85,7 @@ public abstract class AbstractDebugTests { *
    * * @param target - * the {@link fr.obeo.dsl.debug.DebugTargetState DebugTargetState} to populate. + * the {@link org.eclipse.gemoc.dsl.debug.DebugTargetState DebugTargetState} to populate. */ protected void createThreads(DebugTarget target) { createRunningThread(target); @@ -100,7 +100,7 @@ protected void createThreads(DebugTarget target) { /** * Creates a {@link State#TERMINATED} {@link Thread} in the given - * {@link fr.obeo.dsl.debug.DebugTargetState DebugTargetState}. + * {@link org.eclipse.gemoc.dsl.debug.DebugTargetState DebugTargetState}. * * @param target * the {@link DebugTarget} @@ -120,7 +120,7 @@ protected void createTerminatedThread(DebugTarget target) { /** * Creates a {@link State#TERMINATING} {@link Thread} in the given - * {@link fr.obeo.dsl.debug.DebugTargetState DebugTargetState}. + * {@link org.eclipse.gemoc.dsl.debug.DebugTargetState DebugTargetState}. * * @param target * the {@link DebugTarget} @@ -140,7 +140,7 @@ protected void createTerminatingThread(DebugTarget target) { /** * Creates a {@link State#STEPPING_RETURN} {@link Thread} in the given - * {@link fr.obeo.dsl.debug.DebugTargetState DebugTargetState}. + * {@link org.eclipse.gemoc.dsl.debug.DebugTargetState DebugTargetState}. * * @param target * the {@link DebugTarget} @@ -160,7 +160,7 @@ protected void createSteppingReturnThread(DebugTarget target) { /** * Creates a {@link State#STEPPING_OVER} {@link Thread} in the given - * {@link fr.obeo.dsl.debug.DebugTargetState DebugTargetState}. + * {@link org.eclipse.gemoc.dsl.debug.DebugTargetState DebugTargetState}. * * @param target * the {@link DebugTarget} @@ -180,7 +180,7 @@ protected void createSteppingOverThread(DebugTarget target) { /** * Creates a {@link State#STEPPING_INTO} {@link Thread} in the given - * {@link fr.obeo.dsl.debug.DebugTargetState DebugTargetState}. + * {@link org.eclipse.gemoc.dsl.debug.DebugTargetState DebugTargetState}. * * @param target * the {@link DebugTarget} @@ -200,7 +200,7 @@ protected void createSteppingIntoThread(DebugTarget target) { /** * Creates a {@link State#SUSPENDED} {@link Thread} in the given - * {@link fr.obeo.dsl.debug.DebugTargetState DebugTargetState}. + * {@link org.eclipse.gemoc.dsl.debug.DebugTargetState DebugTargetState}. * * @param target * the {@link DebugTarget} @@ -220,7 +220,7 @@ protected void createSuspendedThread(DebugTarget target) { /** * Creates a {@link State#SUSPENDING} {@link Thread} in the given - * {@link fr.obeo.dsl.debug.DebugTargetState DebugTargetState}. + * {@link org.eclipse.gemoc.dsl.debug.DebugTargetState DebugTargetState}. * * @param target * the {@link DebugTarget} @@ -239,7 +239,7 @@ protected void createSuspendingThread(DebugTarget target) { } /** - * Creates a {@link State#RUNNING} {@link Thread} in the given {@link fr.obeo.dsl.debug.DebugTargetState + * Creates a {@link State#RUNNING} {@link Thread} in the given {@link org.eclipse.gemoc.dsl.debug.DebugTargetState * DebugTargetState}. * * @param target diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AllTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AllTests.java index 6f56b6f48..9c253d448 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AllTests.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/AllTests.java @@ -8,14 +8,14 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.tests; +package org.eclipse.gemoc.dsl.debug.tests; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; /** - * Aggregates tests for the fr.obeo.dsl.debug plug-in. + * Aggregates tests for the org.eclipse.gemoc.dsl.debug plug-in. * * @author Yvan Lussaud */ diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/DebugTargetUtilsTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/DebugTargetUtilsTests.java index 6a4e2a22a..ea609dcaa 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/DebugTargetUtilsTests.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/DebugTargetUtilsTests.java @@ -8,14 +8,14 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.tests; - -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetState; -import fr.obeo.dsl.debug.DebugTargetUtils; -import fr.obeo.dsl.debug.State; -import fr.obeo.dsl.debug.Thread; +package org.eclipse.gemoc.dsl.debug.tests; + +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetState; +import org.eclipse.gemoc.dsl.debug.DebugTargetUtils; +import org.eclipse.gemoc.dsl.debug.State; +import org.eclipse.gemoc.dsl.debug.Thread; import org.eclipse.emf.ecore.EObject; import org.junit.Test; diff --git a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/ThreadUtilsTests.java b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/ThreadUtilsTests.java index 2702e856e..b2a472baa 100644 --- a/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/ThreadUtilsTests.java +++ b/simulationmodelanimation/tests/org.eclipse.gemoc.dsl.debug.tests/src/org/eclipse/gemoc/dsl/debug/tests/ThreadUtilsTests.java @@ -8,16 +8,16 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package fr.obeo.dsl.debug.tests; - -import fr.obeo.dsl.debug.DebugPackage; -import fr.obeo.dsl.debug.DebugTarget; -import fr.obeo.dsl.debug.DebugTargetState; -import fr.obeo.dsl.debug.StackFrame; -import fr.obeo.dsl.debug.State; -import fr.obeo.dsl.debug.Thread; -import fr.obeo.dsl.debug.ThreadUtils; -import fr.obeo.dsl.debug.Variable; +package org.eclipse.gemoc.dsl.debug.tests; + +import org.eclipse.gemoc.dsl.debug.DebugPackage; +import org.eclipse.gemoc.dsl.debug.DebugTarget; +import org.eclipse.gemoc.dsl.debug.DebugTargetState; +import org.eclipse.gemoc.dsl.debug.StackFrame; +import org.eclipse.gemoc.dsl.debug.State; +import org.eclipse.gemoc.dsl.debug.Thread; +import org.eclipse.gemoc.dsl.debug.ThreadUtils; +import org.eclipse.gemoc.dsl.debug.Variable; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EcorePackage; diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF index 2bccf5358..8ec003849 100644 --- a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF @@ -18,8 +18,8 @@ Require-Bundle: org.eclipse.gemoc.timeline;bundle-version="1.0.0", org.eclipse.emf.compare, org.eclipse.debug.ui, org.eclipse.gemoc.executionframework.engine.ui, - fr.obeo.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", - fr.obeo.dsl.debug.ide, + org.eclipse.gemoc.dsl.debug.ide.sirius.ui;bundle-version="1.0.0", + org.eclipse.gemoc.dsl.debug.ide, org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.executionframework.debugger Import-Package: javafx.animation;version="2.0.0", From ec940a73812e916d27a09b87d1ed4574545cae89 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 11:13:36 +0200 Subject: [PATCH 236/267] rename fr.inria.diverse.trace* in org.eclipse.gemoc.trace --- .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../model/GenericTrace.aird | 0 .../model/GenericTrace.ecore | 0 .../model/GenericTrace.genmodel | 0 .../model/GenericTraceImpl.ecore | 0 .../model/GenericTraceImpl.genmodel | 0 .../model/LaunchConfiguration.ecore | 0 .../model/LaunchConfiguration.genmodel | 0 .../model/trace class diagram.png | Bin .../model/trace class diagram.svg | 0 .../plugin.properties | 0 .../plugin.properties~ | 0 .../plugin.xml | 0 .../pom.xml | 0 .../model/generictrace/BooleanAttributeValue.java | 0 .../model/generictrace/GenericAttributeValue.java | 0 .../model/generictrace/GenericDimension.java | 0 .../model/generictrace/GenericParallelStep.java | 0 .../model/generictrace/GenericReferenceValue.java | 0 .../model/generictrace/GenericSequentialStep.java | 0 .../model/generictrace/GenericSmallStep.java | 0 .../commons/model/generictrace/GenericState.java | 0 .../commons/model/generictrace/GenericStep.java | 0 .../commons/model/generictrace/GenericTrace.java | 0 .../model/generictrace/GenericTracedObject.java | 0 .../commons/model/generictrace/GenericValue.java | 0 .../model/generictrace/GenerictraceFactory.java | 0 .../model/generictrace/GenerictracePackage.java | 0 .../model/generictrace/IntegerAttributeValue.java | 0 .../generictrace/IntegerObjectAttributeValue.java | 0 .../generictrace/ManyBooleanAttributeValue.java | 0 .../generictrace/ManyIntegerAttributeValue.java | 0 .../model/generictrace/ManyReferenceValue.java | 0 .../generictrace/ManyStringAttributeValue.java | 0 .../model/generictrace/SingleReferenceValue.java | 0 .../model/generictrace/StringAttributeValue.java | 0 .../impl/BooleanAttributeValueImpl.java | 0 .../impl/GenericAttributeValueImpl.java | 0 .../generictrace/impl/GenericDimensionImpl.java | 0 .../generictrace/impl/GenericParallelStepImpl.java | 0 .../impl/GenericReferenceValueImpl.java | 0 .../impl/GenericSequentialStepImpl.java | 0 .../generictrace/impl/GenericSmallStepImpl.java | 0 .../model/generictrace/impl/GenericStateImpl.java | 0 .../model/generictrace/impl/GenericStepImpl.java | 0 .../model/generictrace/impl/GenericTraceImpl.java | 0 .../generictrace/impl/GenericTracedObjectImpl.java | 0 .../model/generictrace/impl/GenericValueImpl.java | 0 .../generictrace/impl/GenerictraceFactoryImpl.java | 0 .../generictrace/impl/GenerictracePackageImpl.java | 0 .../impl/IntegerAttributeValueImpl.java | 0 .../impl/IntegerObjectAttributeValueImpl.java | 0 .../impl/ManyBooleanAttributeValueImpl.java | 0 .../impl/ManyIntegerAttributeValueImpl.java | 0 .../generictrace/impl/ManyReferenceValueImpl.java | 0 .../impl/ManyStringAttributeValueImpl.java | 0 .../generictrace/impl/SingleReferenceValueImpl.java | 0 .../generictrace/impl/StringAttributeValueImpl.java | 0 .../util/GenerictraceAdapterFactory.java | 0 .../model/generictrace/util/GenerictraceSwitch.java | 0 .../trace/commons/model/helper/StepHelper.java | 0 .../AddonExtensionParameter.java | 0 .../launchconfiguration/AnimatorURIParameter.java | 0 .../launchconfiguration/EntryPointParameter.java | 0 .../InitializationArgumentsParameter.java | 0 .../InitializationMethodParameter.java | 0 .../launchconfiguration/LanguageNameParameter.java | 0 .../launchconfiguration/LaunchConfiguration.java | 0 .../LaunchConfigurationParameter.java | 0 .../LaunchconfigurationFactory.java | 0 .../LaunchconfigurationPackage.java | 0 .../launchconfiguration/ModelRootParameter.java | 0 .../launchconfiguration/ModelURIParameter.java | 0 .../impl/AddonExtensionParameterImpl.java | 0 .../impl/AnimatorURIParameterImpl.java | 0 .../impl/EntryPointParameterImpl.java | 0 .../impl/InitializationArgumentsParameterImpl.java | 0 .../impl/InitializationMethodParameterImpl.java | 0 .../impl/LanguageNameParameterImpl.java | 0 .../impl/LaunchConfigurationImpl.java | 0 .../impl/LaunchConfigurationParameterImpl.java | 0 .../impl/LaunchconfigurationFactoryImpl.java | 0 .../impl/LaunchconfigurationPackageImpl.java | 0 .../impl/ModelRootParameterImpl.java | 0 .../impl/ModelURIParameterImpl.java | 0 .../util/LaunchconfigurationAdapterFactory.java | 0 .../util/LaunchconfigurationSwitch.java | 0 .../gemoc}/trace/commons/model/trace/BigStep.java | 0 .../gemoc}/trace/commons/model/trace/Dimension.java | 0 .../trace/commons/model/trace/GenericMSE.java | 0 .../gemoc}/trace/commons/model/trace/MSE.java | 0 .../gemoc}/trace/commons/model/trace/MSEModel.java | 0 .../trace/commons/model/trace/MSEOccurrence.java | 0 .../trace/commons/model/trace/ParallelStep.java | 0 .../trace/commons/model/trace/SequentialStep.java | 0 .../gemoc}/trace/commons/model/trace/SmallStep.java | 0 .../gemoc}/trace/commons/model/trace/State.java | 0 .../gemoc}/trace/commons/model/trace/Step.java | 0 .../gemoc}/trace/commons/model/trace/Trace.java | 0 .../trace/commons/model/trace/TraceFactory.java | 0 .../trace/commons/model/trace/TracePackage.java | 0 .../trace/commons/model/trace/TracedObject.java | 0 .../gemoc}/trace/commons/model/trace/Value.java | 0 .../trace/commons/model/trace/impl/BigStepImpl.java | 0 .../commons/model/trace/impl/DimensionImpl.java | 0 .../commons/model/trace/impl/GenericMSEImpl.java | 0 .../trace/commons/model/trace/impl/MSEImpl.java | 0 .../commons/model/trace/impl/MSEModelImpl.java | 0 .../commons/model/trace/impl/MSEOccurrenceImpl.java | 0 .../commons/model/trace/impl/ParallelStepImpl.java | 0 .../model/trace/impl/SequentialStepImpl.java | 0 .../commons/model/trace/impl/SmallStepImpl.java | 0 .../trace/commons/model/trace/impl/StateImpl.java | 0 .../trace/commons/model/trace/impl/StepImpl.java | 0 .../commons/model/trace/impl/TraceFactoryImpl.java | 0 .../trace/commons/model/trace/impl/TraceImpl.java | 0 .../commons/model/trace/impl/TracePackageImpl.java | 0 .../commons/model/trace/impl/TracedObjectImpl.java | 0 .../trace/commons/model/trace/impl/ValueImpl.java | 0 .../model/trace/util/TraceAdapterFactory.java | 0 .../trace/commons/model/trace/util/TraceSwitch.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../lib/jdom-2.0.5.jar | Bin .../pom.xml | 0 .../eclipse/gemoc}/trace/commons/CodeGenUtil.java | 0 .../gemoc}/trace/commons/EMFCompareUtil.xtend | 0 .../org/eclipse/gemoc}/trace/commons/EMFUtil.java | 0 .../eclipse/gemoc}/trace/commons/EclipseUtil.xtend | 0 .../gemoc}/trace/commons/EcoreCraftingUtil.xtend | 0 .../commons/ExecutionMetamodelTraceability.xtend | 0 .../eclipse/gemoc}/trace/commons/ManifestUtil.java | 0 .../gemoc}/trace/commons/PluginXMLHelper.java | 0 .../trace/commons/tracemetamodel/StepStrings.xtend | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../pom.xml | 0 .../gemoc/api/IMultiDimensionalTraceAddon.java | 0 .../gemoc}/trace/gemoc/api/IStateManager.java | 0 .../gemoc}/trace/gemoc/api/IStepFactory.java | 0 .../gemoc}/trace/gemoc/api/ITraceConstructor.java | 0 .../gemoc}/trace/gemoc/api/ITraceExplorer.java | 0 .../gemoc}/trace/gemoc/api/ITraceExtractor.java | 0 .../gemoc}/trace/gemoc/api/ITraceListener.java | 0 .../gemoc}/trace/gemoc/api/ITraceNotifier.java | 0 .../gemoc}/trace/gemoc/api/ITraceViewListener.java | 0 .../gemoc}/trace/gemoc/api/ITraceViewNotifier.java | 0 .../.project | 0 .../build.properties | 0 .../feature.xml | 0 .../pom.xml | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../icons/full/obj16/TracingAnnotations.gif | Bin .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../provider/TracingAnnotationsItemProvider.java | 0 .../provider/TracingannotationsEditPlugin.java | 0 ...racingannotationsItemProviderAdapterFactory.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../full/obj16/TracingannotationsModelFile.gif | Bin .../icons/full/wizban/NewTracingannotations.gif | Bin .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../TracingannotationsActionBarContributor.java | 0 .../presentation/TracingannotationsEditor.java | 0 .../TracingannotationsEditorPlugin.java | 0 .../presentation/TracingannotationsModelWizard.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../model/tracingannotations.ecore | 0 .../model/tracingannotations.genmodel | 0 .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../src/tracingannotations/TracingAnnotations.java | 0 .../TracingannotationsFactory.java | 0 .../TracingannotationsPackage.java | 0 .../impl/TracingAnnotationsImpl.java | 0 .../impl/TracingannotationsFactoryImpl.java | 0 .../impl/TracingannotationsPackageImpl.java | 0 .../util/TracingannotationsAdapterFactory.java | 0 .../util/TracingannotationsSwitch.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../pom.xml | 0 .../GenericEngineTraceAddonGenerator.xtend | 0 .../generator/TraceAddonGeneratorIntegration.xtend | 0 .../codegen/StateManagerGeneratorJava.xtend | 0 .../codegen/TraceConstructorGeneratorJava.xtend | 0 .../gemoc/generator/util/ExtensionFilter.xtend | 0 .../gemoc/generator/util/PluginProjectHelper.xtend | 0 .../util/StandaloneEMFProjectGenerator.xtend | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../icons/IconeGemocLanguage-16.png | Bin .../icons/generate-16.png | Bin .../plugin.xml | 0 .../pom.xml | 0 .../eclipse/gemoc}/trace/gemoc/ui/Activator.java | 0 .../commands/XDSMLProject2TraceAddonHandler.xtend | 0 .../trace/gemoc/ui/launch/EcoreFileFilter.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../trace/gemoc/traceaddon/AbstractTraceAddon.xtend | 0 .../trace/gemoc/traceaddon/GenericStateManager.java | 0 .../gemoc/traceaddon/GenericTraceConstructor.java | 0 .../gemoc/traceaddon/GenericTraceEngineAddon.java | 0 .../gemoc/traceaddon/GenericTraceExplorer.java | 0 .../gemoc/traceaddon/GenericTraceExtractor.java | 0 .../gemoc/traceaddon/GenericTraceNotifier.java | 0 .../gemoc/traceaddon/GenericTraceStepFactory.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../model/base.aird | 0 .../model/base.ecore | 0 .../model/base.genmodel | 0 .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 .../src/base/BaseFactory.java | 0 .../src/base/BasePackage.java | 0 .../src/base/SpecificTrace.java | 0 .../src/base/States/SpecificAttributeValue.java | 0 .../src/base/States/SpecificDimension.java | 0 .../src/base/States/SpecificReferenceValue.java | 0 .../src/base/States/SpecificState.java | 0 .../src/base/States/SpecificTracedObject.java | 0 .../src/base/States/SpecificValue.java | 0 .../src/base/States/StatesFactory.java | 0 .../src/base/States/StatesPackage.java | 0 .../src/base/States/impl/SpecificDimensionImpl.java | 0 .../src/base/States/impl/SpecificStateImpl.java | 0 .../base/States/impl/SpecificTracedObjectImpl.java | 0 .../src/base/States/impl/SpecificValueImpl.java | 0 .../src/base/States/impl/StatesFactoryImpl.java | 0 .../src/base/States/impl/StatesPackageImpl.java | 0 .../src/base/States/util/StatesAdapterFactory.java | 0 .../src/base/States/util/StatesSwitch.java | 0 .../src/base/Steps/RootImplicitStep.java | 0 .../src/base/Steps/SpecificRootStep.java | 0 .../src/base/Steps/SpecificStep.java | 0 .../src/base/Steps/StepsFactory.java | 0 .../src/base/Steps/StepsPackage.java | 0 .../src/base/Steps/impl/RootImplicitStepImpl.java | 0 .../src/base/Steps/impl/SpecificRootStepImpl.java | 0 .../src/base/Steps/impl/SpecificStepImpl.java | 0 .../src/base/Steps/impl/StepsFactoryImpl.java | 0 .../src/base/Steps/impl/StepsPackageImpl.java | 0 .../src/base/Steps/util/StepsAdapterFactory.java | 0 .../src/base/Steps/util/StepsSwitch.java | 0 .../src/base/impl/BaseFactoryImpl.java | 0 .../src/base/impl/BasePackageImpl.java | 0 .../src/base/impl/SpecificTraceImpl.java | 0 .../src/base/util/BaseAdapterFactory.java | 0 .../src/base/util/BaseSwitch.java | 0 .../trace/metamodel/generator/TraceMMExplorer.xtend | 0 .../generator/TraceMMGenerationTraceability.xtend | 0 .../metamodel/generator/TraceMMGenerator.xtend | 0 .../generator/TraceMMGeneratorStates.xtend | 0 .../metamodel/generator/TraceMMGeneratorSteps.xtend | 0 .../trace/metamodel/generator/TraceMMStrings.xtend | 0 .../.classpath | 0 .../.project | 0 .../2557-1_4-Clone.launch | 0 .../2557-1_4-Generated.launch | 0 .../2557-1_4-Generic.launch | 0 .../2557-1_4-None.launch | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../ExecutionTraceModelImpl/2557-1_1.trace | 0 .../ExecutionTraceModelImpl/2557-1_2.trace | 0 .../ExecutionTraceModelImpl/2557-1_3.trace | 0 .../ExecutionTraceModelImpl/2557-1_4.trace | 0 .../ExecutionTraceModelImpl/2557-1_5.trace | 0 .../ExecutionTraceModelImpl/2557-1_6.trace | 0 .../ExecutionTraceModelImpl/2557-2_1.trace | 0 .../ExecutionTraceModelImpl/2557-2_2.trace | 0 .../ExecutionTraceModelImpl/2557-2_3.trace | 0 .../ExecutionTraceModelImpl/2557-2_4.trace | 0 .../ExecutionTraceModelImpl/2557-2_5.trace | 0 .../ExecutionTraceModelImpl/2557-2_6.trace | 0 .../ExecutionTraceModelImpl/3561-1_1.trace | 0 .../ExecutionTraceModelImpl/3561-1_2.trace | 0 .../ExecutionTraceModelImpl/3561-1_3.trace | 0 .../ExecutionTraceModelImpl/3561-2_1.trace | 0 .../ExecutionTraceModelImpl/3561-2_2.trace | 0 .../ExecutionTraceModelImpl/3561-2_3.trace | 0 .../ExampleBV1_false_false.trace | 0 .../ExampleBV1_false_true.trace | 0 .../ExampleBV1_true_false.trace | 0 .../ExampleBV1_true_true.trace | 0 .../ExampleBV2_false_false.trace | 0 .../ExampleBV2_false_true.trace | 0 .../ExampleBV2_true_false.trace | 0 .../ExampleBV2_true_true.trace | 0 .../ExampleBV3_false_false_false.trace | 0 .../ExampleBV3_false_false_true.trace | 0 .../ExampleBV3_false_true_false.trace | 0 .../ExampleBV3_false_true_true.trace | 0 .../ExampleBV3_true_false_false.trace | 0 .../ExampleBV3_true_false_true.trace | 0 .../ExampleBV3_true_true_false.trace | 0 .../ExampleBV3_true_true_true.trace | 0 .../ExecutionTraceModelImpl/hireV1_false.trace | 0 .../ExecutionTraceModelImpl/hireV1_true.trace | 0 .../ExecutionTraceModelImpl/hireV2_false.trace | 0 .../ExecutionTraceModelImpl/hireV2_true.trace | 0 .../ExecutionTraceModelImpl/hireV3_false.trace | 0 .../ExecutionTraceModelImpl/hireV3_true.trace | 0 .../ExecutionTraceModelImpl/hireV4_false.trace | 0 .../ExecutionTraceModelImpl/hireV4_true.trace | 0 .../model_traces/GenericTraceImpl/2557-1_1.trace | 0 .../model_traces/GenericTraceImpl/2557-1_2.trace | 0 .../model_traces/GenericTraceImpl/2557-1_3.trace | 0 .../model_traces/GenericTraceImpl/2557-1_4.trace | 0 .../model_traces/GenericTraceImpl/2557-1_5.trace | 0 .../model_traces/GenericTraceImpl/2557-1_6.trace | 0 .../model_traces/GenericTraceImpl/2557-2_1.trace | 0 .../model_traces/GenericTraceImpl/2557-2_2.trace | 0 .../model_traces/GenericTraceImpl/2557-2_3.trace | 0 .../model_traces/GenericTraceImpl/2557-2_4.trace | 0 .../model_traces/GenericTraceImpl/2557-2_5.trace | 0 .../model_traces/GenericTraceImpl/2557-2_6.trace | 0 .../model_traces/GenericTraceImpl/3561-1_1.trace | 0 .../model_traces/GenericTraceImpl/3561-1_2.trace | 0 .../model_traces/GenericTraceImpl/3561-1_3.trace | 0 .../model_traces/GenericTraceImpl/3561-2_1.trace | 0 .../model_traces/GenericTraceImpl/3561-2_2.trace | 0 .../model_traces/GenericTraceImpl/3561-2_3.trace | 0 .../GenericTraceImpl/ExampleBV1_false_false.trace | 0 .../GenericTraceImpl/ExampleBV1_false_true.trace | 0 .../GenericTraceImpl/ExampleBV1_true_false.trace | 0 .../GenericTraceImpl/ExampleBV1_true_true.trace | 0 .../GenericTraceImpl/ExampleBV2_false_false.trace | 0 .../GenericTraceImpl/ExampleBV2_false_true.trace | 0 .../GenericTraceImpl/ExampleBV2_true_false.trace | 0 .../GenericTraceImpl/ExampleBV2_true_true.trace | 0 .../ExampleBV3_false_false_false.trace | 0 .../ExampleBV3_false_false_true.trace | 0 .../ExampleBV3_false_true_false.trace | 0 .../ExampleBV3_false_true_true.trace | 0 .../ExampleBV3_true_false_false.trace | 0 .../ExampleBV3_true_false_true.trace | 0 .../ExampleBV3_true_true_false.trace | 0 .../ExampleBV3_true_true_true.trace | 0 .../GenericTraceImpl/hireV1_false.trace | 0 .../model_traces/GenericTraceImpl/hireV1_true.trace | 0 .../GenericTraceImpl/hireV2_false.trace | 0 .../model_traces/GenericTraceImpl/hireV2_true.trace | 0 .../GenericTraceImpl/hireV3_false.trace | 0 .../model_traces/GenericTraceImpl/hireV3_true.trace | 0 .../GenericTraceImpl/hireV4_false.trace | 0 .../model_traces/GenericTraceImpl/hireV4_true.trace | 0 .../model_traces/SpecificTraceImpl/2557-1_1.trace | 0 .../model_traces/SpecificTraceImpl/2557-1_2.trace | 0 .../model_traces/SpecificTraceImpl/2557-1_3.trace | 0 .../model_traces/SpecificTraceImpl/2557-1_4.trace | 0 .../model_traces/SpecificTraceImpl/2557-1_5.trace | 0 .../model_traces/SpecificTraceImpl/2557-1_6.trace | 0 .../model_traces/SpecificTraceImpl/2557-2_1.trace | 0 .../model_traces/SpecificTraceImpl/2557-2_2.trace | 0 .../model_traces/SpecificTraceImpl/2557-2_3.trace | 0 .../model_traces/SpecificTraceImpl/2557-2_4.trace | 0 .../model_traces/SpecificTraceImpl/2557-2_5.trace | 0 .../model_traces/SpecificTraceImpl/2557-2_6.trace | 0 .../model_traces/SpecificTraceImpl/3561-1_1.trace | 0 .../model_traces/SpecificTraceImpl/3561-1_2.trace | 0 .../model_traces/SpecificTraceImpl/3561-1_3.trace | 0 .../model_traces/SpecificTraceImpl/3561-2_1.trace | 0 .../model_traces/SpecificTraceImpl/3561-2_2.trace | 0 .../model_traces/SpecificTraceImpl/3561-2_3.trace | 0 .../SpecificTraceImpl/ExampleBV1_false_false.trace | 0 .../SpecificTraceImpl/ExampleBV1_false_true.trace | 0 .../SpecificTraceImpl/ExampleBV1_true_false.trace | 0 .../SpecificTraceImpl/ExampleBV1_true_true.trace | 0 .../SpecificTraceImpl/ExampleBV2_false_false.trace | 0 .../SpecificTraceImpl/ExampleBV2_false_true.trace | 0 .../SpecificTraceImpl/ExampleBV2_true_false.trace | 0 .../SpecificTraceImpl/ExampleBV2_true_true.trace | 0 .../ExampleBV3_false_false_false.trace | 0 .../ExampleBV3_false_false_true.trace | 0 .../ExampleBV3_false_true_false.trace | 0 .../ExampleBV3_false_true_true.trace | 0 .../ExampleBV3_true_false_false.trace | 0 .../ExampleBV3_true_false_true.trace | 0 .../ExampleBV3_true_true_false.trace | 0 .../ExampleBV3_true_true_true.trace | 0 .../SpecificTraceImpl/hireV1_false.trace | 0 .../SpecificTraceImpl/hireV1_true.trace | 0 .../SpecificTraceImpl/hireV2_false.trace | 0 .../SpecificTraceImpl/hireV2_true.trace | 0 .../SpecificTraceImpl/hireV3_false.trace | 0 .../SpecificTraceImpl/hireV3_true.trace | 0 .../SpecificTraceImpl/hireV4_false.trace | 0 .../SpecificTraceImpl/hireV4_true.trace | 0 .../models/2557-1_1.aird | 0 .../models/2557-1_1.xsad | 0 .../models/2557-1_2.xsad | 0 .../models/2557-1_3.xsad | 0 .../models/2557-1_4.xsad | 0 .../models/2557-1_5.xsad | 0 .../models/2557-1_6.xsad | 0 .../models/2557-2_1.xsad | 0 .../models/2557-2_2.xsad | 0 .../models/2557-2_3.xsad | 0 .../models/2557-2_4.xsad | 0 .../models/2557-2_5.xsad | 0 .../models/2557-2_6.xsad | 0 .../models/3561-1_1.xsad | 0 .../models/3561-1_2.xsad | 0 .../models/3561-1_3.xsad | 0 .../models/3561-2_1.xsad | 0 .../models/3561-2_2.xsad | 0 .../models/3561-2_3.xsad | 0 .../models/ExampleBV1_false_false.xsad | 0 .../models/ExampleBV1_false_true.xsad | 0 .../models/ExampleBV1_true_false.xsad | 0 .../models/ExampleBV1_true_true.xsad | 0 .../models/ExampleBV2_false_false.xsad | 0 .../models/ExampleBV2_false_true.xsad | 0 .../models/ExampleBV2_true_false.xsad | 0 .../models/ExampleBV2_true_true.xsad | 0 .../models/ExampleBV3_false_false_false.xsad | 0 .../models/ExampleBV3_false_false_true.xsad | 0 .../models/ExampleBV3_false_true_false.xsad | 0 .../models/ExampleBV3_false_true_true.xsad | 0 .../models/ExampleBV3_true_false_false.xsad | 0 .../models/ExampleBV3_true_false_true.xsad | 0 .../models/ExampleBV3_true_true_false.xsad | 0 .../models/ExampleBV3_true_true_true.xsad | 0 .../models/hireV1_false.xsad | 0 .../models/hireV1_true.xsad | 0 .../models/hireV2_false.xsad | 0 .../models/hireV2_true.xsad | 0 .../models/hireV3_false.xsad | 0 .../models/hireV3_true.xsad | 0 .../models/hireV4_false.xsad | 0 .../models/hireV4_true.xsad | 0 .../output_memory_08-03-2017_16-32-39/results.csv | 0 .../gemoc}/trace/benchmark/BenchmarkData.xtend | 0 .../trace/benchmark/BenchmarkMemoryTestSuite.xtend | 0 .../benchmark/BenchmarkSingleJVMTestSuite.xtend | 0 .../trace/benchmark/BenchmarkTimeTestSuite.xtend | 0 .../eclipse/gemoc}/trace/benchmark/Language.java | 0 .../gemoc}/trace/benchmark/XTextConverter.java | 0 .../eclipse/gemoc}/trace/benchmark/XTextFixer2.java | 0 .../gemoc}/trace/benchmark/api/IDebuggerHelper.java | 0 .../trace/benchmark/languages/ActivityDiagram.xtend | 0 .../benchmark/languages/BenchmarkLanguage.xtend | 0 .../gemoc}/trace/benchmark/memory/HeapDump.java | 0 .../trace/benchmark/memory/MemoryAnalyzer.java | 0 .../runconf/BenchmarkRunConfiguration.xtend | 0 .../tracingcases/BenchmarkTracingCase.xtend | 0 .../tracingcases/CloneBasedTracingCase.xtend | 0 .../tracingcases/GeneratedTracingCase.xtend | 0 .../benchmark/tracingcases/GenericTracingCase.xtend | 0 .../benchmark/tracingcases/HybridTracingCase.xtend | 0 .../benchmark/tracingcases/NoTracingCase.xtend | 0 .../utils/BenchmarkExecutionModelContext.xtend | 0 .../trace/benchmark/utils/BenchmarkHelpers.xtend | 0 .../gemoc}/trace/benchmark/utils/CSVHelper.xtend | 0 .../gemoc}/trace/benchmark/utils/CSVLine.xtend | 0 .../gemoc}/trace/benchmark/utils/EngineHelper.java | 0 .../trace/benchmark/utils/MemoryCSVHelper.xtend | 0 .../trace/benchmark/utils/PDETestListener.java | 0 .../benchmark/utils/PDETestResultsCollector.java | 0 .../workspace-benchmark/benchmark-models/.classpath | 0 .../workspace-benchmark/benchmark-models/.project | 0 .../benchmark-models/META-INF/MANIFEST.MF | 0 .../workspace-benchmark/benchmark-models/about.html | 0 .../benchmark-models/build.properties | 0 .../benchmark-models/model/2557-1_1.xmi | 0 .../benchmark-models/model/2557-1_2.xmi | 0 .../benchmark-models/model/2557-1_3.xmi | 0 .../benchmark-models/model/2557-1_4.xmi | 0 .../benchmark-models/model/2557-1_5.xmi | 0 .../benchmark-models/model/2557-1_6.xmi | 0 .../benchmark-models/model/2557-2_1.xmi | 0 .../benchmark-models/model/2557-2_2.xmi | 0 .../benchmark-models/model/2557-2_3.xmi | 0 .../benchmark-models/model/2557-2_4.xmi | 0 .../benchmark-models/model/2557-2_5.xmi | 0 .../benchmark-models/model/2557-2_6.xmi | 0 .../benchmark-models/model/3561-1_1.xmi | 0 .../benchmark-models/model/3561-1_2.xmi | 0 .../benchmark-models/model/3561-1_3.xmi | 0 .../benchmark-models/model/3561-2_1.xmi | 0 .../benchmark-models/model/3561-2_2.xmi | 0 .../benchmark-models/model/3561-2_3.xmi | 0 .../model/ExampleBV1_false_false.xmi | 0 .../model/ExampleBV1_false_true.xmi | 0 .../model/ExampleBV1_true_false.xmi | 0 .../benchmark-models/model/ExampleBV1_true_true.xmi | 0 .../model/ExampleBV2_false_false.xmi | 0 .../model/ExampleBV2_false_true.xmi | 0 .../model/ExampleBV2_true_false.xmi | 0 .../benchmark-models/model/ExampleBV2_true_true.xmi | 0 .../model/ExampleBV3_false_false_false.xmi | 0 .../model/ExampleBV3_false_false_true.xmi | 0 .../model/ExampleBV3_false_true_false.xmi | 0 .../model/ExampleBV3_false_true_true.xmi | 0 .../model/ExampleBV3_true_false_false.xmi | 0 .../model/ExampleBV3_true_false_true.xmi | 0 .../model/ExampleBV3_true_true_false.xmi | 0 .../model/ExampleBV3_true_true_true.xmi | 0 .../benchmark-models/model/hireV1_false.xmi | 0 .../benchmark-models/model/hireV1_true.xmi | 0 .../benchmark-models/model/hireV2_false.xmi | 0 .../benchmark-models/model/hireV2_true.xmi | 0 .../benchmark-models/model/hireV3_false.xmi | 0 .../benchmark-models/model/hireV3_true.xmi | 0 .../benchmark-models/model/hireV4_false.xmi | 0 .../benchmark-models/model/hireV4_true.xmi | 0 .../benchmark-models/model/originals/2557-1.xmi | 0 .../benchmark-models/model/originals/2557-2.xmi | 0 .../benchmark-models/model/originals/3561-1.xmi | 0 .../benchmark-models/model/originals/3561-2.xmi | 0 .../benchmark-models/model/originals/ExampleBV1.xmi | 0 .../benchmark-models/model/originals/ExampleBV2.xmi | 0 .../benchmark-models/model/originals/ExampleBV3.xmi | 0 .../benchmark-models/model/originals/hireV1.xmi | 0 .../benchmark-models/model/originals/hireV2.xmi | 0 .../benchmark-models/model/originals/hireV3.xmi | 0 .../benchmark-models/model/originals/hireV4.xmi | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../trace/commons/testutil/EclipseTestUtil.xtend | 0 .../trace/commons/testutil/Investigation.xtend | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../gemoc/generator/test/AddonGeneratorTest.xtend | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../hs_err_pid8464.log | 0 .../model_inputs/activitydiagram.ecore | 0 .../model_inputs/activitydiagramext.xmi | 0 .../model_inputs/fumlext.xmi | 0 .../model_inputs/model1.ecore | 0 .../model_inputs/model1ext.xmi | 0 .../model_inputs/model2.ecore | 0 .../model_inputs/model2ext.xmi | 0 .../model_inputs/petrinet.ecore | 0 .../model_inputs/petrinetext.xmi | 0 .../model_inputs_xmof/activitydiagram.ecore | 0 .../model_inputs_xmof/activitydiagram.xmof | 0 .../model_inputs_xmof/activitydiagramext.xmi | 0 .../model_inputs_xmof/fumlext.xmi | 0 .../model_inputs_xmof/model1.ecore | 0 .../model_inputs_xmof/model1.xmof | 0 .../model_inputs_xmof/model1ext.xmi | 0 .../model_inputs_xmof/model2.ecore | 0 .../model_inputs_xmof/model2.xmof | 0 .../model_inputs_xmof/model2ext.xmi | 0 .../model_inputs_xmof/petrinet.ecore | 0 .../model_inputs_xmof/petrinet.xmof | 0 .../model_inputs_xmof/petrinetext.xmi | 0 .../trace/metamodel/test/TraceMMGeneratorTest.xtend | 0 .../metamodel/test/XMOFTraceMMGeneratorTest.xtend | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../inputs/TfsmExtended.ecore | 0 .../org.gemoc.sample.tfsm.plaink3.dsa/.classpath | 0 .../org.gemoc.sample.tfsm.plaink3.dsa/.gitignore | 0 .../org.gemoc.sample.tfsm.plaink3.dsa/.project | 0 .../META-INF/MANIFEST.MF | 0 .../org.gemoc.sample.tfsm.plaink3.dsa/about.html | 0 .../build.properties | 0 .../plugin.properties | 0 .../org.gemoc.sample.tfsm.plaink3.dsa/plugin.xml | 0 .../org.gemoc.sample.tfsm.plaink3.dsa/pom.xml | 0 .../org/gemoc/sample/tfsm/plaink3/dsa/Main.xtend | 0 .../org/gemoc/sample/tfsm/plaink3/dsa/Visitor.xtend | 0 .../org/gemoc/sample/tfsm/plaink3/dsa/tfsm.xtend | 0 .../test/TestPlainK3Extractor.xtend | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../inputs/petrinet.ecore | 0 .../inputs/petrinetevents.ecore | 0 .../inputs/petrinetext.xmi | 0 .../inputs/tfsm.ecore | 0 .../inputs/tfsmevents.ecore | 0 .../inputs/tfsmext.xmi | 0 .../generator/test/TestTracePluginGenerator.xtend | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../trace_domainspecific/actionExecutionOrder.ecl | 0 .../trace_generic/actionExecutionOrder.ecl | 0 .../semdiff/eval/DomainSpecificTraceExtraction.java | 0 .../semdiff/eval/DomainSpecificTraceMatching.java | 0 .../gemoc}/tracemm/semdiff/eval/Evaluation.java | 0 .../semdiff/eval/GenericTraceExtraction.java | 0 .../tracemm/semdiff/eval/GenericTraceMatching.java | 0 .../tracemm/semdiff/eval/TraceExtraction.java | 0 .../gemoc}/tracemm/semdiff/eval/TraceMatching.java | 0 .../semdiff/eval/internal/CustomStatesBuilder.java | 0 .../tracemm/semdiff/eval/internal/MatchResult.java | 0 .../semdiff/eval/internal/ModelExecutor.java | 0 .../tracemm/semdiff/eval/internal/TraceMatcher.java | 0 .../semdiff/eval/internal/TraceMatchingEvent.java | 0 .../eval/internal/TraceMatchingListener.java | 0 .../gemoc}/tracemm/semdiff/eval/internal/Util.java | 0 .../eval/internal/reporting/MatchingReport.java | 0 .../internal/reporting/MatchingReportEntry.java | 0 .../semdiff/eval/internal/reporting/Report.java | 0 .../eval/internal/reporting/ReportEntry.java | 0 .../eval/internal/reporting/TraceReport.java | 0 .../eval/internal/reporting/TraceReportEntry.java | 0 691 files changed, 0 insertions(+), 0 deletions(-) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/.checkstyle (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/.classpath (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/.gitignore (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/.project (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/.settings/org.eclipse.jdt.core.prefs (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/META-INF/MANIFEST.MF (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/about.html (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/build.properties (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/model/GenericTrace.aird (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/model/GenericTrace.ecore (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/model/GenericTrace.genmodel (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/model/GenericTraceImpl.ecore (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/model/GenericTraceImpl.genmodel (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/model/LaunchConfiguration.ecore (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/model/LaunchConfiguration.genmodel (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/model/trace class diagram.png (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/model/trace class diagram.svg (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/plugin.properties (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/plugin.properties~ (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/plugin.xml (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model => org.eclipse.gemoc.trace.commons.model}/pom.xml (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/BooleanAttributeValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericAttributeValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericDimension.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericParallelStep.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericReferenceValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericSequentialStep.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericSmallStep.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericState.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericStep.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericTrace.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericTracedObject.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenericValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenerictraceFactory.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/GenerictracePackage.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/IntegerAttributeValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/IntegerObjectAttributeValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/ManyBooleanAttributeValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/ManyIntegerAttributeValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/ManyReferenceValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/ManyStringAttributeValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/SingleReferenceValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/StringAttributeValue.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericDimensionImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericStateImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericStepImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericTraceImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenericValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/generictrace/util/GenerictraceSwitch.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/helper/StepHelper.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/AddonExtensionParameter.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/AnimatorURIParameter.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/EntryPointParameter.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/InitializationMethodParameter.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/LanguageNameParameter.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/LaunchConfiguration.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/ModelRootParameter.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/ModelURIParameter.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/BigStep.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/Dimension.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/GenericMSE.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/MSE.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/MSEModel.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/MSEOccurrence.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/ParallelStep.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/SequentialStep.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/SmallStep.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/State.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/Step.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/Trace.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/TraceFactory.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/TracePackage.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/TracedObject.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/Value.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/BigStepImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/DimensionImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/GenericMSEImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/MSEImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/MSEModelImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/MSEOccurrenceImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/ParallelStepImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/SequentialStepImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/SmallStepImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/StateImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/StepImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/TraceFactoryImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/TraceImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/TracePackageImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/TracedObjectImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/impl/ValueImpl.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/util/TraceAdapterFactory.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons.model/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc}/trace/commons/model/trace/util/TraceSwitch.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons => org.eclipse.gemoc.trace.commons}/.checkstyle (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons => org.eclipse.gemoc.trace.commons}/.classpath (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons => org.eclipse.gemoc.trace.commons}/.gitignore (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons => org.eclipse.gemoc.trace.commons}/.project (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons => org.eclipse.gemoc.trace.commons}/META-INF/MANIFEST.MF (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons => org.eclipse.gemoc.trace.commons}/about.html (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons => org.eclipse.gemoc.trace.commons}/build.properties (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons => org.eclipse.gemoc.trace.commons}/lib/jdom-2.0.5.jar (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons => org.eclipse.gemoc.trace.commons}/pom.xml (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc}/trace/commons/CodeGenUtil.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc}/trace/commons/EMFCompareUtil.xtend (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc}/trace/commons/EMFUtil.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc}/trace/commons/EclipseUtil.xtend (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc}/trace/commons/EcoreCraftingUtil.xtend (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc}/trace/commons/ExecutionMetamodelTraceability.xtend (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc}/trace/commons/ManifestUtil.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc}/trace/commons/PluginXMLHelper.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.commons/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc}/trace/commons/tracemetamodel/StepStrings.xtend (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api => org.eclipse.gemoc.trace.gemoc.api}/.checkstyle (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api => org.eclipse.gemoc.trace.gemoc.api}/.classpath (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api => org.eclipse.gemoc.trace.gemoc.api}/.project (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api => org.eclipse.gemoc.trace.gemoc.api}/.settings/org.eclipse.jdt.core.prefs (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api => org.eclipse.gemoc.trace.gemoc.api}/META-INF/MANIFEST.MF (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api => org.eclipse.gemoc.trace.gemoc.api}/about.html (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api => org.eclipse.gemoc.trace.gemoc.api}/build.properties (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api => org.eclipse.gemoc.trace.gemoc.api}/pom.xml (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc}/trace/gemoc/api/IMultiDimensionalTraceAddon.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc}/trace/gemoc/api/IStateManager.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc}/trace/gemoc/api/IStepFactory.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc}/trace/gemoc/api/ITraceConstructor.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc}/trace/gemoc/api/ITraceExplorer.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc}/trace/gemoc/api/ITraceExtractor.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc}/trace/gemoc/api/ITraceListener.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc}/trace/gemoc/api/ITraceNotifier.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc}/trace/gemoc/api/ITraceViewListener.java (100%) rename trace/commons/plugins/{fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc}/trace/gemoc/api/ITraceViewNotifier.java (100%) rename trace/commons/releng/{fr.inria.diverse.trace.commons.feature => org.eclipse.gemoc.trace.commons.feature}/.project (100%) rename trace/commons/releng/{fr.inria.diverse.trace.commons.feature => org.eclipse.gemoc.trace.commons.feature}/build.properties (100%) rename trace/commons/releng/{fr.inria.diverse.trace.commons.feature => org.eclipse.gemoc.trace.commons.feature}/feature.xml (100%) rename trace/commons/releng/{fr.inria.diverse.trace.commons.feature => org.eclipse.gemoc.trace.commons.feature}/pom.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/.checkstyle (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/.classpath (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/.project (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/META-INF/MANIFEST.MF (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/build.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/icons/full/obj16/TracingAnnotations.gif (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/plugin.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/plugin.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/pom.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/src/tracingannotations/provider/TracingAnnotationsItemProvider.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/src/tracingannotations/provider/TracingannotationsEditPlugin.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.edit => org.eclipse.gemoc.trace.annotations.edit}/src/tracingannotations/provider/TracingannotationsItemProviderAdapterFactory.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/.checkstyle (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/.classpath (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/.project (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/META-INF/MANIFEST.MF (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/build.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/icons/full/obj16/TracingannotationsModelFile.gif (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/icons/full/wizban/NewTracingannotations.gif (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/plugin.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/plugin.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/pom.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/src/tracingannotations/presentation/TracingannotationsActionBarContributor.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/src/tracingannotations/presentation/TracingannotationsEditor.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/src/tracingannotations/presentation/TracingannotationsEditorPlugin.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations.editor => org.eclipse.gemoc.trace.annotations.editor}/src/tracingannotations/presentation/TracingannotationsModelWizard.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/.checkstyle (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/.classpath (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/.project (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/META-INF/MANIFEST.MF (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/build.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/model/tracingannotations.ecore (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/model/tracingannotations.genmodel (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/plugin.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/plugin.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/pom.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/src/tracingannotations/TracingAnnotations.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/src/tracingannotations/TracingannotationsFactory.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/src/tracingannotations/TracingannotationsPackage.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/src/tracingannotations/impl/TracingAnnotationsImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/src/tracingannotations/impl/TracingannotationsFactoryImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/src/tracingannotations/impl/TracingannotationsPackageImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/src/tracingannotations/util/TracingannotationsAdapterFactory.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.annotations => org.eclipse.gemoc.trace.annotations}/src/tracingannotations/util/TracingannotationsSwitch.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator => org.eclipse.gemoc.trace.gemoc.generator}/.checkstyle (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator => org.eclipse.gemoc.trace.gemoc.generator}/.classpath (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator => org.eclipse.gemoc.trace.gemoc.generator}/.gitignore (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator => org.eclipse.gemoc.trace.gemoc.generator}/.project (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator => org.eclipse.gemoc.trace.gemoc.generator}/.settings/org.eclipse.core.resources.prefs (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator => org.eclipse.gemoc.trace.gemoc.generator}/.settings/org.eclipse.jdt.core.prefs (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator => org.eclipse.gemoc.trace.gemoc.generator}/META-INF/MANIFEST.MF (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator => org.eclipse.gemoc.trace.gemoc.generator}/about.html (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator => org.eclipse.gemoc.trace.gemoc.generator}/build.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator => org.eclipse.gemoc.trace.gemoc.generator}/pom.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc}/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc}/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc}/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc}/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc}/trace/gemoc/generator/util/ExtensionFilter.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc}/trace/gemoc/generator/util/PluginProjectHelper.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc}/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/.checkstyle (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/.classpath (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/.gitignore (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/.project (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/META-INF/MANIFEST.MF (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/about.html (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/build.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/icons/IconeGemocLanguage-16.png (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/icons/generate-16.png (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/plugin.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui => org.eclipse.gemoc.trace.gemoc.ui}/pom.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc}/trace/gemoc/ui/Activator.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc}/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc}/trace/gemoc/ui/launch/EcoreFileFilter.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/.checkstyle (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/.classpath (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/.gitignore (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/.project (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/.settings/org.eclipse.core.resources.prefs (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/.settings/org.eclipse.jdt.core.prefs (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/META-INF/MANIFEST.MF (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/about.html (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/build.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/plugin.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/pom.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.gemoc => org.eclipse.gemoc.trace.gemoc}/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/.checkstyle (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/.classpath (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/.gitignore (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/.project (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/.settings/org.eclipse.core.resources.prefs (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/META-INF/MANIFEST.MF (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/about.html (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/build.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/model/base.aird (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/model/base.ecore (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/model/base.genmodel (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/plugin.properties (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/plugin.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/pom.xml (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/BaseFactory.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/BasePackage.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/SpecificTrace.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/SpecificAttributeValue.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/SpecificDimension.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/SpecificReferenceValue.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/SpecificState.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/SpecificTracedObject.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/SpecificValue.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/StatesFactory.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/StatesPackage.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/impl/SpecificDimensionImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/impl/SpecificStateImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/impl/SpecificTracedObjectImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/impl/SpecificValueImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/impl/StatesFactoryImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/impl/StatesPackageImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/util/StatesAdapterFactory.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/States/util/StatesSwitch.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/RootImplicitStep.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/SpecificRootStep.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/SpecificStep.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/StepsFactory.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/StepsPackage.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/impl/RootImplicitStepImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/impl/SpecificRootStepImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/impl/SpecificStepImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/impl/StepsFactoryImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/impl/StepsPackageImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/util/StepsAdapterFactory.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/Steps/util/StepsSwitch.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/impl/BaseFactoryImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/impl/BasePackageImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/impl/SpecificTraceImpl.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/util/BaseAdapterFactory.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator => org.eclipse.gemoc.trace.metamodel.generator}/src/base/util/BaseSwitch.java (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc}/trace/metamodel/generator/TraceMMExplorer.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc}/trace/metamodel/generator/TraceMMGenerationTraceability.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc}/trace/metamodel/generator/TraceMMGenerator.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc}/trace/metamodel/generator/TraceMMGeneratorStates.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc}/trace/metamodel/generator/TraceMMGeneratorSteps.xtend (100%) rename trace/generator/plugins/{fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse => org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc}/trace/metamodel/generator/TraceMMStrings.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/.classpath (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/.project (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/2557-1_4-Clone.launch (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/2557-1_4-Generated.launch (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/2557-1_4-Generic.launch (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/2557-1_4-None.launch (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/META-INF/MANIFEST.MF (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/about.html (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/build.properties (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-1_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-1_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-1_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-1_4.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-1_5.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-1_6.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-2_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-2_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-2_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-2_4.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-2_5.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/2557-2_6.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/3561-1_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/3561-1_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/3561-1_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/3561-2_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/3561-2_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/3561-2_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/hireV1_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/hireV1_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/hireV2_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/hireV2_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/hireV3_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/hireV3_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/hireV4_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/ExecutionTraceModelImpl/hireV4_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-1_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-1_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-1_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-1_4.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-1_5.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-1_6.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-2_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-2_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-2_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-2_4.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-2_5.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/2557-2_6.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/3561-1_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/3561-1_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/3561-1_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/3561-2_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/3561-2_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/3561-2_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV1_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV1_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV1_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV1_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV2_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV2_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV2_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV2_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV3_false_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV3_false_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV3_false_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV3_false_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV3_true_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV3_true_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV3_true_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/ExampleBV3_true_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/hireV1_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/hireV1_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/hireV2_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/hireV2_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/hireV3_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/hireV3_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/hireV4_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/GenericTraceImpl/hireV4_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-1_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-1_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-1_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-1_4.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-1_5.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-1_6.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-2_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-2_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-2_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-2_4.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-2_5.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/2557-2_6.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/3561-1_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/3561-1_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/3561-1_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/3561-2_1.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/3561-2_2.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/3561-2_3.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV1_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV1_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV1_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV1_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV2_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV2_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV2_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV2_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV3_false_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV3_false_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV3_false_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV3_false_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV3_true_false_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV3_true_false_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV3_true_true_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/ExampleBV3_true_true_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/hireV1_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/hireV1_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/hireV2_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/hireV2_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/hireV3_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/hireV3_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/hireV4_false.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/model_traces/SpecificTraceImpl/hireV4_true.trace (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-1_1.aird (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-1_1.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-1_2.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-1_3.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-1_4.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-1_5.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-1_6.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-2_1.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-2_2.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-2_3.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-2_4.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-2_5.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/2557-2_6.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/3561-1_1.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/3561-1_2.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/3561-1_3.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/3561-2_1.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/3561-2_2.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/3561-2_3.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV1_false_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV1_false_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV1_true_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV1_true_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV2_false_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV2_false_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV2_true_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV2_true_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV3_false_false_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV3_false_false_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV3_false_true_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV3_false_true_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV3_true_false_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV3_true_false_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV3_true_true_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/ExampleBV3_true_true_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/hireV1_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/hireV1_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/hireV2_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/hireV2_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/hireV3_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/hireV3_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/hireV4_false.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/models/hireV4_true.xsad (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/output_memory_08-03-2017_16-32-39/results.csv (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/BenchmarkData.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/BenchmarkMemoryTestSuite.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/BenchmarkSingleJVMTestSuite.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/BenchmarkTimeTestSuite.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/Language.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/XTextConverter.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/XTextFixer2.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/api/IDebuggerHelper.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/languages/ActivityDiagram.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/languages/BenchmarkLanguage.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/memory/HeapDump.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/memory/MemoryAnalyzer.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/tracingcases/BenchmarkTracingCase.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/tracingcases/CloneBasedTracingCase.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/tracingcases/GeneratedTracingCase.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/tracingcases/GenericTracingCase.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/tracingcases/HybridTracingCase.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/tracingcases/NoTracingCase.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/utils/BenchmarkHelpers.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/utils/CSVHelper.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/utils/CSVLine.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/utils/EngineHelper.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/utils/MemoryCSVHelper.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/utils/PDETestListener.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark/src/fr/inria/diverse => org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc}/trace/benchmark/utils/PDETestResultsCollector.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/.classpath (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/.project (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/META-INF/MANIFEST.MF (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/about.html (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/build.properties (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-1_1.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-1_2.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-1_3.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-1_4.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-1_5.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-1_6.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-2_1.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-2_2.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-2_3.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-2_4.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-2_5.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/2557-2_6.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/3561-1_1.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/3561-1_2.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/3561-1_3.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/3561-2_1.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/3561-2_2.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/3561-2_3.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV1_false_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV1_false_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV1_true_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV1_true_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV2_false_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV2_false_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV2_true_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV2_true_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV3_false_false_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV3_false_false_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV3_false_true_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV3_false_true_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV3_true_false_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV3_true_false_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV3_true_true_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/ExampleBV3_true_true_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/hireV1_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/hireV1_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/hireV2_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/hireV2_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/hireV3_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/hireV3_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/hireV4_false.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/hireV4_true.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/2557-1.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/2557-2.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/3561-1.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/3561-2.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/ExampleBV1.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/ExampleBV2.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/ExampleBV3.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/hireV1.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/hireV2.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/hireV3.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.benchmark => org.eclipse.gemoc.trace.benchmark}/workspace-benchmark/benchmark-models/model/originals/hireV4.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.commons.testutil => org.eclipse.gemoc.trace.commons.testutil}/.classpath (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.commons.testutil => org.eclipse.gemoc.trace.commons.testutil}/.gitignore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.commons.testutil => org.eclipse.gemoc.trace.commons.testutil}/.project (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.commons.testutil => org.eclipse.gemoc.trace.commons.testutil}/META-INF/MANIFEST.MF (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.commons.testutil => org.eclipse.gemoc.trace.commons.testutil}/about.html (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.commons.testutil => org.eclipse.gemoc.trace.commons.testutil}/build.properties (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.commons.testutil/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.testutil/src/org/eclipse/gemoc}/trace/commons/testutil/EclipseTestUtil.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.commons.testutil/src/fr/inria/diverse => org.eclipse.gemoc.trace.commons.testutil/src/org/eclipse/gemoc}/trace/commons/testutil/Investigation.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.gemoc.generator.test => org.eclipse.gemoc.trace.gemoc.generator.test}/.classpath (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.gemoc.generator.test => org.eclipse.gemoc.trace.gemoc.generator.test}/.gitignore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.gemoc.generator.test => org.eclipse.gemoc.trace.gemoc.generator.test}/.project (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.gemoc.generator.test => org.eclipse.gemoc.trace.gemoc.generator.test}/.settings/org.eclipse.core.resources.prefs (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.gemoc.generator.test => org.eclipse.gemoc.trace.gemoc.generator.test}/META-INF/MANIFEST.MF (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.gemoc.generator.test => org.eclipse.gemoc.trace.gemoc.generator.test}/about.html (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.gemoc.generator.test => org.eclipse.gemoc.trace.gemoc.generator.test}/build.properties (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.gemoc.generator.test/src/fr/inria/diverse => org.eclipse.gemoc.trace.gemoc.generator.test/src/org/eclipse/gemoc}/trace/gemoc/generator/test/AddonGeneratorTest.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/.classpath (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/.gitignore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/.project (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/META-INF/MANIFEST.MF (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/about.html (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/build.properties (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/hs_err_pid8464.log (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs/activitydiagram.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs/activitydiagramext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs/fumlext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs/model1.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs/model1ext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs/model2.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs/model2ext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs/petrinet.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs/petrinetext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/activitydiagram.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/activitydiagram.xmof (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/activitydiagramext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/fumlext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/model1.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/model1.xmof (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/model1ext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/model2.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/model2.xmof (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/model2ext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/petrinet.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/petrinet.xmof (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test => org.eclipse.gemoc.trace.metamodel.generator.test}/model_inputs_xmof/petrinetext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test/src/fr/inria/diverse => org.eclipse.gemoc.trace.metamodel.generator.test/src/org/eclipse/gemoc}/trace/metamodel/test/TraceMMGeneratorTest.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.metamodel.generator.test/src/fr/inria/diverse => org.eclipse.gemoc.trace.metamodel.generator.test/src/org/eclipse/gemoc}/trace/metamodel/test/XMOFTraceMMGeneratorTest.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/.classpath (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/.gitignore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/.project (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/META-INF/MANIFEST.MF (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/about.html (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/build.properties (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/TfsmExtended.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.classpath (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.gitignore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.project (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/about.html (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/build.properties (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/plugin.properties (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/plugin.xml (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/pom.xml (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/Main.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/Visitor.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test}/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/tfsm.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plaink3.tracematerialextractor.test/src/fr/inria/diverse => org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/src/org/eclipse/gemoc}/trace/plaink3/tracematerialextractor/test/TestPlainK3Extractor.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/.classpath (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/.gitignore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/.project (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/META-INF/MANIFEST.MF (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/about.html (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/build.properties (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/inputs/petrinet.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/inputs/petrinetevents.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/inputs/petrinetext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/inputs/tfsm.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/inputs/tfsmevents.ecore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test => org.eclipse.gemoc.trace.plugin.generator.test}/inputs/tfsmext.xmi (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.trace.plugin.generator.test/src/fr/inria/diverse => org.eclipse.gemoc.trace.plugin.generator.test/src/org/eclipse/gemoc}/trace/plugin/generator/test/TestTracePluginGenerator.xtend (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval => org.eclipse.gemoc.tracemm.semdiff.eval}/.classpath (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval => org.eclipse.gemoc.tracemm.semdiff.eval}/.gitignore (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval => org.eclipse.gemoc.tracemm.semdiff.eval}/.project (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval => org.eclipse.gemoc.tracemm.semdiff.eval}/META-INF/MANIFEST.MF (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval => org.eclipse.gemoc.tracemm.semdiff.eval}/about.html (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval => org.eclipse.gemoc.tracemm.semdiff.eval}/build.properties (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval => org.eclipse.gemoc.tracemm.semdiff.eval}/matchrules/trace_domainspecific/actionExecutionOrder.ecl (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval => org.eclipse.gemoc.tracemm.semdiff.eval}/matchrules/trace_generic/actionExecutionOrder.ecl (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/DomainSpecificTraceExtraction.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/DomainSpecificTraceMatching.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/Evaluation.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/GenericTraceExtraction.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/GenericTraceMatching.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/TraceExtraction.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/TraceMatching.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/CustomStatesBuilder.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/MatchResult.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/ModelExecutor.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/TraceMatcher.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/TraceMatchingEvent.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/TraceMatchingListener.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/Util.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/reporting/MatchingReport.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/reporting/MatchingReportEntry.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/reporting/Report.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/reporting/ReportEntry.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/reporting/TraceReport.java (100%) rename trace/tests_and_benchmarks/{fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse => org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc}/tracemm/semdiff/eval/internal/reporting/TraceReportEntry.java (100%) diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.checkstyle b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.checkstyle similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/.checkstyle rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.checkstyle diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.classpath b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.classpath similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/.classpath rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.classpath diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.gitignore b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.gitignore similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/.gitignore rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.gitignore diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.project similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/.project rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.project diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/.settings/org.eclipse.jdt.core.prefs b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/.settings/org.eclipse.jdt.core.prefs rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.settings/org.eclipse.jdt.core.prefs diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/META-INF/MANIFEST.MF similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/META-INF/MANIFEST.MF rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/META-INF/MANIFEST.MF diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/about.html b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/about.html similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/about.html rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/about.html diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/build.properties b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/build.properties similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/build.properties rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/build.properties diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTrace.aird similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.aird rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTrace.aird diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTrace.ecore similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTrace.ecore diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTrace.genmodel similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.genmodel rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTrace.genmodel diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTraceImpl.ecore similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTraceImpl.ecore diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.genmodel b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTraceImpl.genmodel similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.genmodel rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/GenericTraceImpl.genmodel diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/LaunchConfiguration.ecore similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/LaunchConfiguration.ecore diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.genmodel b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/LaunchConfiguration.genmodel similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.genmodel rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/LaunchConfiguration.genmodel diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.png b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/trace class diagram.png similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.png rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/trace class diagram.png diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.svg b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/trace class diagram.svg similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/trace class diagram.svg rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/model/trace class diagram.svg diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/plugin.properties b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/plugin.properties similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/plugin.properties rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/plugin.properties diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/plugin.properties~ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/plugin.properties~ similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/plugin.properties~ rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/plugin.properties~ diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/plugin.xml b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/plugin.xml similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/plugin.xml rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/plugin.xml diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/pom.xml b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/pom.xml similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/pom.xml rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/pom.xml diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/BooleanAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/BooleanAttributeValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/BooleanAttributeValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/BooleanAttributeValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericAttributeValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericAttributeValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericAttributeValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericDimension.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericDimension.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericDimension.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericDimension.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericParallelStep.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericParallelStep.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericParallelStep.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericReferenceValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericReferenceValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericReferenceValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericReferenceValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSequentialStep.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSequentialStep.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSequentialStep.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSmallStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSmallStep.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericSmallStep.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSmallStep.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericState.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericState.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericState.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericState.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericStep.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericStep.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericStep.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTrace.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTrace.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTrace.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTrace.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTracedObject.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericTracedObject.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTracedObject.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenericValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictraceFactory.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictraceFactory.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictracePackage.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictracePackage.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictracePackage.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerAttributeValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerAttributeValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerAttributeValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerObjectAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerObjectAttributeValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/IntegerObjectAttributeValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerObjectAttributeValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyBooleanAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyBooleanAttributeValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyBooleanAttributeValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyBooleanAttributeValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyIntegerAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyIntegerAttributeValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyIntegerAttributeValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyIntegerAttributeValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyReferenceValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyReferenceValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyReferenceValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyReferenceValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyStringAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyStringAttributeValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/ManyStringAttributeValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyStringAttributeValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/SingleReferenceValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/SingleReferenceValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/SingleReferenceValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/SingleReferenceValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/StringAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/StringAttributeValue.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/StringAttributeValue.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/StringAttributeValue.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericDimensionImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericDimensionImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericDimensionImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericDimensionImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStateImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStateImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStateImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStateImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStepImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericStepImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStepImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTraceImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTraceImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTraceImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTraceImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenericValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceSwitch.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/util/GenerictraceSwitch.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceSwitch.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/helper/StepHelper.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/helper/StepHelper.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/helper/StepHelper.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AddonExtensionParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AddonExtensionParameter.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AddonExtensionParameter.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AddonExtensionParameter.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AnimatorURIParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AnimatorURIParameter.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/AnimatorURIParameter.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AnimatorURIParameter.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/EntryPointParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/EntryPointParameter.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/EntryPointParameter.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/EntryPointParameter.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationMethodParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationMethodParameter.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/InitializationMethodParameter.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationMethodParameter.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LanguageNameParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LanguageNameParameter.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LanguageNameParameter.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LanguageNameParameter.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfiguration.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfiguration.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfiguration.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfiguration.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelRootParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelRootParameter.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelRootParameter.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelRootParameter.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelURIParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelURIParameter.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/ModelURIParameter.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelURIParameter.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/BigStep.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/BigStep.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/BigStep.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Dimension.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Dimension.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Dimension.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/GenericMSE.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/GenericMSE.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/GenericMSE.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSE.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSE.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSE.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEModel.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEModel.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEModel.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEOccurrence.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/MSEOccurrence.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEOccurrence.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/ParallelStep.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/ParallelStep.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/ParallelStep.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SequentialStep.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SequentialStep.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SequentialStep.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SmallStep.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/SmallStep.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SmallStep.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/State.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/State.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/State.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Step.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Step.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Step.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Trace.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Trace.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Trace.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TraceFactory.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TraceFactory.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TraceFactory.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracePackage.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracePackage.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracePackage.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracedObject.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/TracedObject.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracedObject.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Value.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/Value.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Value.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/BigStepImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/BigStepImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/BigStepImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/DimensionImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/DimensionImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/DimensionImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/GenericMSEImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/GenericMSEImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/GenericMSEImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEModelImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEModelImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEModelImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEOccurrenceImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/MSEOccurrenceImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEOccurrenceImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ParallelStepImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ParallelStepImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ParallelStepImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SequentialStepImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SequentialStepImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SequentialStepImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SmallStepImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/SmallStepImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SmallStepImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StateImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StateImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StateImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StepImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/StepImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StepImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceFactoryImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceFactoryImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceFactoryImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TraceImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracePackageImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracePackageImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracePackageImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracedObjectImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/TracedObjectImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracedObjectImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ValueImpl.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/impl/ValueImpl.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ValueImpl.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceAdapterFactory.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceAdapterFactory.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceAdapterFactory.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceSwitch.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/trace/util/TraceSwitch.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceSwitch.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/.checkstyle b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/.checkstyle similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/.checkstyle rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/.checkstyle diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/.classpath b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/.classpath similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/.classpath rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/.classpath diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/.gitignore b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/.gitignore similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/.gitignore rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/.gitignore diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/.project b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/.project similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/.project rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/.project diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/META-INF/MANIFEST.MF b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/META-INF/MANIFEST.MF similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/META-INF/MANIFEST.MF rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/META-INF/MANIFEST.MF diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/about.html b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/about.html similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/about.html rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/about.html diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/build.properties b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/build.properties similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/build.properties rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/build.properties diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/lib/jdom-2.0.5.jar b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/lib/jdom-2.0.5.jar similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/lib/jdom-2.0.5.jar rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/lib/jdom-2.0.5.jar diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/pom.xml b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/pom.xml similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/pom.xml rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/pom.xml diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/CodeGenUtil.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/CodeGenUtil.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/CodeGenUtil.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/CodeGenUtil.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EMFCompareUtil.xtend b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFCompareUtil.xtend similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EMFCompareUtil.xtend rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFCompareUtil.xtend diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EMFUtil.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFUtil.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EMFUtil.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFUtil.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EclipseUtil.xtend b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EclipseUtil.xtend similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EclipseUtil.xtend rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EclipseUtil.xtend diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EcoreCraftingUtil.xtend b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EcoreCraftingUtil.xtend similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/EcoreCraftingUtil.xtend rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EcoreCraftingUtil.xtend diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/ExecutionMetamodelTraceability.xtend b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ExecutionMetamodelTraceability.xtend similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/ExecutionMetamodelTraceability.xtend rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ExecutionMetamodelTraceability.xtend diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/ManifestUtil.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ManifestUtil.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/ManifestUtil.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ManifestUtil.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/PluginXMLHelper.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/PluginXMLHelper.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/PluginXMLHelper.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/PluginXMLHelper.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/tracemetamodel/StepStrings.xtend b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/tracemetamodel/StepStrings.xtend similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.commons/src/fr/inria/diverse/trace/commons/tracemetamodel/StepStrings.xtend rename to trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/tracemetamodel/StepStrings.xtend diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.checkstyle b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.checkstyle similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.checkstyle rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.checkstyle diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.classpath b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.classpath similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.classpath rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.classpath diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.project similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.project rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.project diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.settings/org.eclipse.jdt.core.prefs b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/.settings/org.eclipse.jdt.core.prefs rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.settings/org.eclipse.jdt.core.prefs diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/META-INF/MANIFEST.MF similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/META-INF/MANIFEST.MF rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/META-INF/MANIFEST.MF diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/about.html b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/about.html similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/about.html rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/about.html diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/build.properties b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/build.properties similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/build.properties rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/build.properties diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/pom.xml b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/pom.xml similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/pom.xml rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/pom.xml diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IMultiDimensionalTraceAddon.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IMultiDimensionalTraceAddon.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IMultiDimensionalTraceAddon.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStateManager.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStateManager.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStateManager.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStateManager.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStepFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStepFactory.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStepFactory.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStepFactory.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceConstructor.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceConstructor.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceConstructor.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExplorer.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExplorer.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExplorer.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExtractor.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceExtractor.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExtractor.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceListener.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceListener.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceListener.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceNotifier.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceNotifier.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceNotifier.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceNotifier.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewListener.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewListener.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewListener.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewListener.java diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewNotifier.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewNotifier.java similarity index 100% rename from trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/ITraceViewNotifier.java rename to trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewNotifier.java diff --git a/trace/commons/releng/fr.inria.diverse.trace.commons.feature/.project b/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/.project similarity index 100% rename from trace/commons/releng/fr.inria.diverse.trace.commons.feature/.project rename to trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/.project diff --git a/trace/commons/releng/fr.inria.diverse.trace.commons.feature/build.properties b/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/build.properties similarity index 100% rename from trace/commons/releng/fr.inria.diverse.trace.commons.feature/build.properties rename to trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/build.properties diff --git a/trace/commons/releng/fr.inria.diverse.trace.commons.feature/feature.xml b/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/feature.xml similarity index 100% rename from trace/commons/releng/fr.inria.diverse.trace.commons.feature/feature.xml rename to trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/feature.xml diff --git a/trace/commons/releng/fr.inria.diverse.trace.commons.feature/pom.xml b/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/pom.xml similarity index 100% rename from trace/commons/releng/fr.inria.diverse.trace.commons.feature/pom.xml rename to trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/pom.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/.checkstyle similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.checkstyle rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/.checkstyle diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.classpath b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/.classpath similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.classpath rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/.classpath diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/.project similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/.project rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/.project diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/META-INF/MANIFEST.MF similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/META-INF/MANIFEST.MF rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/META-INF/MANIFEST.MF diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/build.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/build.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/build.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/build.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/icons/full/obj16/TracingAnnotations.gif b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/icons/full/obj16/TracingAnnotations.gif similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/icons/full/obj16/TracingAnnotations.gif rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/icons/full/obj16/TracingAnnotations.gif diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/plugin.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/plugin.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/plugin.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/plugin.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/plugin.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/plugin.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/plugin.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/plugin.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/pom.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/pom.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/pom.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingAnnotationsItemProvider.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/src/tracingannotations/provider/TracingAnnotationsItemProvider.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingAnnotationsItemProvider.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/src/tracingannotations/provider/TracingAnnotationsItemProvider.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsEditPlugin.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsEditPlugin.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsEditPlugin.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsEditPlugin.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsItemProviderAdapterFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsItemProviderAdapterFactory.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsItemProviderAdapterFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/src/tracingannotations/provider/TracingannotationsItemProviderAdapterFactory.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.checkstyle b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/.checkstyle similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.checkstyle rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/.checkstyle diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.classpath b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/.classpath similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.classpath rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/.classpath diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/.project similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/.project rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/.project diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/META-INF/MANIFEST.MF similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/META-INF/MANIFEST.MF rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/META-INF/MANIFEST.MF diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/build.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/build.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/build.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/build.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/icons/full/obj16/TracingannotationsModelFile.gif b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/icons/full/obj16/TracingannotationsModelFile.gif similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/icons/full/obj16/TracingannotationsModelFile.gif rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/icons/full/obj16/TracingannotationsModelFile.gif diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/icons/full/wizban/NewTracingannotations.gif b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/icons/full/wizban/NewTracingannotations.gif similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/icons/full/wizban/NewTracingannotations.gif rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/icons/full/wizban/NewTracingannotations.gif diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/plugin.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/plugin.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/plugin.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/plugin.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/plugin.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/plugin.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/plugin.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/plugin.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/pom.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/pom.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/pom.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsActionBarContributor.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsActionBarContributor.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsActionBarContributor.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsActionBarContributor.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditorPlugin.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditorPlugin.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditorPlugin.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditorPlugin.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsModelWizard.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsModelWizard.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsModelWizard.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsModelWizard.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/.checkstyle b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/.checkstyle similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/.checkstyle rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/.checkstyle diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/.classpath b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/.classpath similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/.classpath rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/.classpath diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/.project similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/.project rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/.project diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/META-INF/MANIFEST.MF similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/META-INF/MANIFEST.MF rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/META-INF/MANIFEST.MF diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/build.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/build.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/build.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/build.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/model/tracingannotations.ecore b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/model/tracingannotations.ecore similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/model/tracingannotations.ecore rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/model/tracingannotations.ecore diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/model/tracingannotations.genmodel b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/model/tracingannotations.genmodel similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/model/tracingannotations.genmodel rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/model/tracingannotations.genmodel diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/plugin.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/plugin.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/plugin.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/plugin.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/plugin.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/plugin.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/plugin.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/plugin.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/pom.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/pom.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/pom.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingAnnotations.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/TracingAnnotations.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingAnnotations.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/TracingAnnotations.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/TracingannotationsFactory.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/TracingannotationsFactory.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsPackage.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/TracingannotationsPackage.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/TracingannotationsPackage.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/TracingannotationsPackage.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingAnnotationsImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/impl/TracingAnnotationsImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingAnnotationsImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/impl/TracingAnnotationsImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsFactoryImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/impl/TracingannotationsFactoryImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsFactoryImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/impl/TracingannotationsFactoryImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsPackageImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/impl/TracingannotationsPackageImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/impl/TracingannotationsPackageImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/impl/TracingannotationsPackageImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsAdapterFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/util/TracingannotationsAdapterFactory.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsAdapterFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/util/TracingannotationsAdapterFactory.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsSwitch.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/util/TracingannotationsSwitch.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.annotations/src/tracingannotations/util/TracingannotationsSwitch.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.annotations/src/tracingannotations/util/TracingannotationsSwitch.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.checkstyle similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.checkstyle rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.checkstyle diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.classpath b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.classpath similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.classpath rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.classpath diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.gitignore b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.gitignore similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.gitignore rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.gitignore diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.project similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.project rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.project diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.settings/org.eclipse.core.resources.prefs b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.settings/org.eclipse.core.resources.prefs rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.settings/org.eclipse.core.resources.prefs diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.settings/org.eclipse.jdt.core.prefs b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/.settings/org.eclipse.jdt.core.prefs rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.settings/org.eclipse.jdt.core.prefs diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/META-INF/MANIFEST.MF similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/META-INF/MANIFEST.MF rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/META-INF/MANIFEST.MF diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/about.html b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/about.html similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/about.html rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/about.html diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/build.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/build.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/build.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/build.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/pom.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/pom.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/pom.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/ExtensionFilter.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/ExtensionFilter.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/ExtensionFilter.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/ExtensionFilter.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/PluginProjectHelper.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/PluginProjectHelper.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/PluginProjectHelper.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/PluginProjectHelper.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.generator/src/fr/inria/diverse/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.checkstyle similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.checkstyle rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.checkstyle diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.classpath b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.classpath similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.classpath rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.classpath diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.gitignore b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.gitignore similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.gitignore rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.gitignore diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.project similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.project rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.project diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.settings/org.eclipse.jdt.core.prefs b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/.settings/org.eclipse.jdt.core.prefs rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/META-INF/MANIFEST.MF similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/META-INF/MANIFEST.MF rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/META-INF/MANIFEST.MF diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/about.html b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/about.html similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/about.html rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/about.html diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/build.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/build.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/build.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/build.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/icons/IconeGemocLanguage-16.png b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/icons/IconeGemocLanguage-16.png similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/icons/IconeGemocLanguage-16.png rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/icons/IconeGemocLanguage-16.png diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/icons/generate-16.png b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/icons/generate-16.png similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/icons/generate-16.png rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/icons/generate-16.png diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/plugin.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/plugin.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/plugin.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/plugin.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/pom.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/pom.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/pom.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/Activator.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/Activator.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/Activator.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/Activator.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/launch/EcoreFileFilter.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/launch/EcoreFileFilter.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc.ui/src/fr/inria/diverse/trace/gemoc/ui/launch/EcoreFileFilter.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/launch/EcoreFileFilter.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.checkstyle similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/.checkstyle rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.checkstyle diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.classpath b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.classpath similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/.classpath rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.classpath diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.gitignore b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.gitignore similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/.gitignore rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.gitignore diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.project similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/.project rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.project diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.settings/org.eclipse.core.resources.prefs b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/.settings/org.eclipse.core.resources.prefs rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.settings/org.eclipse.core.resources.prefs diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/.settings/org.eclipse.jdt.core.prefs b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/.settings/org.eclipse.jdt.core.prefs rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.settings/org.eclipse.jdt.core.prefs diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/META-INF/MANIFEST.MF similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/META-INF/MANIFEST.MF rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/META-INF/MANIFEST.MF diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/about.html b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/about.html similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/about.html rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/about.html diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/build.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/build.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/build.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/build.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/plugin.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/plugin.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/pom.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/pom.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/pom.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.checkstyle b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.checkstyle similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.checkstyle rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.checkstyle diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.classpath b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.classpath similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.classpath rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.classpath diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.gitignore b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.gitignore similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.gitignore rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.gitignore diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.project similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.project rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.project diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.settings/org.eclipse.core.resources.prefs b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/.settings/org.eclipse.core.resources.prefs rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.settings/org.eclipse.core.resources.prefs diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/META-INF/MANIFEST.MF similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/META-INF/MANIFEST.MF rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/META-INF/MANIFEST.MF diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/about.html b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/about.html similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/about.html rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/about.html diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/build.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/build.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/build.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/build.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/model/base.aird similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.aird rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/model/base.aird diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/model/base.ecore similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.ecore rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/model/base.ecore diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.genmodel b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/model/base.genmodel similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/model/base.genmodel rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/model/base.genmodel diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.properties b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/plugin.properties similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.properties rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/plugin.properties diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/plugin.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/plugin.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/plugin.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/pom.xml similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/pom.xml rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/pom.xml diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BaseFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/BaseFactory.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BaseFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/BaseFactory.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/BasePackage.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/BasePackage.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/BasePackage.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/SpecificTrace.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/SpecificTrace.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/SpecificTrace.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificAttributeValue.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificDimension.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificDimension.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificDimension.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificDimension.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificReferenceValue.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificState.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificState.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificState.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificTracedObject.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificTracedObject.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificTracedObject.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificValue.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/SpecificValue.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificValue.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/StatesFactory.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/StatesFactory.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/StatesPackage.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/StatesPackage.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/StatesPackage.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesFactoryImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/StatesFactoryImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesFactoryImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/StatesFactoryImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesSwitch.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/States/util/StatesSwitch.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesSwitch.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificStep.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/SpecificStep.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificStep.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/StepsFactory.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/StepsFactory.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/StepsPackage.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/StepsPackage.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/StepsPackage.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/StepsFactoryImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BaseFactoryImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/BaseFactoryImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BaseFactoryImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/BaseFactoryImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/BasePackageImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/BasePackageImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/BasePackageImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseSwitch.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseSwitch.java similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/base/util/BaseSwitch.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseSwitch.java diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMExplorer.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMExplorer.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMExplorer.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerationTraceability.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerationTraceability.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerationTraceability.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerator.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerator.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorStates.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorStates.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorStates.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorSteps.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGeneratorSteps.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorSteps.xtend diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMStrings.xtend similarity index 100% rename from trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMStrings.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMStrings.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/.classpath b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/.classpath similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/.classpath rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/.classpath diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/.project b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/.project similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/.project rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/.project diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Clone.launch b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/2557-1_4-Clone.launch similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Clone.launch rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/2557-1_4-Clone.launch diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generated.launch b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/2557-1_4-Generated.launch similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generated.launch rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/2557-1_4-Generated.launch diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generic.launch b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/2557-1_4-Generic.launch similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-Generic.launch rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/2557-1_4-Generic.launch diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-None.launch b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/2557-1_4-None.launch similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/2557-1_4-None.launch rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/2557-1_4-None.launch diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/META-INF/MANIFEST.MF similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/META-INF/MANIFEST.MF rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/META-INF/MANIFEST.MF diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/about.html b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/about.html similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/about.html rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/about.html diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/build.properties b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/build.properties similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/build.properties rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/build.properties diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_4.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_4.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_4.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_4.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_5.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_5.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_5.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_5.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_6.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_6.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_6.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-1_6.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_4.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_4.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_4.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_4.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_5.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_5.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_5.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_5.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_6.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_6.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_6.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/2557-2_6.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-1_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/3561-2_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV1_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV2_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_false_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/ExampleBV3_true_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV1_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV2_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV3_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/ExecutionTraceModelImpl/hireV4_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_4.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_4.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_4.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_4.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_5.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_5.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_5.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_5.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_6.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_6.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-1_6.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-1_6.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_4.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_4.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_4.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_4.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_5.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_5.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_5.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_5.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_6.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_6.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/2557-2_6.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/2557-2_6.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-1_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-1_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-1_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-1_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-1_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-1_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-1_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-2_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-2_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-2_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-2_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-2_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/3561-2_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/3561-2_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV1_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV2_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_false_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/ExampleBV3_true_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV1_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV1_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV1_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV1_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV1_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV2_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV2_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV2_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV2_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV2_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV3_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV3_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV3_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV3_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV3_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV4_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV4_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV4_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/GenericTraceImpl/hireV4_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/GenericTraceImpl/hireV4_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_4.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_4.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_4.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_4.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_5.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_5.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_5.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_5.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_6.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_6.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_6.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-1_6.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_4.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_4.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_4.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_4.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_5.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_5.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_5.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_5.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_6.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_6.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_6.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/2557-2_6.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-1_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_1.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_1.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_1.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_1.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_2.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_2.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_2.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_2.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_3.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_3.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_3.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/3561-2_3.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV1_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV2_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_false_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_false_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/ExampleBV3_true_true_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV1_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV2_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV3_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_false.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_false.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_false.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_false.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_true.trace b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_true.trace similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_true.trace rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/model_traces/SpecificTraceImpl/hireV4_true.trace diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.aird b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_1.aird similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.aird rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_1.aird diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_1.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_1.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_1.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_2.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_2.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_2.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_2.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_3.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_3.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_3.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_3.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_4.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_4.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_4.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_4.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_5.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_5.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_5.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_5.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_6.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_6.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-1_6.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-1_6.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_1.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_1.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_1.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_1.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_2.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_2.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_2.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_2.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_3.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_3.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_3.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_3.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_4.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_4.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_4.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_4.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_5.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_5.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_5.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_5.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_6.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_6.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/2557-2_6.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/2557-2_6.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_1.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-1_1.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_1.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-1_1.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_2.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-1_2.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_2.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-1_2.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_3.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-1_3.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-1_3.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-1_3.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_1.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-2_1.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_1.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-2_1.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_2.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-2_2.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_2.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-2_2.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_3.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-2_3.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/3561-2_3.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/3561-2_3.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV1_false_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV1_false_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV1_false_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_false_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV1_false_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV1_true_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV1_true_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV1_true_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV1_true_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV1_true_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV2_false_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV2_false_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV2_false_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_false_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV2_false_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV2_true_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV2_true_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV2_true_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV2_true_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV2_true_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_false_false_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_false_false_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_false_false_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_false_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_false_false_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_false_true_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_false_true_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_false_true_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_false_true_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_false_true_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_true_false_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_true_false_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_true_false_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_false_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_true_false_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_true_true_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_true_true_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_true_true_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/ExampleBV3_true_true_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/ExampleBV3_true_true_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV1_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV1_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV1_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV1_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV1_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV2_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV2_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV2_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV2_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV2_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV3_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV3_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV3_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV3_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV3_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_false.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV4_false.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_false.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV4_false.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_true.xsad b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV4_true.xsad similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/models/hireV4_true.xsad rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/models/hireV4_true.xsad diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/output_memory_08-03-2017_16-32-39/results.csv b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/output_memory_08-03-2017_16-32-39/results.csv similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/output_memory_08-03-2017_16-32-39/results.csv rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/output_memory_08-03-2017_16-32-39/results.csv diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkData.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/BenchmarkData.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkData.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/BenchmarkData.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkMemoryTestSuite.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/BenchmarkMemoryTestSuite.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkMemoryTestSuite.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/BenchmarkMemoryTestSuite.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkSingleJVMTestSuite.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/BenchmarkSingleJVMTestSuite.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkSingleJVMTestSuite.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/BenchmarkSingleJVMTestSuite.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkTimeTestSuite.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/BenchmarkTimeTestSuite.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/BenchmarkTimeTestSuite.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/BenchmarkTimeTestSuite.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Language.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/Language.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/Language.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/Language.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextConverter.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/XTextConverter.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextConverter.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/XTextConverter.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextFixer2.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/XTextFixer2.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/XTextFixer2.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/XTextFixer2.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/api/IDebuggerHelper.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/api/IDebuggerHelper.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/api/IDebuggerHelper.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/api/IDebuggerHelper.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/ActivityDiagram.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/languages/ActivityDiagram.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/ActivityDiagram.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/languages/ActivityDiagram.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/BenchmarkLanguage.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/languages/BenchmarkLanguage.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/languages/BenchmarkLanguage.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/languages/BenchmarkLanguage.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/memory/HeapDump.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/memory/HeapDump.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/memory/HeapDump.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/memory/HeapDump.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/memory/MemoryAnalyzer.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/memory/MemoryAnalyzer.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/memory/MemoryAnalyzer.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/memory/MemoryAnalyzer.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/runconf/BenchmarkRunConfiguration.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/BenchmarkTracingCase.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/BenchmarkTracingCase.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/BenchmarkTracingCase.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/BenchmarkTracingCase.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/CloneBasedTracingCase.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/CloneBasedTracingCase.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/CloneBasedTracingCase.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/CloneBasedTracingCase.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GeneratedTracingCase.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/GeneratedTracingCase.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GeneratedTracingCase.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/GeneratedTracingCase.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GenericTracingCase.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/GenericTracingCase.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/GenericTracingCase.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/GenericTracingCase.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/HybridTracingCase.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/HybridTracingCase.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/HybridTracingCase.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/HybridTracingCase.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/NoTracingCase.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/NoTracingCase.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/tracingcases/NoTracingCase.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/tracingcases/NoTracingCase.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/BenchmarkExecutionModelContext.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkHelpers.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/BenchmarkHelpers.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/BenchmarkHelpers.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/BenchmarkHelpers.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVHelper.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/CSVHelper.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVHelper.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/CSVHelper.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVLine.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/CSVLine.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/CSVLine.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/CSVLine.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/EngineHelper.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/EngineHelper.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/EngineHelper.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/EngineHelper.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/MemoryCSVHelper.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/MemoryCSVHelper.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/MemoryCSVHelper.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/MemoryCSVHelper.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestListener.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/PDETestListener.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestListener.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/PDETestListener.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestResultsCollector.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/PDETestResultsCollector.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/src/fr/inria/diverse/trace/benchmark/utils/PDETestResultsCollector.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/src/org/eclipse/gemoc/trace/benchmark/utils/PDETestResultsCollector.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/.classpath b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/.classpath similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/.classpath rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/.classpath diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/.project b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/.project similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/.project rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/.project diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/META-INF/MANIFEST.MF similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/META-INF/MANIFEST.MF rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/META-INF/MANIFEST.MF diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/about.html b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/about.html similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/about.html rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/about.html diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/build.properties b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/build.properties similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/build.properties rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/build.properties diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_1.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_1.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_1.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_1.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_2.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_2.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_2.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_2.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_3.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_3.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_3.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_3.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_4.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_4.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_4.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_4.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_5.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_5.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_5.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_5.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_6.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_6.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_6.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-1_6.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_1.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_1.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_1.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_1.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_2.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_2.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_2.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_2.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_3.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_3.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_3.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_3.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_4.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_4.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_4.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_4.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_5.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_5.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_5.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_5.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_6.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_6.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_6.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/2557-2_6.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_1.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_1.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_1.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_1.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_2.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_2.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_2.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_2.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_3.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_3.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_3.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-1_3.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_1.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_1.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_1.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_1.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_2.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_2.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_2.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_2.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_3.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_3.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_3.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/3561-2_3.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_false_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_false_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_false_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_false_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_false_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_false_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_false_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_false_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_true_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_true_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_true_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_true_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_true_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_true_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_true_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV1_true_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_false_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_false_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_false_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_false_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_false_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_false_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_false_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_false_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_true_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_true_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_true_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_true_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_true_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_true_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_true_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV2_true_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_false_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_false_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_false_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_false_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_false_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_false_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_false_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_false_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_true_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_true_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_true_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_true_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_true_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_true_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_true_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_false_true_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_false_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_false_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_false_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_false_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_false_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_false_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_false_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_false_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_true_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_true_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_true_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_true_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_true_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_true_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_true_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/ExampleBV3_true_true_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV1_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV1_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV1_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV1_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV1_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV1_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV1_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV1_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV2_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV2_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV2_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV2_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV2_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV2_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV2_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV2_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV3_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV3_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV3_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV3_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV3_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV3_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV3_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV3_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV4_false.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV4_false.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV4_false.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV4_false.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV4_true.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV4_true.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV4_true.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/hireV4_true.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-1.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-1.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-1.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-1.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-2.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-2.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-2.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/2557-2.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/3561-1.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/3561-1.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/3561-1.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/3561-1.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/3561-2.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/3561-2.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/3561-2.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/3561-2.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV1.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV1.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV1.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV1.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV2.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV2.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV2.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV2.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV3.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV3.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV3.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/ExampleBV3.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV1.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV1.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV1.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV1.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV2.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV2.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV2.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV2.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV3.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV3.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV3.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV3.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV4.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV4.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV4.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.benchmark/workspace-benchmark/benchmark-models/model/originals/hireV4.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/.classpath b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/.classpath similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/.classpath rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/.classpath diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/.gitignore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/.gitignore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/.gitignore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/.gitignore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/.project b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/.project similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/.project rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/.project diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/META-INF/MANIFEST.MF similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/META-INF/MANIFEST.MF diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/about.html b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/about.html similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/about.html rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/about.html diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/build.properties b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/build.properties similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/build.properties rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/build.properties diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/src/fr/inria/diverse/trace/commons/testutil/EclipseTestUtil.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/src/org/eclipse/gemoc/trace/commons/testutil/EclipseTestUtil.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/src/fr/inria/diverse/trace/commons/testutil/EclipseTestUtil.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/src/org/eclipse/gemoc/trace/commons/testutil/EclipseTestUtil.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/src/fr/inria/diverse/trace/commons/testutil/Investigation.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/src/org/eclipse/gemoc/trace/commons/testutil/Investigation.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/src/fr/inria/diverse/trace/commons/testutil/Investigation.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.commons.testutil/src/org/eclipse/gemoc/trace/commons/testutil/Investigation.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/.classpath b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/.classpath similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/.classpath rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/.classpath diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/.gitignore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/.gitignore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/.gitignore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/.gitignore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/.project b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/.project similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/.project rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/.project diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/.settings/org.eclipse.core.resources.prefs b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/.settings/org.eclipse.core.resources.prefs rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/.settings/org.eclipse.core.resources.prefs diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/META-INF/MANIFEST.MF similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/META-INF/MANIFEST.MF rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/META-INF/MANIFEST.MF diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/about.html b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/about.html similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/about.html rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/about.html diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/build.properties b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/build.properties similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/build.properties rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/build.properties diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/src/fr/inria/diverse/trace/gemoc/generator/test/AddonGeneratorTest.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/src/org/eclipse/gemoc/trace/gemoc/generator/test/AddonGeneratorTest.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.gemoc.generator.test/src/fr/inria/diverse/trace/gemoc/generator/test/AddonGeneratorTest.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.gemoc.generator.test/src/org/eclipse/gemoc/trace/gemoc/generator/test/AddonGeneratorTest.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/.classpath b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/.classpath similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/.classpath rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/.classpath diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/.gitignore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/.gitignore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/.gitignore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/.gitignore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/.project b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/.project similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/.project rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/.project diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/META-INF/MANIFEST.MF similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/META-INF/MANIFEST.MF rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/META-INF/MANIFEST.MF diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/about.html b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/about.html similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/about.html rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/about.html diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/build.properties b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/build.properties similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/build.properties rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/build.properties diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/hs_err_pid8464.log b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/hs_err_pid8464.log similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/hs_err_pid8464.log rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/hs_err_pid8464.log diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/activitydiagram.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/activitydiagram.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/activitydiagram.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/activitydiagram.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/activitydiagramext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/activitydiagramext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/activitydiagramext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/activitydiagramext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/fumlext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/fumlext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/fumlext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/fumlext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/model1.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/model1.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/model1.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/model1.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/model1ext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/model1ext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/model1ext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/model1ext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/model2.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/model2.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/model2.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/model2.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/model2ext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/model2ext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/model2ext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/model2ext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/petrinet.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/petrinet.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/petrinet.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/petrinet.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/petrinetext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/petrinetext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs/petrinetext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs/petrinetext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/activitydiagram.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/activitydiagram.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/activitydiagram.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/activitydiagram.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/activitydiagram.xmof b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/activitydiagram.xmof similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/activitydiagram.xmof rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/activitydiagram.xmof diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/activitydiagramext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/activitydiagramext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/activitydiagramext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/activitydiagramext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/fumlext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/fumlext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/fumlext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/fumlext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model1.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model1.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model1.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model1.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model1.xmof b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model1.xmof similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model1.xmof rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model1.xmof diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model1ext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model1ext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model1ext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model1ext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model2.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model2.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model2.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model2.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model2.xmof b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model2.xmof similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model2.xmof rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model2.xmof diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model2ext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model2ext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/model2ext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/model2ext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/petrinet.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/petrinet.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/petrinet.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/petrinet.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/petrinet.xmof b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/petrinet.xmof similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/petrinet.xmof rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/petrinet.xmof diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/petrinetext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/petrinetext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/model_inputs_xmof/petrinetext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/model_inputs_xmof/petrinetext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/src/fr/inria/diverse/trace/metamodel/test/TraceMMGeneratorTest.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/src/org/eclipse/gemoc/trace/metamodel/test/TraceMMGeneratorTest.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/src/fr/inria/diverse/trace/metamodel/test/TraceMMGeneratorTest.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/src/org/eclipse/gemoc/trace/metamodel/test/TraceMMGeneratorTest.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/src/fr/inria/diverse/trace/metamodel/test/XMOFTraceMMGeneratorTest.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/src/org/eclipse/gemoc/trace/metamodel/test/XMOFTraceMMGeneratorTest.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.metamodel.generator.test/src/fr/inria/diverse/trace/metamodel/test/XMOFTraceMMGeneratorTest.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.metamodel.generator.test/src/org/eclipse/gemoc/trace/metamodel/test/XMOFTraceMMGeneratorTest.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/.classpath b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/.classpath similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/.classpath rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/.classpath diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/.gitignore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/.gitignore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/.gitignore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/.gitignore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/.project b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/.project similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/.project rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/.project diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/META-INF/MANIFEST.MF diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/about.html b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/about.html similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/about.html rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/about.html diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/build.properties b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/build.properties similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/build.properties rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/build.properties diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/TfsmExtended.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/TfsmExtended.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/TfsmExtended.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/TfsmExtended.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.classpath b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.classpath similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.classpath rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.classpath diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.gitignore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.gitignore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.gitignore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.gitignore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.project b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.project similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.project rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/.project diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/META-INF/MANIFEST.MF diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/about.html b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/about.html similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/about.html rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/about.html diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/build.properties b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/build.properties similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/build.properties rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/build.properties diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/plugin.properties b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/plugin.properties similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/plugin.properties rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/plugin.properties diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/plugin.xml b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/plugin.xml similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/plugin.xml rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/plugin.xml diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/pom.xml b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/pom.xml similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/pom.xml rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/pom.xml diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/Main.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/Main.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/Main.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/Main.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/Visitor.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/Visitor.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/Visitor.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/Visitor.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/tfsm.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/tfsm.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/tfsm.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/inputs/org.gemoc.sample.tfsm.plaink3.dsa/src/org/gemoc/sample/tfsm/plaink3/dsa/tfsm.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/test/TestPlainK3Extractor.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/src/org/eclipse/gemoc/trace/plaink3/tracematerialextractor/test/TestPlainK3Extractor.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plaink3.tracematerialextractor.test/src/fr/inria/diverse/trace/plaink3/tracematerialextractor/test/TestPlainK3Extractor.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plaink3.tracematerialextractor.test/src/org/eclipse/gemoc/trace/plaink3/tracematerialextractor/test/TestPlainK3Extractor.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/.classpath b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/.classpath similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/.classpath rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/.classpath diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/.gitignore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/.gitignore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/.gitignore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/.gitignore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/.project b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/.project similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/.project rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/.project diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/META-INF/MANIFEST.MF similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/META-INF/MANIFEST.MF rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/META-INF/MANIFEST.MF diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/about.html b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/about.html similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/about.html rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/about.html diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/build.properties b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/build.properties similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/build.properties rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/build.properties diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/petrinet.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/petrinet.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/petrinet.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/petrinet.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/petrinetevents.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/petrinetevents.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/petrinetevents.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/petrinetevents.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/petrinetext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/petrinetext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/petrinetext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/petrinetext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/tfsm.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/tfsm.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/tfsm.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/tfsm.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/tfsmevents.ecore b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/tfsmevents.ecore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/tfsmevents.ecore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/tfsmevents.ecore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/tfsmext.xmi b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/tfsmext.xmi similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/inputs/tfsmext.xmi rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/inputs/tfsmext.xmi diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/src/fr/inria/diverse/trace/plugin/generator/test/TestTracePluginGenerator.xtend b/trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/src/org/eclipse/gemoc/trace/plugin/generator/test/TestTracePluginGenerator.xtend similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.trace.plugin.generator.test/src/fr/inria/diverse/trace/plugin/generator/test/TestTracePluginGenerator.xtend rename to trace/tests_and_benchmarks/org.eclipse.gemoc.trace.plugin.generator.test/src/org/eclipse/gemoc/trace/plugin/generator/test/TestTracePluginGenerator.xtend diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/.classpath b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/.classpath similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/.classpath rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/.classpath diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/.gitignore b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/.gitignore similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/.gitignore rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/.gitignore diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/.project b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/.project similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/.project rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/.project diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/META-INF/MANIFEST.MF similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/META-INF/MANIFEST.MF rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/META-INF/MANIFEST.MF diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/about.html b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/about.html similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/about.html rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/about.html diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/build.properties b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/build.properties similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/build.properties rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/build.properties diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/matchrules/trace_domainspecific/actionExecutionOrder.ecl b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/matchrules/trace_domainspecific/actionExecutionOrder.ecl similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/matchrules/trace_domainspecific/actionExecutionOrder.ecl rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/matchrules/trace_domainspecific/actionExecutionOrder.ecl diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/matchrules/trace_generic/actionExecutionOrder.ecl b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/matchrules/trace_generic/actionExecutionOrder.ecl similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/matchrules/trace_generic/actionExecutionOrder.ecl rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/matchrules/trace_generic/actionExecutionOrder.ecl diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/DomainSpecificTraceExtraction.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/DomainSpecificTraceExtraction.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/DomainSpecificTraceExtraction.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/DomainSpecificTraceExtraction.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/DomainSpecificTraceMatching.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/DomainSpecificTraceMatching.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/DomainSpecificTraceMatching.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/DomainSpecificTraceMatching.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/Evaluation.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/Evaluation.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/Evaluation.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/Evaluation.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/GenericTraceExtraction.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/GenericTraceExtraction.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/GenericTraceExtraction.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/GenericTraceExtraction.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/GenericTraceMatching.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/GenericTraceMatching.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/GenericTraceMatching.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/GenericTraceMatching.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/TraceExtraction.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/TraceExtraction.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/TraceExtraction.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/TraceExtraction.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/TraceMatching.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/TraceMatching.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/TraceMatching.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/TraceMatching.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/CustomStatesBuilder.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/CustomStatesBuilder.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/CustomStatesBuilder.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/CustomStatesBuilder.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/MatchResult.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/MatchResult.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/MatchResult.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/MatchResult.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/ModelExecutor.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/ModelExecutor.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/ModelExecutor.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/ModelExecutor.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/TraceMatcher.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/TraceMatcher.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/TraceMatcher.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/TraceMatcher.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/TraceMatchingEvent.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/TraceMatchingEvent.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/TraceMatchingEvent.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/TraceMatchingEvent.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/TraceMatchingListener.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/TraceMatchingListener.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/TraceMatchingListener.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/TraceMatchingListener.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/Util.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/Util.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/Util.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/Util.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/MatchingReport.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/MatchingReport.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/MatchingReport.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/MatchingReport.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/MatchingReportEntry.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/MatchingReportEntry.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/MatchingReportEntry.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/MatchingReportEntry.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/Report.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/Report.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/Report.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/Report.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/ReportEntry.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/ReportEntry.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/ReportEntry.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/ReportEntry.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/TraceReport.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/TraceReport.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/TraceReport.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/TraceReport.java diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/TraceReportEntry.java b/trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/TraceReportEntry.java similarity index 100% rename from trace/tests_and_benchmarks/fr.inria.diverse.tracemm.semdiff.eval/src/fr/inria/diverse/tracemm/semdiff/eval/internal/reporting/TraceReportEntry.java rename to trace/tests_and_benchmarks/org.eclipse.gemoc.tracemm.semdiff.eval/src/org/eclipse/gemoc/tracemm/semdiff/eval/internal/reporting/TraceReportEntry.java From 7dff0619838b3c1896f8b272a72d0caa43f7649f Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 11:30:30 +0200 Subject: [PATCH 237/267] rename fr.inria.diverse.trace* in org.eclipse.gemoc.trace* --- .../META-INF/MANIFEST.MF | 2 +- .../debugger/AbstractGemocDebugger.java | 4 +- .../debugger/GemocBreakpoint.java | 2 +- .../debugger/IGemocDebugger.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../ui/launcher/AbstractGemocLauncher.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../engine/core/AbstractExecutionEngine.java | 4 +- .../AbstractSequentialExecutionEngine.java | 20 +- .../core/SequentialExecutionException.xtend | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../views/EventManagerRenderer.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../AbstractGemocAnimatorServices.java | 6 +- .../sirius/services/IModelAnimator.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../ui/utils/ViewUtils.java | 2 +- .../ui/views/engine/EnginesStatusView.java | 2 +- framework/execution_framework/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../test/lib/impl/TestEngineAddon.xtend | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../gemoc_execution_trace/Choice.java | 4 +- .../impl/ChoiceImpl.java | 2 +- .../Gemoc_execution_tracePackageImpl.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../xdsmlframework/api/core/EngineStatus.java | 2 +- .../api/core/IExecutionContext.java | 2 +- .../api/core/IExecutionEngine.java | 6 +- .../api/engine_addon/DefaultEngineAddon.java | 2 +- .../api/engine_addon/IEngineAddon.java | 2 +- framework/framework_commons/pom.xml | 2 +- framework/xdsml_framework/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../test/lib/WorkspaceTestHelper.xtend | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../GemocToggleBreakpointHandler.java | 4 +- .../debug/GenericSequentialModelDebugger.java | 6 +- ...scientGenericSequentialModelDebugger.xtend | 20 +- .../launcher/GemocDebugModelPresentation.java | 4 +- .../ui/launcher/GemocSourceLocator.java | 2 +- .../javaengine/ui/launcher/Launcher.java | 10 +- .../META-INF/MANIFEST.MF | 4 +- .../javaengine/PlainK3ExecutionEngine.java | 20 +- .../SequentialModelExecutionContext.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../category.xml | 16 +- .../META-INF/MANIFEST.MF | 2 +- .../services/AbstractDSLDebuggerServices.java | 6 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 24 +- .../plugin.xml | 6 +- .../pom.xml | 2 +- .../generictrace/BooleanAttributeValue.java | 10 +- .../generictrace/GenericAttributeValue.java | 4 +- .../model/generictrace/GenericDimension.java | 12 +- .../generictrace/GenericParallelStep.java | 6 +- .../generictrace/GenericReferenceValue.java | 4 +- .../generictrace/GenericSequentialStep.java | 6 +- .../model/generictrace/GenericSmallStep.java | 6 +- .../model/generictrace/GenericState.java | 6 +- .../model/generictrace/GenericStep.java | 6 +- .../model/generictrace/GenericTrace.java | 6 +- .../generictrace/GenericTracedObject.java | 18 +- .../model/generictrace/GenericValue.java | 6 +- .../generictrace/GenerictraceFactory.java | 6 +- .../generictrace/GenerictracePackage.java | 384 +++++++++--------- .../generictrace/IntegerAttributeValue.java | 10 +- .../IntegerObjectAttributeValue.java | 10 +- .../ManyBooleanAttributeValue.java | 8 +- .../ManyIntegerAttributeValue.java | 8 +- .../generictrace/ManyReferenceValue.java | 8 +- .../ManyStringAttributeValue.java | 8 +- .../generictrace/SingleReferenceValue.java | 10 +- .../generictrace/StringAttributeValue.java | 10 +- .../impl/BooleanAttributeValueImpl.java | 8 +- .../impl/GenericAttributeValueImpl.java | 6 +- .../impl/GenericDimensionImpl.java | 12 +- .../impl/GenericParallelStepImpl.java | 16 +- .../impl/GenericReferenceValueImpl.java | 6 +- .../impl/GenericSequentialStepImpl.java | 16 +- .../impl/GenericSmallStepImpl.java | 6 +- .../generictrace/impl/GenericStateImpl.java | 18 +- .../generictrace/impl/GenericStepImpl.java | 10 +- .../generictrace/impl/GenericTraceImpl.java | 14 +- .../impl/GenericTracedObjectImpl.java | 18 +- .../generictrace/impl/GenericValueImpl.java | 14 +- .../impl/GenerictraceFactoryImpl.java | 4 +- .../impl/GenerictracePackageImpl.java | 54 +-- .../impl/IntegerAttributeValueImpl.java | 8 +- .../impl/IntegerObjectAttributeValueImpl.java | 8 +- .../impl/ManyBooleanAttributeValueImpl.java | 8 +- .../impl/ManyIntegerAttributeValueImpl.java | 8 +- .../impl/ManyReferenceValueImpl.java | 8 +- .../impl/ManyStringAttributeValueImpl.java | 8 +- .../impl/SingleReferenceValueImpl.java | 8 +- .../impl/StringAttributeValueImpl.java | 8 +- .../util/GenerictraceAdapterFactory.java | 146 +++---- .../generictrace/util/GenerictraceSwitch.java | 26 +- .../commons/model/helper/StepHelper.java | 12 +- .../AddonExtensionParameter.java | 4 +- .../AnimatorURIParameter.java | 4 +- .../EntryPointParameter.java | 4 +- .../InitializationArgumentsParameter.java | 4 +- .../InitializationMethodParameter.java | 4 +- .../LanguageNameParameter.java | 4 +- .../LaunchConfiguration.java | 16 +- .../LaunchConfigurationParameter.java | 10 +- .../LaunchconfigurationFactory.java | 6 +- .../LaunchconfigurationPackage.java | 182 ++++----- .../ModelRootParameter.java | 4 +- .../ModelURIParameter.java | 4 +- .../impl/AddonExtensionParameterImpl.java | 6 +- .../impl/AnimatorURIParameterImpl.java | 6 +- .../impl/EntryPointParameterImpl.java | 6 +- .../InitializationArgumentsParameterImpl.java | 6 +- .../InitializationMethodParameterImpl.java | 6 +- .../impl/LanguageNameParameterImpl.java | 6 +- .../impl/LaunchConfigurationImpl.java | 12 +- .../LaunchConfigurationParameterImpl.java | 8 +- .../impl/LaunchconfigurationFactoryImpl.java | 4 +- .../impl/LaunchconfigurationPackageImpl.java | 30 +- .../impl/ModelRootParameterImpl.java | 6 +- .../impl/ModelURIParameterImpl.java | 6 +- .../LaunchconfigurationAdapterFactory.java | 46 +-- .../util/LaunchconfigurationSwitch.java | 6 +- .../trace/commons/model/trace/BigStep.java | 8 +- .../trace/commons/model/trace/Dimension.java | 8 +- .../trace/commons/model/trace/GenericMSE.java | 16 +- .../gemoc/trace/commons/model/trace/MSE.java | 4 +- .../trace/commons/model/trace/MSEModel.java | 10 +- .../commons/model/trace/MSEOccurrence.java | 18 +- .../commons/model/trace/ParallelStep.java | 4 +- .../commons/model/trace/SequentialStep.java | 4 +- .../trace/commons/model/trace/SmallStep.java | 4 +- .../trace/commons/model/trace/State.java | 28 +- .../gemoc/trace/commons/model/trace/Step.java | 30 +- .../trace/commons/model/trace/Trace.java | 26 +- .../commons/model/trace/TraceFactory.java | 6 +- .../commons/model/trace/TracePackage.java | 334 +++++++-------- .../commons/model/trace/TracedObject.java | 8 +- .../trace/commons/model/trace/Value.java | 12 +- .../commons/model/trace/impl/BigStepImpl.java | 12 +- .../model/trace/impl/DimensionImpl.java | 10 +- .../model/trace/impl/GenericMSEImpl.java | 10 +- .../commons/model/trace/impl/MSEImpl.java | 6 +- .../model/trace/impl/MSEModelImpl.java | 10 +- .../model/trace/impl/MSEOccurrenceImpl.java | 14 +- .../model/trace/impl/ParallelStepImpl.java | 10 +- .../model/trace/impl/SequentialStepImpl.java | 10 +- .../model/trace/impl/SmallStepImpl.java | 8 +- .../commons/model/trace/impl/StateImpl.java | 16 +- .../commons/model/trace/impl/StepImpl.java | 16 +- .../model/trace/impl/TraceFactoryImpl.java | 4 +- .../commons/model/trace/impl/TraceImpl.java | 22 +- .../model/trace/impl/TracePackageImpl.java | 42 +- .../model/trace/impl/TracedObjectImpl.java | 10 +- .../commons/model/trace/impl/ValueImpl.java | 10 +- .../model/trace/util/TraceAdapterFactory.java | 62 +-- .../commons/model/trace/util/TraceSwitch.java | 6 +- .../org.eclipse.gemoc.trace.commons/.project | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../org.eclipse.gemoc.trace.commons/pom.xml | 2 +- .../gemoc/trace/commons/CodeGenUtil.java | 2 +- .../gemoc/trace/commons/EMFCompareUtil.xtend | 2 +- .../eclipse/gemoc/trace/commons/EMFUtil.java | 2 +- .../gemoc/trace/commons/EclipseUtil.xtend | 2 +- .../trace/commons/EcoreCraftingUtil.xtend | 2 +- .../ExecutionMetamodelTraceability.xtend | 2 +- .../gemoc/trace/commons/ManifestUtil.java | 2 +- .../gemoc/trace/commons/PluginXMLHelper.java | 2 +- .../commons/tracemetamodel/StepStrings.xtend | 4 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../org.eclipse.gemoc.trace.gemoc.api/pom.xml | 2 +- .../api/IMultiDimensionalTraceAddon.java | 12 +- .../gemoc/trace/gemoc/api/IStateManager.java | 4 +- .../gemoc/trace/gemoc/api/IStepFactory.java | 6 +- .../trace/gemoc/api/ITraceConstructor.java | 6 +- .../gemoc/trace/gemoc/api/ITraceExplorer.java | 14 +- .../trace/gemoc/api/ITraceExtractor.java | 16 +- .../gemoc/trace/gemoc/api/ITraceListener.java | 10 +- .../gemoc/trace/gemoc/api/ITraceNotifier.java | 2 +- .../trace/gemoc/api/ITraceViewListener.java | 2 +- .../trace/gemoc/api/ITraceViewNotifier.java | 2 +- trace/commons/pom.xml | 8 +- .../.project | 2 +- .../feature.xml | 6 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../pom.xml | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../pom.xml | 2 +- .../TracingannotationsEditor.java | 6 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 14 +- .../pom.xml | 2 +- .../GenericEngineTraceAddonGenerator.xtend | 58 +-- .../TraceAddonGeneratorIntegration.xtend | 6 +- .../codegen/StateManagerGeneratorJava.xtend | 14 +- .../TraceConstructorGeneratorJava.xtend | 28 +- .../generator/util/ExtensionFilter.xtend | 4 +- .../generator/util/PluginProjectHelper.xtend | 2 +- .../util/StandaloneEMFProjectGenerator.xtend | 2 +- .../org.eclipse.gemoc.trace.gemoc.ui/.project | 2 +- .../META-INF/MANIFEST.MF | 8 +- .../plugin.xml | 6 +- .../org.eclipse.gemoc.trace.gemoc.ui/pom.xml | 2 +- .../gemoc/trace/gemoc/ui/Activator.java | 2 +- .../XDSMLProject2TraceAddonHandler.xtend | 6 +- .../gemoc/ui/launch/EcoreFileFilter.java | 2 +- .../org.eclipse.gemoc.trace.gemoc/.project | 2 +- .../META-INF/MANIFEST.MF | 10 +- .../org.eclipse.gemoc.trace.gemoc/plugin.xml | 2 +- .../org.eclipse.gemoc.trace.gemoc/pom.xml | 2 +- .../gemoc/traceaddon/AbstractTraceAddon.xtend | 26 +- .../gemoc/traceaddon/GenericStateManager.java | 26 +- .../traceaddon/GenericTraceConstructor.java | 46 +-- .../traceaddon/GenericTraceEngineAddon.java | 14 +- .../traceaddon/GenericTraceExplorer.java | 24 +- .../traceaddon/GenericTraceExtractor.java | 32 +- .../traceaddon/GenericTraceNotifier.java | 16 +- .../traceaddon/GenericTraceStepFactory.java | 14 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 8 +- .../pom.xml | 2 +- .../src/base/BasePackage.java | 2 +- .../src/base/SpecificTrace.java | 4 +- .../src/base/States/SpecificDimension.java | 2 +- .../src/base/States/SpecificState.java | 2 +- .../src/base/States/SpecificTracedObject.java | 2 +- .../src/base/States/SpecificValue.java | 2 +- .../src/base/States/StatesPackage.java | 2 +- .../States/impl/SpecificDimensionImpl.java | 2 +- .../base/States/impl/SpecificStateImpl.java | 8 +- .../States/impl/SpecificTracedObjectImpl.java | 2 +- .../base/States/impl/SpecificValueImpl.java | 6 +- .../base/States/impl/StatesPackageImpl.java | 2 +- .../States/util/StatesAdapterFactory.java | 26 +- .../src/base/States/util/StatesSwitch.java | 10 +- .../src/base/Steps/RootImplicitStep.java | 2 +- .../src/base/Steps/SpecificRootStep.java | 2 +- .../src/base/Steps/SpecificStep.java | 2 +- .../src/base/Steps/StepsPackage.java | 2 +- .../base/Steps/impl/RootImplicitStepImpl.java | 2 +- .../base/Steps/impl/SpecificRootStepImpl.java | 2 +- .../src/base/Steps/impl/SpecificStepImpl.java | 2 +- .../src/base/Steps/impl/StepsPackageImpl.java | 2 +- .../base/Steps/util/StepsAdapterFactory.java | 26 +- .../src/base/Steps/util/StepsSwitch.java | 10 +- .../src/base/impl/BasePackageImpl.java | 2 +- .../src/base/impl/SpecificTraceImpl.java | 4 +- .../src/base/util/BaseAdapterFactory.java | 12 +- .../src/base/util/BaseSwitch.java | 8 +- .../metamodel/generator/TraceMMExplorer.xtend | 2 +- .../TraceMMGenerationTraceability.xtend | 2 +- .../generator/TraceMMGenerator.xtend | 6 +- .../generator/TraceMMGeneratorStates.xtend | 8 +- .../generator/TraceMMGeneratorSteps.xtend | 8 +- .../metamodel/generator/TraceMMStrings.xtend | 2 +- trace/generator/pom.xml | 12 +- .../.project | 2 +- .../feature.xml | 10 +- .../META-INF/MANIFEST.MF | 6 +- .../diffviewer/logic/DiffComputer.java | 2 +- .../views/TimelineDiffViewerRenderer.java | 12 +- .../views/TimelineDiffViewerViewPart.java | 4 +- .../diffviewer/views/TraceSectionsDialog.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../MultidimensionalTimelineRenderer.java | 16 +- .../MultidimensionalTimelineViewPart.java | 20 +- .../META-INF/MANIFEST.MF | 6 +- .../stategraph/logic/StateGraph.java | 18 +- .../stategraph/views/StateGraphViewPart.java | 4 +- trace/manager/pom.xml | 2 +- .../.project | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 10 +- .../gemoc/trace/benchmark/BenchmarkData.xtend | 4 +- .../benchmark/BenchmarkMemoryTestSuite.xtend | 12 +- .../BenchmarkSingleJVMTestSuite.xtend | 26 +- .../benchmark/BenchmarkTimeTestSuite.xtend | 10 +- .../gemoc/trace/benchmark/Language.java | 2 +- .../gemoc/trace/benchmark/XTextConverter.java | 2 +- .../gemoc/trace/benchmark/XTextFixer2.java | 4 +- .../trace/benchmark/api/IDebuggerHelper.java | 4 +- .../benchmark/languages/ActivityDiagram.xtend | 2 +- .../languages/BenchmarkLanguage.xtend | 2 +- .../trace/benchmark/memory/HeapDump.java | 2 +- .../benchmark/memory/MemoryAnalyzer.java | 2 +- .../runconf/BenchmarkRunConfiguration.xtend | 4 +- .../tracingcases/BenchmarkTracingCase.xtend | 8 +- .../tracingcases/CloneBasedTracingCase.xtend | 4 +- .../tracingcases/GeneratedTracingCase.xtend | 4 +- .../tracingcases/GenericTracingCase.xtend | 4 +- .../tracingcases/HybridTracingCase.xtend | 4 +- .../tracingcases/NoTracingCase.xtend | 2 +- .../BenchmarkExecutionModelContext.xtend | 2 +- .../benchmark/utils/BenchmarkHelpers.xtend | 2 +- .../trace/benchmark/utils/CSVHelper.xtend | 2 +- .../gemoc/trace/benchmark/utils/CSVLine.xtend | 2 +- .../trace/benchmark/utils/EngineHelper.java | 6 +- .../benchmark/utils/MemoryCSVHelper.xtend | 2 +- .../benchmark/utils/PDETestListener.java | 2 +- .../utils/PDETestResultsCollector.java | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../commons/testutil/EclipseTestUtil.xtend | 2 +- .../commons/testutil/Investigation.xtend | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 10 +- .../generator/test/AddonGeneratorTest.xtend | 10 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../metamodel/test/TraceMMGeneratorTest.xtend | 6 +- .../test/XMOFTraceMMGeneratorTest.xtend | 4 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 10 +- .../test/TestPlainK3Extractor.xtend | 12 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 10 +- .../test/TestTracePluginGenerator.xtend | 10 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../eval/DomainSpecificTraceExtraction.java | 2 +- .../eval/DomainSpecificTraceMatching.java | 2 +- .../tracemm/semdiff/eval/Evaluation.java | 4 +- .../semdiff/eval/GenericTraceExtraction.java | 2 +- .../semdiff/eval/GenericTraceMatching.java | 2 +- .../tracemm/semdiff/eval/TraceExtraction.java | 8 +- .../tracemm/semdiff/eval/TraceMatching.java | 16 +- .../eval/internal/CustomStatesBuilder.java | 2 +- .../semdiff/eval/internal/MatchResult.java | 2 +- .../semdiff/eval/internal/ModelExecutor.java | 6 +- .../semdiff/eval/internal/TraceMatcher.java | 4 +- .../eval/internal/TraceMatchingEvent.java | 2 +- .../eval/internal/TraceMatchingListener.java | 2 +- .../tracemm/semdiff/eval/internal/Util.java | 2 +- .../internal/reporting/MatchingReport.java | 2 +- .../reporting/MatchingReportEntry.java | 2 +- .../eval/internal/reporting/Report.java | 2 +- .../eval/internal/reporting/ReportEntry.java | 2 +- .../eval/internal/reporting/TraceReport.java | 2 +- .../internal/reporting/TraceReportEntry.java | 2 +- 348 files changed, 1800 insertions(+), 1800 deletions(-) rename trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/{fr/inria/diverse => org/eclipse/gemoc}/trace/gemoc/traceaddon/AbstractTraceAddon.xtend (91%) rename trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/{fr/inria/diverse => org/eclipse/gemoc}/trace/gemoc/traceaddon/GenericStateManager.java (76%) rename trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/{fr/inria/diverse => org/eclipse/gemoc}/trace/gemoc/traceaddon/GenericTraceConstructor.java (90%) rename trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/{fr/inria/diverse => org/eclipse/gemoc}/trace/gemoc/traceaddon/GenericTraceEngineAddon.java (78%) rename trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/{fr/inria/diverse => org/eclipse/gemoc}/trace/gemoc/traceaddon/GenericTraceExplorer.java (95%) rename trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/{fr/inria/diverse => org/eclipse/gemoc}/trace/gemoc/traceaddon/GenericTraceExtractor.java (95%) rename trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/{fr/inria/diverse => org/eclipse/gemoc}/trace/gemoc/traceaddon/GenericTraceNotifier.java (86%) rename trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/{fr/inria/diverse => org/eclipse/gemoc}/trace/gemoc/traceaddon/GenericTraceStepFactory.java (64%) diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF index f65ec1e64..6bde8966a 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: com.google.guava, org.eclipse.gemoc.dsl.debug.ide, org.eclipse.gemoc.xdsmlframework.api, org.eclipse.emf.ecore, - fr.inria.diverse.trace.commons.model, + org.eclipse.gemoc.trace.commons.model, org.eclipse.ui.workbench, org.eclipse.swt;bundle-version="3.105.3", org.eclipse.jface;bundle-version="3.12.2", diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AbstractGemocDebugger.java index 41090e495..3bcc6e994 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AbstractGemocDebugger.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/AbstractGemocDebugger.java @@ -53,8 +53,8 @@ import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.IModelChangeListenerAddon; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.SimpleModelChangeListenerAddon; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.Step; import org.eclipse.gemoc.dsl.debug.StackFrame; import org.eclipse.gemoc.dsl.debug.ide.AbstractDSLDebugger; import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLStackFrameAdapter; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/GemocBreakpoint.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/GemocBreakpoint.java index e7a783989..8ecd36915 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/GemocBreakpoint.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/GemocBreakpoint.java @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EObject; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; public class GemocBreakpoint extends DSLBreakpoint { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IGemocDebugger.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IGemocDebugger.java index 1ee5483b6..23e6311f3 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IGemocDebugger.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/IGemocDebugger.java @@ -15,7 +15,7 @@ import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; public interface IGemocDebugger extends IEngineAddon { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF index 86b3330ab..7bdc1d6eb 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.executionframework.extensions.sirius, org.eclipse.gemoc.commons.eclipse.messagingsystem.api, org.eclipse.gemoc.dsl.debug.ide.ui;bundle-version="1.0.0", - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", + org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0", org.eclipse.gemoc.dsl.debug, fr.inria.diverse.melange Bundle-ActivationPolicy: lazy diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java index 0c4c880c3..075b8b2bc 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java @@ -17,7 +17,7 @@ import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration; import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; abstract public class AbstractGemocLauncher extends org.eclipse.gemoc.dsl.debug.ide.sirius.ui.launch.AbstractDSLLaunchConfigurationDelegateUI { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF index 3b9bd9dd0..54a7e8c68 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF @@ -11,9 +11,9 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.commons.eclipse.pde;bundle-version="0.1.0", org.eclipse.xtend.lib, org.eclipse.emf.transaction;bundle-version="1.8.0", - fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", + org.eclipse.gemoc.trace.gemoc.api;bundle-version="1.0.0", fr.inria.diverse.k3.al.annotationprocessor.plugin, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" + org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.eclipse.gemoc.executionframework.engine, diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractExecutionEngine.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractExecutionEngine.java index f329c42c8..98e2b6345 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractExecutionEngine.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractExecutionEngine.java @@ -31,8 +31,8 @@ import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.Step; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java index a52059443..a252a4eec 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/AbstractSequentialExecutionEngine.java @@ -27,16 +27,16 @@ import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; -import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; -import fr.inria.diverse.trace.commons.model.trace.GenericMSE; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.MSEModel; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TraceFactory; -import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericSequentialStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictraceFactory; +import org.eclipse.gemoc.trace.commons.model.trace.GenericMSE; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.MSEModel; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TraceFactory; +import org.eclipse.gemoc.trace.gemoc.api.IMultiDimensionalTraceAddon; /** diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/SequentialExecutionException.xtend b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/SequentialExecutionException.xtend index 80395959d..7484d6ef9 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/SequentialExecutionException.xtend +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/core/SequentialExecutionException.xtend @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.gemoc.executionframework.engine.core; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence import org.eclipse.emf.transaction.RollbackException /** diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF index 4de812431..8dc575384 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.gemoc.executionframework.ui, org.eclipse.gemoc.xdsmlframework.api, org.eclipse.emf.ecore, - fr.inria.diverse.trace.commons.model, + org.eclipse.gemoc.trace.commons.model, org.eclipse.xtext, fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="3.2.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java index ef836b0ec..1c3dee169 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.eventmanager/src/org/eclipse/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java @@ -25,7 +25,7 @@ import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.EventManagerRegistry; import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.IEventManager; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF index 80ac46693..bc7040783 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.executionframework.engine, org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", org.eclipse.ui.ide;bundle-version="3.10.2", - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", + org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0", fr.inria.diverse.melange.resource;bundle-version="0.1.0", fr.inria.diverse.melange.adapters Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,4 +28,4 @@ Export-Package: org.eclipse.gemoc.executionframework.extensions.sirius, org.eclipse.gemoc.executionframework.extensions.sirius.debug, org.eclipse.gemoc.executionframework.extensions.sirius.modelloader, org.eclipse.gemoc.executionframework.extensions.sirius.services -Import-Package: fr.inria.diverse.trace.commons.model.trace +Import-Package: org.eclipse.gemoc.trace.commons.model.trace diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java index 97c401747..87b562f38 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java @@ -43,9 +43,9 @@ import org.eclipse.gemoc.xdsmlframework.api.Activator; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.ParallelStep; +import org.eclipse.gemoc.trace.commons.model.trace.Step; import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; public abstract class AbstractGemocAnimatorServices { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java index 94a0d6517..b3f0347b3 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/services/IModelAnimator.java @@ -12,7 +12,7 @@ import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; /** * Animator interface. diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF index f226fc8b0..85e470245 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.executionframework.engine;bundle-version="0.1.0", org.eclipse.gemoc.commons.eclipse.ui;bundle-version="0.1.0", org.eclipse.xtext.util, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" + org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-Vendor: GEMOC diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/utils/ViewUtils.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/utils/ViewUtils.java index cfdf38962..856b72bab 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/utils/ViewUtils.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/utils/ViewUtils.java @@ -12,7 +12,7 @@ import org.eclipse.xtext.util.SimpleAttributeResolver; -import fr.inria.diverse.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; public class ViewUtils { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EnginesStatusView.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EnginesStatusView.java index 4eac2977e..f3fec8a43 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EnginesStatusView.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/src/org/eclipse/gemoc/executionframework/ui/views/engine/EnginesStatusView.java @@ -50,7 +50,7 @@ import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; public class EnginesStatusView extends ViewPart implements IEngineAddon, IEngineRegistrationListener { diff --git a/framework/execution_framework/pom.xml b/framework/execution_framework/pom.xml index 1885b8c81..78ad32c5f 100644 --- a/framework/execution_framework/pom.xml +++ b/framework/execution_framework/pom.xml @@ -25,7 +25,7 @@ -     @@ -71,7 +71,7 @@ modeldebugging_trace_commons on CI p2 - https://ci.inria.fr/gemoc/job/modeldebugging_trace_commons/lastSuccessfulBuild/artifact/trace/commons/releng/fr.inria.diverse.trace.commons.updatesite/target/repository/ + https://ci.inria.fr/gemoc/job/modeldebugging_trace_commons/lastSuccessfulBuild/artifact/trace/commons/releng/org.eclipse.gemoc.trace.commons.updatesite/target/repository/ --> modelanimation_siriusmodelanimation on CI diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF index 68ab4fae9..354939278 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: com.google.guava, org.eclipse.emf.ecore;bundle-version="2.12.0", org.eclipse.swt;bundle-version="3.105.3", org.eclipse.ui;bundle-version="3.108.1", - fr.inria.diverse.trace.gemoc;bundle-version="2.3.0", + org.eclipse.gemoc.trace.gemoc;bundle-version="2.3.0", org.eclipse.gemoc.executionframework.engine;bundle-version="2.3.0" Export-Package: org.eclipse.gemoc.executionframework.test.lib, org.eclipse.gemoc.executionframework.test.lib.impl diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend index d7aa4e903..a8689aa89 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestEngineAddon.xtend @@ -2,7 +2,7 @@ package org.eclipse.gemoc.executionframework.test.lib.impl import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine -import fr.inria.diverse.trace.commons.model.trace.Step +import org.eclipse.gemoc.trace.commons.model.trace.Step import java.util.Collection import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus import java.util.List diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF index b3158a973..6bc5e1dbc 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Export-Package: org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execu Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0";visibility:=reexport + org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java index 9cd3fddb3..a815b0eb6 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/Choice.java @@ -14,7 +14,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; /** * @@ -59,7 +59,7 @@ public interface Choice extends EObject { /** * Returns the value of the 'Possible Logical Steps' containment reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.Step}. + * The list contents are of type {@link org.eclipse.gemoc.trace.commons.model.trace.Step}. * *

    * If the meaning of the 'Possible Logical Steps' containment reference list isn't clear, diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java index 62282a797..8be74f1ea 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/ChoiceImpl.java @@ -28,7 +28,7 @@ import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Choice; import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.ContextState; import org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.Gemoc_execution_tracePackage; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; /** * diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java index 847f9d947..7dd8a9086 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.executionframework.reflectivetrace.model/src/org/eclipse/gemoc/executionframework/reflectivetrace/gemoc_execution_trace/impl/Gemoc_execution_tracePackageImpl.java @@ -12,7 +12,7 @@ */ package org.eclipse.gemoc.executionframework.reflectivetrace.gemoc_execution_trace.impl; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF index 4802f915d..375e76d1f 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.gemoc.executionframework.reflectivetrace.model;bundle-version="0.1.0", org.eclipse.gemoc.commons.eclipse;bundle-version="0.1.0", org.eclipse.xtend.lib, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0" + org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.gemoc.xdsmlframework.api, diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/EngineStatus.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/EngineStatus.java index 1f1a59a31..831653b82 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/EngineStatus.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/EngineStatus.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.gemoc.xdsmlframework.api.core; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; public class EngineStatus { long nbLogicalStepRun = 0; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionContext.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionContext.java index 0215f6010..19e7cec2e 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionContext.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionContext.java @@ -14,7 +14,7 @@ import org.eclipse.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension; import org.osgi.framework.Bundle; -import fr.inria.diverse.trace.commons.model.trace.MSEModel; +import org.eclipse.gemoc.trace.commons.model.trace.MSEModel; public interface IExecutionContext extends IDisposable { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionEngine.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionEngine.java index ce8f76ecc..df6be5f9e 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionEngine.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/core/IExecutionEngine.java @@ -16,8 +16,8 @@ import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; /** * The interface of the GEMOC Execution Engine. The Execution Engine is an @@ -106,7 +106,7 @@ public interface IExecutionEngine extends IDisposable { /** * Create a {@link LaunchConfiguration} for the Trace based on the engine RunConfiguration. - * @return a {@link fr.inria.diverse.trace.commons.model.trace.LaunchConfiguration} + * @return a {@link org.eclipse.gemoc.trace.commons.model.trace.LaunchConfiguration} */ default LaunchConfiguration extractLaunchConfiguration() { return null; diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java index fc984cc18..3d1c5dc6d 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java @@ -17,7 +17,7 @@ import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; public class DefaultEngineAddon implements IEngineAddon { diff --git a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java index 917574fa9..4b169d236 100644 --- a/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java +++ b/framework/framework_commons/plugins/org.eclipse.gemoc.xdsmlframework.api/src/org/eclipse/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java @@ -16,7 +16,7 @@ import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; public interface IEngineAddon { diff --git a/framework/framework_commons/pom.xml b/framework/framework_commons/pom.xml index 7d34a53eb..84ee5b23f 100644 --- a/framework/framework_commons/pom.xml +++ b/framework/framework_commons/pom.xml @@ -26,7 +26,7 @@ - diff --git a/framework/xdsml_framework/pom.xml b/framework/xdsml_framework/pom.xml index b5b00b205..cd38d303a 100644 --- a/framework/xdsml_framework/pom.xml +++ b/framework/xdsml_framework/pom.xml @@ -23,7 +23,7 @@ - diff --git a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF index 530eeac43..18f2d5306 100644 --- a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF @@ -17,6 +17,6 @@ Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.xtext.ui;bundle-version="2.10.0", fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", org.eclipse.core.expressions;bundle-version="3.5.100", - fr.inria.diverse.trace.gemoc.generator;bundle-version="2.3.0", - fr.inria.diverse.trace.gemoc;bundle-version="2.3.0" + org.eclipse.gemoc.trace.gemoc.generator;bundle-version="2.3.0", + org.eclipse.gemoc.trace.gemoc;bundle-version="2.3.0" Export-Package: org.eclipse.gemoc.xdsmlframework.test.lib diff --git a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend index 78e009087..4880cee4d 100644 --- a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend +++ b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend @@ -85,7 +85,7 @@ import org.eclipse.jdt.core.IJavaProject import org.eclipse.jdt.launching.JavaRuntime import java.net.URL import java.net.URLClassLoader -import fr.inria.diverse.trace.gemoc.generator.TraceAddonGeneratorIntegration +import org.eclipse.gemoc.trace.gemoc.generator.TraceAddonGeneratorIntegration import org.eclipse.core.resources.IFile import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.core.runtime.Status @@ -206,7 +206,7 @@ class WorkspaceTestHelper { this.reportedJobException = e } - return new Status(Status.OK, "fr.inria.diverse.trace.gemoc.ui", "Multidimensional Trace addon plugin generated.") + return new Status(Status.OK, "org.eclipse.gemoc.trace.gemoc.ui", "Multidimensional Trace addon plugin generated.") } } // And we start the job and wait diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index cd1d39df8..f88b59ef8 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.gemoc.execution.sequential.javaxdsml.api;bundle-version="0.1.0", org.eclipse.gemoc.executionframework.ui, org.gemoc.execution.sequential.javaengine;bundle-version="0.1.0", - fr.inria.diverse.trace.gemoc;bundle-version="1.0.0", - fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", + org.eclipse.gemoc.trace.gemoc;bundle-version="1.0.0", + org.eclipse.gemoc.trace.gemoc.api;bundle-version="1.0.0", fr.inria.diverse.k3.al.annotationprocessor.plugin, org.eclipse.gemoc.executionframework.engine, org.eclipse.gemoc.executionframework.engine.ui, diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java index 91d04d4d6..9d2dac6e8 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java @@ -28,8 +28,8 @@ import org.eclipse.gemoc.executionframework.debugger.GemocBreakpoint; import fr.inria.diverse.melange.resource.MelangeResource; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.DSLToggleBreakpointsUtils; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java index 149756c37..a985279ae 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java @@ -29,9 +29,9 @@ import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import fr.inria.diverse.melange.resource.MelangeResourceImpl; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.Step; import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor; public class GenericSequentialModelDebugger extends AbstractGemocDebugger { diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend index 5de994faf..38ea09f4e 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend @@ -10,16 +10,16 @@ *******************************************************************************/ package org.gemoc.execution.sequential.javaengine.ui.debug; -import fr.inria.diverse.trace.commons.model.trace.Dimension -import fr.inria.diverse.trace.commons.model.trace.MSE -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence -import fr.inria.diverse.trace.commons.model.trace.State -import fr.inria.diverse.trace.commons.model.trace.Step -import fr.inria.diverse.trace.commons.model.trace.TracedObject -import fr.inria.diverse.trace.commons.model.trace.Value -import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon -import fr.inria.diverse.trace.gemoc.api.ITraceExplorer -import fr.inria.diverse.trace.gemoc.api.ITraceViewListener +import org.eclipse.gemoc.trace.commons.model.trace.Dimension +import org.eclipse.gemoc.trace.commons.model.trace.MSE +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence +import org.eclipse.gemoc.trace.commons.model.trace.State +import org.eclipse.gemoc.trace.commons.model.trace.Step +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject +import org.eclipse.gemoc.trace.commons.model.trace.Value +import org.eclipse.gemoc.trace.gemoc.api.IMultiDimensionalTraceAddon +import org.eclipse.gemoc.trace.gemoc.api.ITraceExplorer +import org.eclipse.gemoc.trace.gemoc.api.ITraceViewListener import org.eclipse.gemoc.dsl.debug.ide.event.IDSLDebugEventProcessor import java.util.ArrayList import java.util.List diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java index c83b5a92f..f4093bd18 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java @@ -24,8 +24,8 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.gemoc.executionframework.ui.IMSEPresenter; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.Step; import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLStackFrameAdapter; import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.DSLDebugModelPresentation; import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.SiriusEditorUtils; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java index 5ca5161c7..c767aad48 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java @@ -27,7 +27,7 @@ import org.gemoc.execution.sequential.javaengine.ui.Activator; import fr.inria.diverse.melange.resource.MelangeResourceImpl; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; import org.eclipse.gemoc.dsl.debug.ide.DSLSourceLocator; import org.eclipse.gemoc.dsl.debug.ide.adapter.DSLStackFrameAdapter; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java index 60fc99d85..b378870c9 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java @@ -42,11 +42,11 @@ import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration; import org.eclipse.gemoc.commons.eclipse.messagingsystem.api.MessagingSystem; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.gemoc.api.IMultiDimensionalTraceAddon; import org.eclipse.gemoc.dsl.debug.ide.IDSLDebugger; import org.eclipse.gemoc.dsl.debug.ide.event.DSLDebugEventDispatcher; diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF index fda06c503..8b40e68b5 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF @@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.emf.transaction, fr.inria.diverse.commons.provisionner4eclipse, fr.inria.diverse.melange.adapters, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", - fr.inria.diverse.trace.commons;bundle-version="1.0.0" + org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0", + org.eclipse.gemoc.trace.commons;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.gemoc.execution.sequential.javaengine Bundle-Activator: org.gemoc.execution.sequential.javaengine.Activator diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java index dc564be3f..844c7ec16 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java @@ -50,16 +50,16 @@ import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepCommand; import fr.inria.diverse.k3.al.annotationprocessor.stepmanager.StepManagerRegistry; import fr.inria.diverse.melange.adapters.EObjectAdapter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationFactory; -import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.AddonExtensionParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.AnimatorURIParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.EntryPointParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationArgumentsParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationMethodParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LanguageNameParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationFactory; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelRootParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelURIParameter; /** * Implementation of the GEMOC Execution engine dedicated to run Kermeta 3 operational semantic diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java index c3e611a24..7e9129623 100644 --- a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java +++ b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java @@ -18,7 +18,7 @@ import org.eclipse.gemoc.xdsmlframework.api.core.IRunConfiguration; import org.eclipse.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension; -import fr.inria.diverse.trace.commons.model.trace.MSEModel; +import org.eclipse.gemoc.trace.commons.model.trace.MSEModel; public class SequentialModelExecutionContext extends ModelExecutionContext { diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF index 610e621e4..b8e03f1bf 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF @@ -18,6 +18,6 @@ Require-Bundle: org.gemoc.execution.sequential.javaxdsml.ide.ui;bundle-version=" org.eclipse.xtext.ui;bundle-version="2.10.0", fr.inria.diverse.melange.metamodel;bundle-version="0.2.0", org.eclipse.core.expressions;bundle-version="3.5.100", - fr.inria.diverse.trace.gemoc.generator;bundle-version="2.3.0", - fr.inria.diverse.trace.gemoc;bundle-version="2.3.0", + org.eclipse.gemoc.trace.gemoc.generator;bundle-version="2.3.0", + org.eclipse.gemoc.trace.gemoc;bundle-version="2.3.0", org.eclipse.gemoc.xdsmlframework.test.lib;bundle-version="2.3.0" diff --git a/releng/org.gemoc.siriusanimation.repository/category.xml b/releng/org.gemoc.siriusanimation.repository/category.xml index 9f1194547..e7b687ffb 100644 --- a/releng/org.gemoc.siriusanimation.repository/category.xml +++ b/releng/org.gemoc.siriusanimation.repository/category.xml @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -72,12 +72,12 @@ - + Category with all features. - + Category with all sources. diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF index d8f8af437..18010aac9 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.debug.ui;bundle-version="3.7.0", org.eclipse.sirius.diagram.ui;bundle-version="4.0.0", com.google.guava;bundle-version="15.0.0", org.eclipse.equinox.registry, - fr.inria.diverse.trace.commons.model + org.eclipse.gemoc.trace.commons.model Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.gemoc.dsl.debug.ide.sirius.ui.DebugSiriusIdeUiPlugin$Implementation Export-Package: org.eclipse.gemoc.dsl.debug.ide.sirius.ui, diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java index 418323efe..61a150ad0 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/services/AbstractDSLDebuggerServices.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.gemoc.dsl.debug.ide.sirius.ui.services; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.ParallelStep; +import org.eclipse.gemoc.trace.commons.model.trace.Step; import org.eclipse.gemoc.dsl.debug.StackFrame; import org.eclipse.gemoc.dsl.debug.ide.DSLBreakpoint; import org.eclipse.gemoc.dsl.debug.ide.adapter.IDSLCurrentInstructionListener; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.project b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.project index 5d409b39e..89df75095 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.project +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.commons.model + org.eclipse.gemoc.trace.commons.model diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/META-INF/MANIFEST.MF b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/META-INF/MANIFEST.MF index 01fe7a9dd..bb9badf03 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/META-INF/MANIFEST.MF @@ -1,23 +1,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.inria.diverse.trace.commons.model;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.trace.commons.model;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: INRIA Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: fr.inria.diverse.trace.commons.model.helper, - fr.inria.diverse.trace.commons.model.trace, - fr.inria.diverse.trace.commons.model.trace.impl, - fr.inria.diverse.trace.commons.model.trace.util, - fr.inria.diverse.trace.commons.model.launchconfiguration, - fr.inria.diverse.trace.commons.model.launchconfiguration.impl, - fr.inria.diverse.trace.commons.model.launchconfiguration.util, - fr.inria.diverse.trace.commons.model.generictrace, - fr.inria.diverse.trace.commons.model.generictrace.impl, - fr.inria.diverse.trace.commons.model.generictrace.util +Export-Package: org.eclipse.gemoc.trace.commons.model.helper, + org.eclipse.gemoc.trace.commons.model.trace, + org.eclipse.gemoc.trace.commons.model.trace.impl, + org.eclipse.gemoc.trace.commons.model.trace.util, + org.eclipse.gemoc.trace.commons.model.launchconfiguration, + org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl, + org.eclipse.gemoc.trace.commons.model.launchconfiguration.util, + org.eclipse.gemoc.trace.commons.model.generictrace, + org.eclipse.gemoc.trace.commons.model.generictrace.impl, + org.eclipse.gemoc.trace.commons.model.generictrace.util Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, - fr.inria.diverse.trace.commons.model;visibility:=reexport + org.eclipse.gemoc.trace.commons.model;visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/plugin.xml b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/plugin.xml index 2fbf03ce3..bd5bc1f90 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/plugin.xml +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/plugin.xml @@ -10,7 +10,7 @@ @@ -18,7 +18,7 @@ @@ -26,7 +26,7 @@ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/pom.xml b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/pom.xml index 741e0bd06..6fbe5e6c7 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/pom.xml +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/pom.xml @@ -9,7 +9,7 @@ 2.3.0-SNAPSHOT - fr.inria.diverse.trace.commons.model + org.eclipse.gemoc.trace.commons.model eclipse-plugin 2.3.0-SNAPSHOT \ No newline at end of file diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/BooleanAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/BooleanAttributeValue.java index b4bdc631b..91c0a5920 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/BooleanAttributeValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/BooleanAttributeValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; /** @@ -12,10 +12,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue Attribute Value}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getBooleanAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getBooleanAttributeValue() * @model * @generated */ @@ -31,14 +31,14 @@ public interface BooleanAttributeValue extends GenericAttributeValue { * * @return the value of the 'Attribute Value' attribute. * @see #setAttributeValue(boolean) - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getBooleanAttributeValue_AttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getBooleanAttributeValue_AttributeValue() * @model default="false" * @generated */ boolean isAttributeValue(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue Attribute Value}' attribute. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue Attribute Value}' attribute. * * * @param value the new value of the 'Attribute Value' attribute. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericAttributeValue.java index f735fd515..ca44add9d 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericAttributeValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericAttributeValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericAttributeValue() * @model abstract="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericDimension.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericDimension.java index b0ce5f4ed..ccacb1afc 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericDimension.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericDimension.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; import org.eclipse.emf.ecore.EStructuralFeature; @@ -15,10 +15,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension#getDynamicProperty Dynamic Property}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension#getDynamicProperty Dynamic Property}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericDimension() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericDimension() * @model * @generated */ @@ -33,14 +33,14 @@ public interface GenericDimension extends Dimension { * * @return the value of the 'Dynamic Property' reference. * @see #setDynamicProperty(EStructuralFeature) - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericDimension_DynamicProperty() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericDimension_DynamicProperty() * @model * @generated */ EStructuralFeature getDynamicProperty(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension#getDynamicProperty Dynamic Property}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension#getDynamicProperty Dynamic Property}' reference. * * * @param value the new value of the 'Dynamic Property' reference. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericParallelStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericParallelStep.java index 5a17d05f7..ff54d6169 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericParallelStep.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericParallelStep.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; +import org.eclipse.gemoc.trace.commons.model.trace.ParallelStep; /** @@ -11,7 +11,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericParallelStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericParallelStep() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericReferenceValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericReferenceValue.java index 9f7b3112a..b97d086df 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericReferenceValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericReferenceValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; /** * @@ -8,7 +8,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericReferenceValue() * @model abstract="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSequentialStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSequentialStep.java index b1f56569f..1197daaef 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSequentialStep.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSequentialStep.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; /** @@ -11,7 +11,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericSequentialStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericSequentialStep() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSmallStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSmallStep.java index 2ec2aa030..4d0bcca75 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSmallStep.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericSmallStep.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.SmallStep; +import org.eclipse.gemoc.trace.commons.model.trace.SmallStep; /** @@ -11,7 +11,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericSmallStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericSmallStep() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericState.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericState.java index f0dd83016..f7be6445c 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericState.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericState.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.State; /** * @@ -10,7 +10,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericState() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericState() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericStep.java index 90728af34..ce1b8206b 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericStep.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericStep.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; /** * @@ -10,7 +10,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericStep() * @model abstract="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTrace.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTrace.java index 6c9baa655..8259b3f20 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTrace.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTrace.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; /** * @@ -10,7 +10,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericTrace() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericTrace() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTracedObject.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTracedObject.java index f7ef081fa..e43e61c05 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTracedObject.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericTracedObject.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -15,11 +15,11 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject Original Object}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getAllDimensions All Dimensions}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject Original Object}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject#getAllDimensions All Dimensions}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericTracedObject() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericTracedObject() * @model * @generated */ @@ -35,14 +35,14 @@ public interface GenericTracedObject extends TracedObject { * * @return the value of the 'Original Object' reference. * @see #setOriginalObject(EObject) - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericTracedObject_OriginalObject() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericTracedObject_OriginalObject() * @model * @generated */ EObject getOriginalObject(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject Original Object}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject Original Object}' reference. * * * @param value the new value of the 'Original Object' reference. @@ -53,7 +53,7 @@ public interface GenericTracedObject extends TracedObject { /** * Returns the value of the 'All Dimensions' containment reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension}. + * The list contents are of type {@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension}. * *

    * If the meaning of the 'All Dimensions' containment reference list isn't clear, @@ -61,7 +61,7 @@ public interface GenericTracedObject extends TracedObject { *

    * * @return the value of the 'All Dimensions' containment reference list. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericTracedObject_AllDimensions() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericTracedObject_AllDimensions() * @model containment="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericValue.java index 48343e38f..e7b8abd9d 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenericValue.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.Value; /** * @@ -10,7 +10,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getGenericValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getGenericValue() * @model abstract="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictraceFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictraceFactory.java index f9af063e5..9f0d8e5b0 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictraceFactory.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictraceFactory.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; import org.eclipse.emf.ecore.EFactory; @@ -9,7 +9,7 @@ * The Factory for the model. * It provides a create method for each non-abstract class of the model. * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage * @generated */ public interface GenerictraceFactory extends EFactory { @@ -19,7 +19,7 @@ public interface GenerictraceFactory extends EFactory { * * @generated */ - GenerictraceFactory eINSTANCE = fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictraceFactoryImpl.init(); + GenerictraceFactory eINSTANCE = org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictraceFactoryImpl.init(); /** * Returns a new object of class 'Generic Sequential Step'. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictracePackage.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictracePackage.java index 6711e31fb..739b0daad 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictracePackage.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/GenerictracePackage.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -23,7 +23,7 @@ *
  • and each data type
    • * * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictraceFactory * @model kind="package" * @generated */ @@ -58,14 +58,14 @@ public interface GenerictracePackage extends EPackage { * * @generated */ - GenerictracePackage eINSTANCE = fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl.init(); + GenerictracePackage eINSTANCE = org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl.init(); /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStepImpl Generic Step}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericStepImpl Generic Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStepImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericStepImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericStep() * @generated */ int GENERIC_STEP = 15; @@ -116,11 +116,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_STEP_OPERATION_COUNT = TracePackage.STEP_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSequentialStepImpl Generic Sequential Step}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericSequentialStepImpl Generic Sequential Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSequentialStepImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSequentialStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericSequentialStepImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSequentialStep() * @generated */ int GENERIC_SEQUENTIAL_STEP = 0; @@ -180,11 +180,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_SEQUENTIAL_STEP_OPERATION_COUNT = GENERIC_STEP_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericParallelStepImpl Generic Parallel Step}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericParallelStepImpl Generic Parallel Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericParallelStepImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericParallelStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericParallelStepImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericParallelStep() * @generated */ int GENERIC_PARALLEL_STEP = 1; @@ -244,11 +244,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_PARALLEL_STEP_OPERATION_COUNT = GENERIC_STEP_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSmallStepImpl Generic Small Step}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericSmallStepImpl Generic Small Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSmallStepImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSmallStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericSmallStepImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSmallStep() * @generated */ int GENERIC_SMALL_STEP = 2; @@ -299,11 +299,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_SMALL_STEP_OPERATION_COUNT = GENERIC_STEP_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericValueImpl Generic Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericValueImpl Generic Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericValue() * @generated */ int GENERIC_VALUE = 16; @@ -336,11 +336,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_VALUE_OPERATION_COUNT = TracePackage.VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericReferenceValueImpl Generic Reference Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericReferenceValueImpl Generic Reference Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericReferenceValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericReferenceValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericReferenceValue() * @generated */ int GENERIC_REFERENCE_VALUE = 3; @@ -373,11 +373,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_REFERENCE_VALUE_OPERATION_COUNT = GENERIC_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl Generic Dimension}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericDimensionImpl Generic Dimension}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericDimension() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericDimensionImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericDimension() * @generated */ int GENERIC_DIMENSION = 4; @@ -419,11 +419,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_DIMENSION_OPERATION_COUNT = TracePackage.DIMENSION_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl Generic Traced Object}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericTracedObjectImpl Generic Traced Object}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTracedObject() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericTracedObjectImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTracedObject() * @generated */ int GENERIC_TRACED_OBJECT = 5; @@ -483,11 +483,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_TRACED_OBJECT_OPERATION_COUNT = TracePackage.TRACED_OBJECT_OPERATION_COUNT + 1; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl Generic State}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericStateImpl Generic State}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericState() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericStateImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericState() * @generated */ int GENERIC_STATE = 6; @@ -538,11 +538,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_STATE_OPERATION_COUNT = TracePackage.STATE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTraceImpl Generic Trace}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericTraceImpl Generic Trace}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTraceImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTrace() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericTraceImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTrace() * @generated */ int GENERIC_TRACE = 7; @@ -602,11 +602,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_TRACE_OPERATION_COUNT = TracePackage.TRACE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericAttributeValueImpl Generic Attribute Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericAttributeValueImpl Generic Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericAttributeValue() * @generated */ int GENERIC_ATTRIBUTE_VALUE = 8; @@ -639,11 +639,11 @@ public interface GenerictracePackage extends EPackage { int GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getBooleanAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getBooleanAttributeValue() * @generated */ int BOOLEAN_ATTRIBUTE_VALUE = 9; @@ -685,11 +685,11 @@ public interface GenerictracePackage extends EPackage { int BOOLEAN_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl Integer Attribute Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl Integer Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerAttributeValue() * @generated */ int INTEGER_ATTRIBUTE_VALUE = 10; @@ -731,11 +731,11 @@ public interface GenerictracePackage extends EPackage { int INTEGER_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl String Attribute Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.StringAttributeValueImpl String Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getStringAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.StringAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getStringAttributeValue() * @generated */ int STRING_ATTRIBUTE_VALUE = 11; @@ -777,11 +777,11 @@ public interface GenerictracePackage extends EPackage { int STRING_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl Many Boolean Attribute Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl Many Boolean Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyBooleanAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyBooleanAttributeValue() * @generated */ int MANY_BOOLEAN_ATTRIBUTE_VALUE = 12; @@ -823,11 +823,11 @@ public interface GenerictracePackage extends EPackage { int MANY_BOOLEAN_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl Many Integer Attribute Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl Many Integer Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyIntegerAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyIntegerAttributeValue() * @generated */ int MANY_INTEGER_ATTRIBUTE_VALUE = 13; @@ -869,11 +869,11 @@ public interface GenerictracePackage extends EPackage { int MANY_INTEGER_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl Many String Attribute Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl Many String Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyStringAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyStringAttributeValue() * @generated */ int MANY_STRING_ATTRIBUTE_VALUE = 14; @@ -915,11 +915,11 @@ public interface GenerictracePackage extends EPackage { int MANY_STRING_ATTRIBUTE_VALUE_OPERATION_COUNT = GENERIC_ATTRIBUTE_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl Single Reference Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.SingleReferenceValueImpl Single Reference Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getSingleReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.SingleReferenceValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getSingleReferenceValue() * @generated */ int SINGLE_REFERENCE_VALUE = 17; @@ -961,11 +961,11 @@ public interface GenerictracePackage extends EPackage { int SINGLE_REFERENCE_VALUE_OPERATION_COUNT = GENERIC_REFERENCE_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyReferenceValueImpl Many Reference Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyReferenceValueImpl Many Reference Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyReferenceValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyReferenceValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyReferenceValue() * @generated */ int MANY_REFERENCE_VALUE = 18; @@ -1007,11 +1007,11 @@ public interface GenerictracePackage extends EPackage { int MANY_REFERENCE_VALUE_OPERATION_COUNT = GENERIC_REFERENCE_VALUE_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl Integer Object Attribute Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl Integer Object Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerObjectAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerObjectAttributeValue() * @generated */ int INTEGER_OBJECT_ATTRIBUTE_VALUE = 19; @@ -1056,349 +1056,349 @@ public interface GenerictracePackage extends EPackage { * The meta object id for the 'ISerializable' data type. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getISerializable() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getISerializable() * @generated */ int ISERIALIZABLE = 20; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep Generic Sequential Step}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericSequentialStep Generic Sequential Step}'. * * * @return the meta object for class 'Generic Sequential Step'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericSequentialStep * @generated */ EClass getGenericSequentialStep(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep Generic Parallel Step}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericParallelStep Generic Parallel Step}'. * * * @return the meta object for class 'Generic Parallel Step'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericParallelStep * @generated */ EClass getGenericParallelStep(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep Generic Small Step}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericSmallStep Generic Small Step}'. * * * @return the meta object for class 'Generic Small Step'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericSmallStep * @generated */ EClass getGenericSmallStep(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue Generic Reference Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericReferenceValue Generic Reference Value}'. * * * @return the meta object for class 'Generic Reference Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericReferenceValue * @generated */ EClass getGenericReferenceValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension Generic Dimension}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension Generic Dimension}'. * * * @return the meta object for class 'Generic Dimension'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericDimension + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension * @generated */ EClass getGenericDimension(); /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension#getDynamicProperty Dynamic Property}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension#getDynamicProperty Dynamic Property}'. * * * @return the meta object for the reference 'Dynamic Property'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericDimension#getDynamicProperty() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension#getDynamicProperty() * @see #getGenericDimension() * @generated */ EReference getGenericDimension_DynamicProperty(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject Generic Traced Object}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject Generic Traced Object}'. * * * @return the meta object for class 'Generic Traced Object'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject * @generated */ EClass getGenericTracedObject(); /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject Original Object}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject Original Object}'. * * * @return the meta object for the reference 'Original Object'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject#getOriginalObject() * @see #getGenericTracedObject() * @generated */ EReference getGenericTracedObject_OriginalObject(); /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getAllDimensions All Dimensions}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject#getAllDimensions All Dimensions}'. * * * @return the meta object for the containment reference list 'All Dimensions'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getAllDimensions() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject#getAllDimensions() * @see #getGenericTracedObject() * @generated */ EReference getGenericTracedObject_AllDimensions(); /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getDimensionsInternal() Get Dimensions Internal}' operation. + * Returns the meta object for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject#getDimensionsInternal() Get Dimensions Internal}' operation. * * * @return the meta object for the 'Get Dimensions Internal' operation. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject#getDimensionsInternal() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject#getDimensionsInternal() * @generated */ EOperation getGenericTracedObject__GetDimensionsInternal(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericState Generic State}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericState Generic State}'. * * * @return the meta object for class 'Generic State'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericState + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericState * @generated */ EClass getGenericState(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTrace Generic Trace}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericTrace Generic Trace}'. * * * @return the meta object for class 'Generic Trace'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTrace + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericTrace * @generated */ EClass getGenericTrace(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue Generic Attribute Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericAttributeValue Generic Attribute Value}'. * * * @return the meta object for class 'Generic Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericAttributeValue * @generated */ EClass getGenericAttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue Boolean Attribute Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue Boolean Attribute Value}'. * * * @return the meta object for class 'Boolean Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue * @generated */ EClass getBooleanAttributeValue(); /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue Attribute Value}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue Attribute Value}'. * * * @return the meta object for the attribute 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue#isAttributeValue() * @see #getBooleanAttributeValue() * @generated */ EAttribute getBooleanAttributeValue_AttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue Integer Attribute Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue Integer Attribute Value}'. * * * @return the meta object for class 'Integer Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue * @generated */ EClass getIntegerAttributeValue(); /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue Attribute Value}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue Attribute Value}'. * * * @return the meta object for the attribute 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue() * @see #getIntegerAttributeValue() * @generated */ EAttribute getIntegerAttributeValue_AttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue String Attribute Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue String Attribute Value}'. * * * @return the meta object for class 'String Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue * @generated */ EClass getStringAttributeValue(); /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue Attribute Value}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue Attribute Value}'. * * * @return the meta object for the attribute 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue() * @see #getStringAttributeValue() * @generated */ EAttribute getStringAttributeValue_AttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue Many Boolean Attribute Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyBooleanAttributeValue Many Boolean Attribute Value}'. * * * @return the meta object for class 'Many Boolean Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyBooleanAttributeValue * @generated */ EClass getManyBooleanAttributeValue(); /** - * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue#getAttributeValue Attribute Value}'. + * Returns the meta object for the attribute list '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyBooleanAttributeValue#getAttributeValue Attribute Value}'. * * * @return the meta object for the attribute list 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue#getAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyBooleanAttributeValue#getAttributeValue() * @see #getManyBooleanAttributeValue() * @generated */ EAttribute getManyBooleanAttributeValue_AttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue Many Integer Attribute Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyIntegerAttributeValue Many Integer Attribute Value}'. * * * @return the meta object for class 'Many Integer Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyIntegerAttributeValue * @generated */ EClass getManyIntegerAttributeValue(); /** - * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue#getAttributeValue Attribute Value}'. + * Returns the meta object for the attribute list '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyIntegerAttributeValue#getAttributeValue Attribute Value}'. * * * @return the meta object for the attribute list 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue#getAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyIntegerAttributeValue#getAttributeValue() * @see #getManyIntegerAttributeValue() * @generated */ EAttribute getManyIntegerAttributeValue_AttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue Many String Attribute Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyStringAttributeValue Many String Attribute Value}'. * * * @return the meta object for class 'Many String Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyStringAttributeValue * @generated */ EClass getManyStringAttributeValue(); /** - * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue#getAttributeValue Attribute Value}'. + * Returns the meta object for the attribute list '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyStringAttributeValue#getAttributeValue Attribute Value}'. * * * @return the meta object for the attribute list 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue#getAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyStringAttributeValue#getAttributeValue() * @see #getManyStringAttributeValue() * @generated */ EAttribute getManyStringAttributeValue_AttributeValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericStep Generic Step}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep Generic Step}'. * * * @return the meta object for class 'Generic Step'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericStep + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep * @generated */ EClass getGenericStep(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericValue Generic Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericValue Generic Value}'. * * * @return the meta object for class 'Generic Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericValue * @generated */ EClass getGenericValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue Single Reference Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue Single Reference Value}'. * * * @return the meta object for class 'Single Reference Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue * @generated */ EClass getSingleReferenceValue(); /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue Reference Value}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue Reference Value}'. * * * @return the meta object for the reference 'Reference Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue() * @see #getSingleReferenceValue() * @generated */ EReference getSingleReferenceValue_ReferenceValue(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue Many Reference Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue Many Reference Value}'. * * * @return the meta object for class 'Many Reference Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue * @generated */ EClass getManyReferenceValue(); /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue#getReferenceValues Reference Values}'. + * Returns the meta object for the reference list '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue#getReferenceValues Reference Values}'. * * * @return the meta object for the reference list 'Reference Values'. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue#getReferenceValues() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue#getReferenceValues() * @see #getManyReferenceValue() * @generated */ EReference getManyReferenceValue_ReferenceValues(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue Integer Object Attribute Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue Integer Object Attribute Value}'. * * * @return the meta object for class 'Integer Object Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue * @generated */ EClass getIntegerObjectAttributeValue(); /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue Attribute Value}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue Attribute Value}'. * * * @return the meta object for the attribute 'Attribute Value'. - * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue() * @see #getIntegerObjectAttributeValue() * @generated */ @@ -1438,51 +1438,51 @@ public interface GenerictracePackage extends EPackage { */ interface Literals { /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSequentialStepImpl Generic Sequential Step}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericSequentialStepImpl Generic Sequential Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSequentialStepImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSequentialStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericSequentialStepImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSequentialStep() * @generated */ EClass GENERIC_SEQUENTIAL_STEP = eINSTANCE.getGenericSequentialStep(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericParallelStepImpl Generic Parallel Step}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericParallelStepImpl Generic Parallel Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericParallelStepImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericParallelStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericParallelStepImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericParallelStep() * @generated */ EClass GENERIC_PARALLEL_STEP = eINSTANCE.getGenericParallelStep(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSmallStepImpl Generic Small Step}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericSmallStepImpl Generic Small Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSmallStepImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSmallStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericSmallStepImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericSmallStep() * @generated */ EClass GENERIC_SMALL_STEP = eINSTANCE.getGenericSmallStep(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericReferenceValueImpl Generic Reference Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericReferenceValueImpl Generic Reference Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericReferenceValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericReferenceValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericReferenceValue() * @generated */ EClass GENERIC_REFERENCE_VALUE = eINSTANCE.getGenericReferenceValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl Generic Dimension}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericDimensionImpl Generic Dimension}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericDimension() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericDimensionImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericDimension() * @generated */ EClass GENERIC_DIMENSION = eINSTANCE.getGenericDimension(); @@ -1496,11 +1496,11 @@ interface Literals { EReference GENERIC_DIMENSION__DYNAMIC_PROPERTY = eINSTANCE.getGenericDimension_DynamicProperty(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl Generic Traced Object}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericTracedObjectImpl Generic Traced Object}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTracedObject() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericTracedObjectImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTracedObject() * @generated */ EClass GENERIC_TRACED_OBJECT = eINSTANCE.getGenericTracedObject(); @@ -1530,41 +1530,41 @@ interface Literals { EOperation GENERIC_TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = eINSTANCE.getGenericTracedObject__GetDimensionsInternal(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl Generic State}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericStateImpl Generic State}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStateImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericState() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericStateImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericState() * @generated */ EClass GENERIC_STATE = eINSTANCE.getGenericState(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTraceImpl Generic Trace}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericTraceImpl Generic Trace}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTraceImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTrace() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericTraceImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericTrace() * @generated */ EClass GENERIC_TRACE = eINSTANCE.getGenericTrace(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericAttributeValueImpl Generic Attribute Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericAttributeValueImpl Generic Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericAttributeValue() * @generated */ EClass GENERIC_ATTRIBUTE_VALUE = eINSTANCE.getGenericAttributeValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl Boolean Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getBooleanAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getBooleanAttributeValue() * @generated */ EClass BOOLEAN_ATTRIBUTE_VALUE = eINSTANCE.getBooleanAttributeValue(); @@ -1578,11 +1578,11 @@ interface Literals { EAttribute BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getBooleanAttributeValue_AttributeValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl Integer Attribute Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl Integer Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerAttributeValue() * @generated */ EClass INTEGER_ATTRIBUTE_VALUE = eINSTANCE.getIntegerAttributeValue(); @@ -1596,11 +1596,11 @@ interface Literals { EAttribute INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getIntegerAttributeValue_AttributeValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl String Attribute Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.StringAttributeValueImpl String Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getStringAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.StringAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getStringAttributeValue() * @generated */ EClass STRING_ATTRIBUTE_VALUE = eINSTANCE.getStringAttributeValue(); @@ -1614,11 +1614,11 @@ interface Literals { EAttribute STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getStringAttributeValue_AttributeValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl Many Boolean Attribute Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl Many Boolean Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyBooleanAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyBooleanAttributeValue() * @generated */ EClass MANY_BOOLEAN_ATTRIBUTE_VALUE = eINSTANCE.getManyBooleanAttributeValue(); @@ -1632,11 +1632,11 @@ interface Literals { EAttribute MANY_BOOLEAN_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getManyBooleanAttributeValue_AttributeValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl Many Integer Attribute Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl Many Integer Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyIntegerAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyIntegerAttributeValue() * @generated */ EClass MANY_INTEGER_ATTRIBUTE_VALUE = eINSTANCE.getManyIntegerAttributeValue(); @@ -1650,11 +1650,11 @@ interface Literals { EAttribute MANY_INTEGER_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getManyIntegerAttributeValue_AttributeValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl Many String Attribute Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl Many String Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyStringAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyStringAttributeValue() * @generated */ EClass MANY_STRING_ATTRIBUTE_VALUE = eINSTANCE.getManyStringAttributeValue(); @@ -1668,31 +1668,31 @@ interface Literals { EAttribute MANY_STRING_ATTRIBUTE_VALUE__ATTRIBUTE_VALUE = eINSTANCE.getManyStringAttributeValue_AttributeValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStepImpl Generic Step}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericStepImpl Generic Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericStepImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericStep() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericStepImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericStep() * @generated */ EClass GENERIC_STEP = eINSTANCE.getGenericStep(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericValueImpl Generic Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericValueImpl Generic Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenericValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getGenericValue() * @generated */ EClass GENERIC_VALUE = eINSTANCE.getGenericValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl Single Reference Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.SingleReferenceValueImpl Single Reference Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getSingleReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.SingleReferenceValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getSingleReferenceValue() * @generated */ EClass SINGLE_REFERENCE_VALUE = eINSTANCE.getSingleReferenceValue(); @@ -1706,11 +1706,11 @@ interface Literals { EReference SINGLE_REFERENCE_VALUE__REFERENCE_VALUE = eINSTANCE.getSingleReferenceValue_ReferenceValue(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyReferenceValueImpl Many Reference Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyReferenceValueImpl Many Reference Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.ManyReferenceValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyReferenceValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getManyReferenceValue() * @generated */ EClass MANY_REFERENCE_VALUE = eINSTANCE.getManyReferenceValue(); @@ -1724,11 +1724,11 @@ interface Literals { EReference MANY_REFERENCE_VALUE__REFERENCE_VALUES = eINSTANCE.getManyReferenceValue_ReferenceValues(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl Integer Object Attribute Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl Integer Object Attribute Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerObjectAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getIntegerObjectAttributeValue() * @generated */ EClass INTEGER_OBJECT_ATTRIBUTE_VALUE = eINSTANCE.getIntegerObjectAttributeValue(); @@ -1745,7 +1745,7 @@ interface Literals { * The meta object literal for the 'ISerializable' data type. * * - * @see fr.inria.diverse.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getISerializable() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenerictracePackageImpl#getISerializable() * @generated */ EDataType ISERIALIZABLE = eINSTANCE.getISerializable(); diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerAttributeValue.java index 0dba59976..52348132c 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerAttributeValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerAttributeValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; /** @@ -12,10 +12,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue Attribute Value}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getIntegerAttributeValue() * @model * @generated */ @@ -30,14 +30,14 @@ public interface IntegerAttributeValue extends GenericAttributeValue { * * @return the value of the 'Attribute Value' attribute. * @see #setAttributeValue(int) - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerAttributeValue_AttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getIntegerAttributeValue_AttributeValue() * @model * @generated */ int getAttributeValue(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue Attribute Value}' attribute. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue#getAttributeValue Attribute Value}' attribute. * * * @param value the new value of the 'Attribute Value' attribute. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerObjectAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerObjectAttributeValue.java index 1af954af7..1987d7620 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerObjectAttributeValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/IntegerObjectAttributeValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; /** @@ -12,10 +12,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue Attribute Value}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerObjectAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getIntegerObjectAttributeValue() * @model * @generated */ @@ -30,14 +30,14 @@ public interface IntegerObjectAttributeValue extends GenericAttributeValue { * * @return the value of the 'Attribute Value' attribute. * @see #setAttributeValue(Integer) - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getIntegerObjectAttributeValue_AttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getIntegerObjectAttributeValue_AttributeValue() * @model * @generated */ Integer getAttributeValue(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue Attribute Value}' attribute. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue#getAttributeValue Attribute Value}' attribute. * * * @param value the new value of the 'Attribute Value' attribute. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyBooleanAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyBooleanAttributeValue.java index b152a89a4..2425a86a0 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyBooleanAttributeValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyBooleanAttributeValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; import org.eclipse.emf.common.util.EList; @@ -13,10 +13,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyBooleanAttributeValue#getAttributeValue Attribute Value}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyBooleanAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getManyBooleanAttributeValue() * @model * @generated */ @@ -31,7 +31,7 @@ public interface ManyBooleanAttributeValue extends GenericAttributeValue { *

    * * @return the value of the 'Attribute Value' attribute list. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyBooleanAttributeValue_AttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getManyBooleanAttributeValue_AttributeValue() * @model default="false" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyIntegerAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyIntegerAttributeValue.java index 5a286a800..e026bfad3 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyIntegerAttributeValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyIntegerAttributeValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; import org.eclipse.emf.common.util.EList; @@ -13,10 +13,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyIntegerAttributeValue#getAttributeValue Attribute Value}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyIntegerAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getManyIntegerAttributeValue() * @model * @generated */ @@ -31,7 +31,7 @@ public interface ManyIntegerAttributeValue extends GenericAttributeValue { *

    * * @return the value of the 'Attribute Value' attribute list. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyIntegerAttributeValue_AttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getManyIntegerAttributeValue_AttributeValue() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyReferenceValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyReferenceValue.java index 8f1196d7c..631ff1f9c 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyReferenceValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyReferenceValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; import org.eclipse.emf.common.util.EList; @@ -15,10 +15,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue#getReferenceValues Reference Values}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue#getReferenceValues Reference Values}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getManyReferenceValue() * @model * @generated */ @@ -33,7 +33,7 @@ public interface ManyReferenceValue extends GenericReferenceValue { *

    * * @return the value of the 'Reference Values' reference list. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyReferenceValue_ReferenceValues() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getManyReferenceValue_ReferenceValues() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyStringAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyStringAttributeValue.java index 4c41e8017..a83fd7418 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyStringAttributeValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/ManyStringAttributeValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; import org.eclipse.emf.common.util.EList; @@ -13,10 +13,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyStringAttributeValue#getAttributeValue Attribute Value}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyStringAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getManyStringAttributeValue() * @model * @generated */ @@ -31,7 +31,7 @@ public interface ManyStringAttributeValue extends GenericAttributeValue { *

    * * @return the value of the 'Attribute Value' attribute list. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getManyStringAttributeValue_AttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getManyStringAttributeValue_AttributeValue() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/SingleReferenceValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/SingleReferenceValue.java index e37aa2123..e23f7df87 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/SingleReferenceValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/SingleReferenceValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; import org.eclipse.emf.ecore.EObject; @@ -13,10 +13,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue Reference Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue Reference Value}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getSingleReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getSingleReferenceValue() * @model * @generated */ @@ -31,14 +31,14 @@ public interface SingleReferenceValue extends GenericReferenceValue { * * @return the value of the 'Reference Value' reference. * @see #setReferenceValue(EObject) - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getSingleReferenceValue_ReferenceValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getSingleReferenceValue_ReferenceValue() * @model * @generated */ EObject getReferenceValue(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue Reference Value}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue#getReferenceValue Reference Value}' reference. * * * @param value the new value of the 'Reference Value' reference. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/StringAttributeValue.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/StringAttributeValue.java index a883cd502..5e491d236 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/StringAttributeValue.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/StringAttributeValue.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace; +package org.eclipse.gemoc.trace.commons.model.generictrace; /** @@ -12,10 +12,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue Attribute Value}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getStringAttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getStringAttributeValue() * @model * @generated */ @@ -30,14 +30,14 @@ public interface StringAttributeValue extends GenericAttributeValue { * * @return the value of the 'Attribute Value' attribute. * @see #setAttributeValue(String) - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#getStringAttributeValue_AttributeValue() + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#getStringAttributeValue_AttributeValue() * @model * @generated */ String getAttributeValue(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue Attribute Value}' attribute. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue#getAttributeValue Attribute Value}' attribute. * * * @param value the new value of the 'Attribute Value' attribute. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java index 543e0b56b..88279a59e 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/BooleanAttributeValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; import org.eclipse.emf.common.notify.Notification; @@ -19,7 +19,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl#isAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.BooleanAttributeValueImpl#isAttributeValue Attribute Value}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java index fb107af3d..c5bcdc9d9 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericAttributeValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericDimensionImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericDimensionImpl.java index a52cb3671..a8e976fc2 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericDimensionImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericDimensionImpl.java @@ -1,12 +1,12 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; -import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.DimensionImpl; import org.eclipse.emf.common.notify.Notification; @@ -28,7 +28,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericDimensionImpl#getDynamicProperty Dynamic Property}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericDimensionImpl#getDynamicProperty Dynamic Property}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java index 36ed857a7..e193cc14e 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericParallelStepImpl.java @@ -1,14 +1,14 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericParallelStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.ParallelStep; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -25,7 +25,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericParallelStepImpl#getSubSteps Sub Steps}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericParallelStepImpl#getSubSteps Sub Steps}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java index b8e388c15..e0dfd2ba3 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericReferenceValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericReferenceValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; import org.eclipse.emf.ecore.EClass; /** diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java index beb1d324a..14947a6a8 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSequentialStepImpl.java @@ -1,14 +1,14 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericSequentialStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -25,7 +25,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericSequentialStepImpl#getSubSteps Sub Steps}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericSequentialStepImpl#getSubSteps Sub Steps}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java index 7576173c5..fc70e9979 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericSmallStepImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericSmallStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStateImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStateImpl.java index e9672ecca..af48a6605 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStateImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStateImpl.java @@ -1,17 +1,17 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericState; -import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericState; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.Value; -import fr.inria.diverse.trace.commons.model.trace.impl.StateImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.StateImpl; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStepImpl.java index 324d63dc9..9548f00d2 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStepImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericStepImpl.java @@ -1,12 +1,12 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericState; -import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericState; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.trace.impl.StepImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.StepImpl; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTraceImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTraceImpl.java index 336923a2f..57baaa980 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTraceImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTraceImpl.java @@ -1,14 +1,14 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericState; -import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericTrace; -import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericState; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericTrace; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.TraceImpl; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java index 0258e21ce..cb580bf5f 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericTracedObjectImpl.java @@ -1,14 +1,14 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; -import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.impl.TracedObjectImpl; import java.lang.reflect.InvocationTargetException; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -29,8 +29,8 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl#getOriginalObject Original Object}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.GenericTracedObjectImpl#getAllDimensions All Dimensions}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericTracedObjectImpl#getOriginalObject Original Object}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.GenericTracedObjectImpl#getAllDimensions All Dimensions}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericValueImpl.java index b29eaad40..603e82c66 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenericValueImpl.java @@ -1,15 +1,15 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenericState; -import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericState; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.ValueImpl; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java index 5b307e371..109aa4676 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictraceFactoryImpl.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.*; +import org.eclipse.gemoc.trace.commons.model.generictrace.*; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java index 12c036954..80dbe61ef 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/GenerictracePackageImpl.java @@ -1,31 +1,31 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; - -import fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; -import fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericState; -import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericTrace; -import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; -import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; -import fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; -import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; - -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; + +import org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericParallelStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericReferenceValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericSequentialStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericSmallStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericState; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericTrace; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictraceFactory; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.ManyBooleanAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.ManyIntegerAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.ManyStringAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue; + +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -204,7 +204,7 @@ public class GenerictracePackageImpl extends EPackageImpl implements Generictrac * * * @see org.eclipse.emf.ecore.EPackage.Registry - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage#eNS_URI + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage#eNS_URI * @see #init() * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java index bd9c43843..d0736c6b0 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerAttributeValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue; import org.eclipse.emf.common.notify.Notification; @@ -19,7 +19,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.IntegerAttributeValueImpl#getAttributeValue Attribute Value}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java index c13a5c025..a92043328 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/IntegerObjectAttributeValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue; import org.eclipse.emf.common.notify.Notification; @@ -19,7 +19,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.IntegerObjectAttributeValueImpl#getAttributeValue Attribute Value}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java index 04fbb46c7..9a4b28f07 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyBooleanAttributeValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.ManyBooleanAttributeValue; import java.util.Collection; @@ -21,7 +21,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyBooleanAttributeValueImpl#getAttributeValue Attribute Value}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java index 693160d33..025c21c8e 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyIntegerAttributeValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.ManyIntegerAttributeValue; import java.util.Collection; @@ -21,7 +21,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyIntegerAttributeValueImpl#getAttributeValue Attribute Value}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java index 59b4e4034..361101e24 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyReferenceValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue; import java.util.Collection; @@ -22,7 +22,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyReferenceValueImpl#getReferenceValues Reference Values}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyReferenceValueImpl#getReferenceValues Reference Values}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java index 77dbc6aff..97087aa5c 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/ManyStringAttributeValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.ManyStringAttributeValue; import java.util.Collection; @@ -21,7 +21,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.ManyStringAttributeValueImpl#getAttributeValue Attribute Value}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java index c8c5c346f..5c2f42a6d 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/SingleReferenceValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue; import org.eclipse.emf.common.notify.Notification; @@ -21,7 +21,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.SingleReferenceValueImpl#getReferenceValue Reference Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.SingleReferenceValueImpl#getReferenceValue Reference Value}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java index 288965aef..48caf7243 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/impl/StringAttributeValueImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.impl; +package org.eclipse.gemoc.trace.commons.model.generictrace.impl; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage; -import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage; +import org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue; import org.eclipse.emf.common.notify.Notification; @@ -19,7 +19,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.generictrace.impl.StringAttributeValueImpl#getAttributeValue Attribute Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.generictrace.impl.StringAttributeValueImpl#getAttributeValue Attribute Value}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java index c193a649c..45d7eb675 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceAdapterFactory.java @@ -1,19 +1,19 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.util; +package org.eclipse.gemoc.trace.commons.model.generictrace.util; -import fr.inria.diverse.trace.commons.model.generictrace.*; +import org.eclipse.gemoc.trace.commons.model.generictrace.*; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.SmallStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.ParallelStep; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.SmallStep; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -27,7 +27,7 @@ * The Adapter Factory for the model. * It provides an adapter createXXX method for each class of the model. * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage * @generated */ public class GenerictraceAdapterFactory extends AdapterFactoryImpl { @@ -219,13 +219,13 @@ public Adapter createAdapter(Notifier target) { /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep Generic Sequential Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericSequentialStep Generic Sequential Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericSequentialStep * @generated */ public Adapter createGenericSequentialStepAdapter() { @@ -233,13 +233,13 @@ public Adapter createGenericSequentialStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep Generic Parallel Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericParallelStep Generic Parallel Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericParallelStep + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericParallelStep * @generated */ public Adapter createGenericParallelStepAdapter() { @@ -247,13 +247,13 @@ public Adapter createGenericParallelStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep Generic Small Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericSmallStep Generic Small Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericSmallStep * @generated */ public Adapter createGenericSmallStepAdapter() { @@ -261,13 +261,13 @@ public Adapter createGenericSmallStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue Generic Reference Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericReferenceValue Generic Reference Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericReferenceValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericReferenceValue * @generated */ public Adapter createGenericReferenceValueAdapter() { @@ -275,13 +275,13 @@ public Adapter createGenericReferenceValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericDimension Generic Dimension}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension Generic Dimension}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericDimension + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension * @generated */ public Adapter createGenericDimensionAdapter() { @@ -289,13 +289,13 @@ public Adapter createGenericDimensionAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject Generic Traced Object}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject Generic Traced Object}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject * @generated */ public Adapter createGenericTracedObjectAdapter() { @@ -303,13 +303,13 @@ public Adapter createGenericTracedObjectAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericState Generic State}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericState Generic State}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericState + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericState * @generated */ public Adapter createGenericStateAdapter() { @@ -317,13 +317,13 @@ public Adapter createGenericStateAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericTrace Generic Trace}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericTrace Generic Trace}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericTrace + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericTrace * @generated */ public Adapter createGenericTraceAdapter() { @@ -331,13 +331,13 @@ public Adapter createGenericTraceAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue Generic Attribute Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericAttributeValue Generic Attribute Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericAttributeValue * @generated */ public Adapter createGenericAttributeValueAdapter() { @@ -345,13 +345,13 @@ public Adapter createGenericAttributeValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue Boolean Attribute Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue Boolean Attribute Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue * @generated */ public Adapter createBooleanAttributeValueAdapter() { @@ -359,13 +359,13 @@ public Adapter createBooleanAttributeValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue Integer Attribute Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue Integer Attribute Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue * @generated */ public Adapter createIntegerAttributeValueAdapter() { @@ -373,13 +373,13 @@ public Adapter createIntegerAttributeValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue String Attribute Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue String Attribute Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue * @generated */ public Adapter createStringAttributeValueAdapter() { @@ -387,13 +387,13 @@ public Adapter createStringAttributeValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue Many Boolean Attribute Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyBooleanAttributeValue Many Boolean Attribute Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyBooleanAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyBooleanAttributeValue * @generated */ public Adapter createManyBooleanAttributeValueAdapter() { @@ -401,13 +401,13 @@ public Adapter createManyBooleanAttributeValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue Many Integer Attribute Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyIntegerAttributeValue Many Integer Attribute Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyIntegerAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyIntegerAttributeValue * @generated */ public Adapter createManyIntegerAttributeValueAdapter() { @@ -415,13 +415,13 @@ public Adapter createManyIntegerAttributeValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue Many String Attribute Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyStringAttributeValue Many String Attribute Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyStringAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyStringAttributeValue * @generated */ public Adapter createManyStringAttributeValueAdapter() { @@ -429,13 +429,13 @@ public Adapter createManyStringAttributeValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericStep Generic Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep Generic Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericStep + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep * @generated */ public Adapter createGenericStepAdapter() { @@ -443,13 +443,13 @@ public Adapter createGenericStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.GenericValue Generic Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.GenericValue Generic Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.GenericValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenericValue * @generated */ public Adapter createGenericValueAdapter() { @@ -457,13 +457,13 @@ public Adapter createGenericValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue Single Reference Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue Single Reference Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue * @generated */ public Adapter createSingleReferenceValueAdapter() { @@ -471,13 +471,13 @@ public Adapter createSingleReferenceValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue Many Reference Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue Many Reference Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue * @generated */ public Adapter createManyReferenceValueAdapter() { @@ -485,13 +485,13 @@ public Adapter createManyReferenceValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue Integer Object Attribute Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue Integer Object Attribute Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue + * @see org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue * @generated */ public Adapter createIntegerObjectAttributeValueAdapter() { @@ -499,13 +499,13 @@ public Adapter createIntegerObjectAttributeValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Step Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Step + * @see org.eclipse.gemoc.trace.commons.model.trace.Step * @generated */ public Adapter createStepAdapter() { @@ -513,13 +513,13 @@ public Adapter createStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.BigStep Big Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.BigStep + * @see org.eclipse.gemoc.trace.commons.model.trace.BigStep * @generated */ public Adapter createBigStepAdapter() { @@ -527,13 +527,13 @@ public Adapter createBigStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.SequentialStep Sequential Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep + * @see org.eclipse.gemoc.trace.commons.model.trace.SequentialStep * @generated */ public Adapter createSequentialStepAdapter() { @@ -541,13 +541,13 @@ public Adapter createSequentialStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ParallelStep Parallel Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.ParallelStep Parallel Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.ParallelStep + * @see org.eclipse.gemoc.trace.commons.model.trace.ParallelStep * @generated */ public Adapter createParallelStepAdapter() { @@ -555,13 +555,13 @@ public Adapter createParallelStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.SmallStep Small Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.SmallStep + * @see org.eclipse.gemoc.trace.commons.model.trace.SmallStep * @generated */ public Adapter createSmallStepAdapter() { @@ -569,13 +569,13 @@ public Adapter createSmallStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Value Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Value + * @see org.eclipse.gemoc.trace.commons.model.trace.Value * @generated */ public Adapter createValueAdapter() { @@ -583,13 +583,13 @@ public Adapter createValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Dimension Dimension}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Dimension + * @see org.eclipse.gemoc.trace.commons.model.trace.Dimension * @generated */ public Adapter createDimensionAdapter() { @@ -597,13 +597,13 @@ public Adapter createDimensionAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.TracedObject Traced Object}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.TracedObject + * @see org.eclipse.gemoc.trace.commons.model.trace.TracedObject * @generated */ public Adapter createTracedObjectAdapter() { @@ -611,13 +611,13 @@ public Adapter createTracedObjectAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.State State}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.State + * @see org.eclipse.gemoc.trace.commons.model.trace.State * @generated */ public Adapter createStateAdapter() { @@ -625,13 +625,13 @@ public Adapter createStateAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Trace Trace}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Trace + * @see org.eclipse.gemoc.trace.commons.model.trace.Trace * @generated */ public Adapter createTraceAdapter() { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceSwitch.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceSwitch.java index ed4d32aa7..8a7a524d2 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceSwitch.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/generictrace/util/GenerictraceSwitch.java @@ -1,19 +1,19 @@ /** */ -package fr.inria.diverse.trace.commons.model.generictrace.util; +package org.eclipse.gemoc.trace.commons.model.generictrace.util; -import fr.inria.diverse.trace.commons.model.generictrace.*; +import org.eclipse.gemoc.trace.commons.model.generictrace.*; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.SmallStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.ParallelStep; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.SmallStep; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -30,7 +30,7 @@ * until a non-null result is returned, * which is the result of the switch. * - * @see fr.inria.diverse.trace.commons.model.generictrace.GenerictracePackage + * @see org.eclipse.gemoc.trace.commons.model.generictrace.GenerictracePackage * @generated */ public class GenerictraceSwitch extends Switch { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/helper/StepHelper.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/helper/StepHelper.java index 531fbf84a..442baa52c 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/helper/StepHelper.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/helper/StepHelper.java @@ -8,18 +8,18 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.commons.model.helper; +package org.eclipse.gemoc.trace.commons.model.helper; import java.util.ArrayList; import java.util.List; import org.eclipse.emf.ecore.util.EcoreUtil; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.SmallStep; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.SmallStep; +import org.eclipse.gemoc.trace.commons.model.trace.Step; public class StepHelper { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AddonExtensionParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AddonExtensionParameter.java index 89c523034..e81b45bbb 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AddonExtensionParameter.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AddonExtensionParameter.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getAddonExtensionParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getAddonExtensionParameter() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AnimatorURIParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AnimatorURIParameter.java index 6a58c66fb..0f54a3b07 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AnimatorURIParameter.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/AnimatorURIParameter.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getAnimatorURIParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getAnimatorURIParameter() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/EntryPointParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/EntryPointParameter.java index 254fe8a2a..0c1e2c8d0 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/EntryPointParameter.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/EntryPointParameter.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getEntryPointParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getEntryPointParameter() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java index 8c03f8ba6..7359e967b 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationArgumentsParameter.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getInitializationArgumentsParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getInitializationArgumentsParameter() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationMethodParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationMethodParameter.java index 54d108515..fca785d64 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationMethodParameter.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/InitializationMethodParameter.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getInitializationMethodParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getInitializationMethodParameter() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LanguageNameParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LanguageNameParameter.java index da4ecaf00..8dee05eda 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LanguageNameParameter.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LanguageNameParameter.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLanguageNameParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLanguageNameParameter() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfiguration.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfiguration.java index 900ca633b..dac5a1baa 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfiguration.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfiguration.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; import org.eclipse.emf.common.util.EList; @@ -15,18 +15,18 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getParameters Parameters}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getType Type}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration#getParameters Parameters}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration#getType Type}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfiguration() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfiguration() * @model * @generated */ public interface LaunchConfiguration extends EObject { /** * Returns the value of the 'Parameters' containment reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter}. + * The list contents are of type {@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter}. * *

    * If the meaning of the 'Parameters' containment reference list isn't clear, @@ -34,7 +34,7 @@ public interface LaunchConfiguration extends EObject { *

    * * @return the value of the 'Parameters' containment reference list. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfiguration_Parameters() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfiguration_Parameters() * @model containment="true" * @generated */ @@ -50,14 +50,14 @@ public interface LaunchConfiguration extends EObject { * * @return the value of the 'Type' attribute. * @see #setType(String) - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfiguration_Type() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfiguration_Type() * @model required="true" * @generated */ String getType(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getType Type}' attribute. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration#getType Type}' attribute. * * * @param value the new value of the 'Type' attribute. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java index 445cb3a1f..7f6e1b7ba 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchConfigurationParameter.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; import org.eclipse.emf.ecore.EObject; @@ -13,10 +13,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue Value}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfigurationParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfigurationParameter() * @model abstract="true" * @generated */ @@ -32,14 +32,14 @@ public interface LaunchConfigurationParameter extends EObject { * * @return the value of the 'Value' attribute. * @see #setValue(String) - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfigurationParameter_Value() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getLaunchConfigurationParameter_Value() * @model default="" * @generated */ String getValue(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue Value}' attribute. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue Value}' attribute. * * * @param value the new value of the 'Value' attribute. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java index b9aaa08ea..cb8d5cc3d 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationFactory.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; import org.eclipse.emf.ecore.EFactory; @@ -9,7 +9,7 @@ * The Factory for the model. * It provides a create method for each non-abstract class of the model. * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage * @generated */ public interface LaunchconfigurationFactory extends EFactory { @@ -19,7 +19,7 @@ public interface LaunchconfigurationFactory extends EFactory { * * @generated */ - LaunchconfigurationFactory eINSTANCE = fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationFactoryImpl.init(); + LaunchconfigurationFactory eINSTANCE = org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationFactoryImpl.init(); /** * Returns a new object of class 'Launch Configuration'. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java index e4da29ea2..8f2e727d9 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/LaunchconfigurationPackage.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -20,7 +20,7 @@ *
  • and each data type
    • * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationFactory + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationFactory * @model kind="package" * @generated */ @@ -55,14 +55,14 @@ public interface LaunchconfigurationPackage extends EPackage { * * @generated */ - LaunchconfigurationPackage eINSTANCE = fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl.init(); + LaunchconfigurationPackage eINSTANCE = org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl.init(); /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl Launch Configuration}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl Launch Configuration}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfiguration() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfiguration() * @generated */ int LAUNCH_CONFIGURATION = 0; @@ -104,11 +104,11 @@ public interface LaunchconfigurationPackage extends EPackage { int LAUNCH_CONFIGURATION_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl Launch Configuration Parameter}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl Launch Configuration Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfigurationParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfigurationParameter() * @generated */ int LAUNCH_CONFIGURATION_PARAMETER = 1; @@ -141,11 +141,11 @@ public interface LaunchconfigurationPackage extends EPackage { int LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl Language Name Parameter}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl Language Name Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLanguageNameParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLanguageNameParameter() * @generated */ int LANGUAGE_NAME_PARAMETER = 2; @@ -178,11 +178,11 @@ public interface LaunchconfigurationPackage extends EPackage { int LANGUAGE_NAME_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAddonExtensionParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAddonExtensionParameter() * @generated */ int ADDON_EXTENSION_PARAMETER = 3; @@ -215,11 +215,11 @@ public interface LaunchconfigurationPackage extends EPackage { int ADDON_EXTENSION_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl Model URI Parameter}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl Model URI Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelURIParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelURIParameter() * @generated */ int MODEL_URI_PARAMETER = 4; @@ -252,11 +252,11 @@ public interface LaunchconfigurationPackage extends EPackage { int MODEL_URI_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl Animator URI Parameter}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl Animator URI Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAnimatorURIParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAnimatorURIParameter() * @generated */ int ANIMATOR_URI_PARAMETER = 5; @@ -289,11 +289,11 @@ public interface LaunchconfigurationPackage extends EPackage { int ANIMATOR_URI_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl Entry Point Parameter}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl Entry Point Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getEntryPointParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getEntryPointParameter() * @generated */ int ENTRY_POINT_PARAMETER = 6; @@ -326,11 +326,11 @@ public interface LaunchconfigurationPackage extends EPackage { int ENTRY_POINT_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationArgumentsParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationArgumentsParameter() * @generated */ int INITIALIZATION_ARGUMENTS_PARAMETER = 7; @@ -363,11 +363,11 @@ public interface LaunchconfigurationPackage extends EPackage { int INITIALIZATION_ARGUMENTS_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl Model Root Parameter}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl Model Root Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelRootParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelRootParameter() * @generated */ int MODEL_ROOT_PARAMETER = 8; @@ -400,11 +400,11 @@ public interface LaunchconfigurationPackage extends EPackage { int MODEL_ROOT_PARAMETER_OPERATION_COUNT = LAUNCH_CONFIGURATION_PARAMETER_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl Initialization Method Parameter}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl Initialization Method Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationMethodParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationMethodParameter() * @generated */ int INITIALIZATION_METHOD_PARAMETER = 9; @@ -440,141 +440,141 @@ public interface LaunchconfigurationPackage extends EPackage { * The meta object id for the 'ISerializable' data type. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getISerializable() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getISerializable() * @generated */ int ISERIALIZABLE = 10; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration Launch Configuration}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration Launch Configuration}'. * * * @return the meta object for class 'Launch Configuration'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration * @generated */ EClass getLaunchConfiguration(); /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getParameters Parameters}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration#getParameters Parameters}'. * * * @return the meta object for the containment reference list 'Parameters'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getParameters() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration#getParameters() * @see #getLaunchConfiguration() * @generated */ EReference getLaunchConfiguration_Parameters(); /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getType Type}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration#getType Type}'. * * * @return the meta object for the attribute 'Type'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration#getType() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration#getType() * @see #getLaunchConfiguration() * @generated */ EAttribute getLaunchConfiguration_Type(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter Launch Configuration Parameter}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter Launch Configuration Parameter}'. * * * @return the meta object for class 'Launch Configuration Parameter'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter * @generated */ EClass getLaunchConfigurationParameter(); /** - * Returns the meta object for the attribute '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue Value}'. + * Returns the meta object for the attribute '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue Value}'. * * * @return the meta object for the attribute 'Value'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter#getValue() * @see #getLaunchConfigurationParameter() * @generated */ EAttribute getLaunchConfigurationParameter_Value(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter Language Name Parameter}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LanguageNameParameter Language Name Parameter}'. * * * @return the meta object for class 'Language Name Parameter'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LanguageNameParameter * @generated */ EClass getLanguageNameParameter(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter Addon Extension Parameter}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.AddonExtensionParameter Addon Extension Parameter}'. * * * @return the meta object for class 'Addon Extension Parameter'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.AddonExtensionParameter * @generated */ EClass getAddonExtensionParameter(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter Model URI Parameter}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelURIParameter Model URI Parameter}'. * * * @return the meta object for class 'Model URI Parameter'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelURIParameter * @generated */ EClass getModelURIParameter(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter Animator URI Parameter}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.AnimatorURIParameter Animator URI Parameter}'. * * * @return the meta object for class 'Animator URI Parameter'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.AnimatorURIParameter * @generated */ EClass getAnimatorURIParameter(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter Entry Point Parameter}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.EntryPointParameter Entry Point Parameter}'. * * * @return the meta object for class 'Entry Point Parameter'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.EntryPointParameter * @generated */ EClass getEntryPointParameter(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter Initialization Arguments Parameter}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationArgumentsParameter Initialization Arguments Parameter}'. * * * @return the meta object for class 'Initialization Arguments Parameter'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationArgumentsParameter * @generated */ EClass getInitializationArgumentsParameter(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter Model Root Parameter}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelRootParameter Model Root Parameter}'. * * * @return the meta object for class 'Model Root Parameter'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelRootParameter * @generated */ EClass getModelRootParameter(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter Initialization Method Parameter}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationMethodParameter Initialization Method Parameter}'. * * * @return the meta object for class 'Initialization Method Parameter'. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationMethodParameter * @generated */ EClass getInitializationMethodParameter(); @@ -613,11 +613,11 @@ public interface LaunchconfigurationPackage extends EPackage { */ interface Literals { /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl Launch Configuration}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl Launch Configuration}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfiguration() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfiguration() * @generated */ EClass LAUNCH_CONFIGURATION = eINSTANCE.getLaunchConfiguration(); @@ -639,11 +639,11 @@ interface Literals { EAttribute LAUNCH_CONFIGURATION__TYPE = eINSTANCE.getLaunchConfiguration_Type(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl Launch Configuration Parameter}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl Launch Configuration Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfigurationParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLaunchConfigurationParameter() * @generated */ EClass LAUNCH_CONFIGURATION_PARAMETER = eINSTANCE.getLaunchConfigurationParameter(); @@ -657,81 +657,81 @@ interface Literals { EAttribute LAUNCH_CONFIGURATION_PARAMETER__VALUE = eINSTANCE.getLaunchConfigurationParameter_Value(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl Language Name Parameter}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl Language Name Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLanguageNameParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LanguageNameParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getLanguageNameParameter() * @generated */ EClass LANGUAGE_NAME_PARAMETER = eINSTANCE.getLanguageNameParameter(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl Addon Extension Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAddonExtensionParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.AddonExtensionParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAddonExtensionParameter() * @generated */ EClass ADDON_EXTENSION_PARAMETER = eINSTANCE.getAddonExtensionParameter(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl Model URI Parameter}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl Model URI Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelURIParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.ModelURIParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelURIParameter() * @generated */ EClass MODEL_URI_PARAMETER = eINSTANCE.getModelURIParameter(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl Animator URI Parameter}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl Animator URI Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAnimatorURIParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.AnimatorURIParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getAnimatorURIParameter() * @generated */ EClass ANIMATOR_URI_PARAMETER = eINSTANCE.getAnimatorURIParameter(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl Entry Point Parameter}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl Entry Point Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getEntryPointParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.EntryPointParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getEntryPointParameter() * @generated */ EClass ENTRY_POINT_PARAMETER = eINSTANCE.getEntryPointParameter(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl Initialization Arguments Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationArgumentsParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.InitializationArgumentsParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationArgumentsParameter() * @generated */ EClass INITIALIZATION_ARGUMENTS_PARAMETER = eINSTANCE.getInitializationArgumentsParameter(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl Model Root Parameter}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl Model Root Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelRootParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.ModelRootParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getModelRootParameter() * @generated */ EClass MODEL_ROOT_PARAMETER = eINSTANCE.getModelRootParameter(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl Initialization Method Parameter}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl Initialization Method Parameter}' class. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationMethodParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.InitializationMethodParameterImpl + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getInitializationMethodParameter() * @generated */ EClass INITIALIZATION_METHOD_PARAMETER = eINSTANCE.getInitializationMethodParameter(); @@ -740,7 +740,7 @@ interface Literals { * The meta object literal for the 'ISerializable' data type. * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getISerializable() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchconfigurationPackageImpl#getISerializable() * @generated */ EDataType ISERIALIZABLE = eINSTANCE.getISerializable(); diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelRootParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelRootParameter.java index bb90483df..32c657345 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelRootParameter.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelRootParameter.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getModelRootParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getModelRootParameter() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelURIParameter.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelURIParameter.java index 8633e500e..a6802376d 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelURIParameter.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/ModelURIParameter.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getModelURIParameter() + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#getModelURIParameter() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java index fdbf92e9a..d4b143b90 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AddonExtensionParameterImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.AddonExtensionParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java index 5b0f506a7..acb565970 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/AnimatorURIParameterImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.AnimatorURIParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java index c79f3ad3b..85f65dd14 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/EntryPointParameterImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.EntryPointParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java index 5dc339144..112413d92 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationArgumentsParameterImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationArgumentsParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java index d6c030e42..878d4f266 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/InitializationMethodParameterImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationMethodParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java index 2a864539a..461195b71 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LanguageNameParameterImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LanguageNameParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java index bd1fda082..ab48e75a4 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationImpl.java @@ -1,10 +1,10 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; import java.util.Collection; @@ -30,8 +30,8 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl#getParameters Parameters}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl#getType Type}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl#getParameters Parameters}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationImpl#getType Type}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java index f181c63ff..7cb851c4e 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchConfigurationParameterImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; import org.eclipse.emf.common.notify.Notification; @@ -20,7 +20,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl#getValue Value}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl.LaunchConfigurationParameterImpl#getValue Value}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java index 5f49902b4..d6825f82d 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationFactoryImpl.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.*; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.*; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java index aebc47ee2..6a1afdb1c 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/LaunchconfigurationPackageImpl.java @@ -1,19 +1,19 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; - -import fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationFactory; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; -import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter; -import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; + +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.AddonExtensionParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.AnimatorURIParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.EntryPointParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationArgumentsParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationMethodParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LanguageNameParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationFactory; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelRootParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelURIParameter; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -118,7 +118,7 @@ public class LaunchconfigurationPackageImpl extends EPackageImpl implements Laun * * * @see org.eclipse.emf.ecore.EPackage.Registry - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#eNS_URI + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage#eNS_URI * @see #init() * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java index 2aa0e22c1..802d77296 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelRootParameterImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; -import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelRootParameter; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java index ceec204e2..ae475eee2 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/impl/ModelURIParameterImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.impl; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; -import fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelURIParameter; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java index a0dba4300..cabfd81ec 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationAdapterFactory.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.util; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.util; -import fr.inria.diverse.trace.commons.model.launchconfiguration.*; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.*; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -16,7 +16,7 @@ * The Adapter Factory for the model. * It provides an adapter createXXX method for each class of the model. * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage * @generated */ public class LaunchconfigurationAdapterFactory extends AdapterFactoryImpl { @@ -128,13 +128,13 @@ public Adapter createAdapter(Notifier target) { /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration Launch Configuration}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration Launch Configuration}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration * @generated */ public Adapter createLaunchConfigurationAdapter() { @@ -142,13 +142,13 @@ public Adapter createLaunchConfigurationAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter Launch Configuration Parameter}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter Launch Configuration Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfigurationParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfigurationParameter * @generated */ public Adapter createLaunchConfigurationParameterAdapter() { @@ -156,13 +156,13 @@ public Adapter createLaunchConfigurationParameterAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter Language Name Parameter}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.LanguageNameParameter Language Name Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LanguageNameParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LanguageNameParameter * @generated */ public Adapter createLanguageNameParameterAdapter() { @@ -170,13 +170,13 @@ public Adapter createLanguageNameParameterAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter Addon Extension Parameter}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.AddonExtensionParameter Addon Extension Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.AddonExtensionParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.AddonExtensionParameter * @generated */ public Adapter createAddonExtensionParameterAdapter() { @@ -184,13 +184,13 @@ public Adapter createAddonExtensionParameterAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter Model URI Parameter}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelURIParameter Model URI Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.ModelURIParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelURIParameter * @generated */ public Adapter createModelURIParameterAdapter() { @@ -198,13 +198,13 @@ public Adapter createModelURIParameterAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter Animator URI Parameter}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.AnimatorURIParameter Animator URI Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.AnimatorURIParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.AnimatorURIParameter * @generated */ public Adapter createAnimatorURIParameterAdapter() { @@ -212,13 +212,13 @@ public Adapter createAnimatorURIParameterAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter Entry Point Parameter}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.EntryPointParameter Entry Point Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.EntryPointParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.EntryPointParameter * @generated */ public Adapter createEntryPointParameterAdapter() { @@ -226,13 +226,13 @@ public Adapter createEntryPointParameterAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter Initialization Arguments Parameter}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationArgumentsParameter Initialization Arguments Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationArgumentsParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationArgumentsParameter * @generated */ public Adapter createInitializationArgumentsParameterAdapter() { @@ -240,13 +240,13 @@ public Adapter createInitializationArgumentsParameterAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter Model Root Parameter}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelRootParameter Model Root Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.ModelRootParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.ModelRootParameter * @generated */ public Adapter createModelRootParameterAdapter() { @@ -254,13 +254,13 @@ public Adapter createModelRootParameterAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter Initialization Method Parameter}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationMethodParameter Initialization Method Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.InitializationMethodParameter + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.InitializationMethodParameter * @generated */ public Adapter createInitializationMethodParameterAdapter() { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java index 6ce972aec..79751c63d 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/launchconfiguration/util/LaunchconfigurationSwitch.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.launchconfiguration.util; +package org.eclipse.gemoc.trace.commons.model.launchconfiguration.util; -import fr.inria.diverse.trace.commons.model.launchconfiguration.*; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.*; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -19,7 +19,7 @@ * until a non-null result is returned, * which is the result of the switch. * - * @see fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage + * @see org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage * @generated */ public class LaunchconfigurationSwitch extends Switch { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/BigStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/BigStep.java index 0b0d58364..27edb16c2 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/BigStep.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/BigStep.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.common.util.EList; @@ -13,10 +13,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps Sub Steps}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.BigStep#getSubSteps Sub Steps}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getBigStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getBigStep() * @model abstract="true" * @generated */ @@ -30,7 +30,7 @@ public interface BigStep, StateSubType ex *

    * * @return the value of the 'Sub Steps' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getBigStep_SubSteps() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getBigStep_SubSteps() * @model containment="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Dimension.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Dimension.java index 5d22b289f..860045eb9 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Dimension.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Dimension.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.common.util.EList; @@ -15,10 +15,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.Dimension#getValues Values}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.Dimension#getValues Values}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getDimension() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getDimension() * @model abstract="true" * @generated */ @@ -32,7 +32,7 @@ public interface Dimension> extends EObject { *

    * * @return the value of the 'Values' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getDimension_Values() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getDimension_Values() * @model containment="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/GenericMSE.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/GenericMSE.java index 4a9524377..e374b5c5a 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/GenericMSE.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/GenericMSE.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EOperation; @@ -14,11 +14,11 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericMSE() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getGenericMSE() * @model * @generated */ @@ -33,14 +33,14 @@ public interface GenericMSE extends MSE { * * @return the value of the 'Caller Reference' reference. * @see #setCallerReference(EObject) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericMSE_CallerReference() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getGenericMSE_CallerReference() * @model * @generated */ EObject getCallerReference(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}' reference. * * * @param value the new value of the 'Caller Reference' reference. @@ -59,14 +59,14 @@ public interface GenericMSE extends MSE { * * @return the value of the 'Action Reference' reference. * @see #setActionReference(EOperation) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getGenericMSE_ActionReference() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getGenericMSE_ActionReference() * @model * @generated */ EOperation getActionReference(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}' reference. * * * @param value the new value of the 'Action Reference' reference. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSE.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSE.java index 3cb6663af..2156ec649 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSE.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSE.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.ecore.ENamedElement; import org.eclipse.emf.ecore.EObject; @@ -12,7 +12,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSE() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getMSE() * @model abstract="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEModel.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEModel.java index e8dce1532..c0cee2ca8 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEModel.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEModel.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.common.util.EList; @@ -15,17 +15,17 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs Owned MS Es}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.MSEModel#getOwnedMSEs Owned MS Es}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEModel() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getMSEModel() * @model * @generated */ public interface MSEModel extends EObject { /** * Returns the value of the 'Owned MS Es' containment reference list. - * The list contents are of type {@link fr.inria.diverse.trace.commons.model.trace.MSE}. + * The list contents are of type {@link org.eclipse.gemoc.trace.commons.model.trace.MSE}. * *

    * If the meaning of the 'Owned MS Es' containment reference list isn't clear, @@ -33,7 +33,7 @@ public interface MSEModel extends EObject { *

    * * @return the value of the 'Owned MS Es' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEModel_OwnedMSEs() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getMSEModel_OwnedMSEs() * @model containment="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEOccurrence.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEOccurrence.java index 4a1773fb2..379d45e97 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEOccurrence.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/MSEOccurrence.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.common.util.EList; @@ -15,12 +15,12 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters Parameters}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult Result}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence#getMse Mse}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence#getParameters Parameters}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence#getResult Result}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getMSEOccurrence() * @model * @generated */ @@ -35,14 +35,14 @@ public interface MSEOccurrence extends EObject { * * @return the value of the 'Mse' reference. * @see #setMse(MSE) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence_Mse() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getMSEOccurrence_Mse() * @model required="true" * @generated */ MSE getMse(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence#getMse Mse}' reference. * * * @param value the new value of the 'Mse' reference. @@ -61,7 +61,7 @@ public interface MSEOccurrence extends EObject { *

    * * @return the value of the 'Parameters' attribute list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence_Parameters() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getMSEOccurrence_Parameters() * @model * @generated */ @@ -77,7 +77,7 @@ public interface MSEOccurrence extends EObject { *

    * * @return the value of the 'Result' attribute list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getMSEOccurrence_Result() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getMSEOccurrence_Result() * @model * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/ParallelStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/ParallelStep.java index 194ee2dcc..7ae7e8174 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/ParallelStep.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/ParallelStep.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getParallelStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getParallelStep() * @model abstract="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SequentialStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SequentialStep.java index 917b66595..116384283 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SequentialStep.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SequentialStep.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getSequentialStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getSequentialStep() * @model abstract="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SmallStep.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SmallStep.java index 4758d7752..f3b107cf6 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SmallStep.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/SmallStep.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; /** @@ -9,7 +9,7 @@ * * * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getSmallStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getSmallStep() * @model abstract="true" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/State.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/State.java index 586e3ea1f..b5820d8e2 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/State.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/State.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.common.util.EList; @@ -15,19 +15,19 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.State#getValues Values}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.State#getStartedSteps Started Steps}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.State#getEndedSteps Ended Steps}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.State#getValues Values}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getState() * @model abstract="true" * @generated */ public interface State, ValueSubType extends Value> extends EObject { /** * Returns the value of the 'Started Steps' reference list. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.trace.commons.model.trace.Step#getStartingState Starting State}'. * *

    * If the meaning of the 'Started Steps' reference list isn't clear, @@ -35,8 +35,8 @@ public interface State, ValueSubType extends Value * * @return the value of the 'Started Steps' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_StartedSteps() - * @see fr.inria.diverse.trace.commons.model.trace.Step#getStartingState + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getState_StartedSteps() + * @see org.eclipse.gemoc.trace.commons.model.trace.Step#getStartingState * @model opposite="startingState" * @generated */ @@ -44,7 +44,7 @@ public interface State, ValueSubType extends ValueEnded Steps' reference list. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.trace.commons.model.trace.Step#getEndingState Ending State}'. * *

    * If the meaning of the 'Ended Steps' reference list isn't clear, @@ -52,8 +52,8 @@ public interface State, ValueSubType extends Value * * @return the value of the 'Ended Steps' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_EndedSteps() - * @see fr.inria.diverse.trace.commons.model.trace.Step#getEndingState + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getState_EndedSteps() + * @see org.eclipse.gemoc.trace.commons.model.trace.Step#getEndingState * @model opposite="endingState" * @generated */ @@ -61,7 +61,7 @@ public interface State, ValueSubType extends ValueValues' reference list. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.Value#getStates States}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.trace.commons.model.trace.Value#getStates States}'. * *

    * If the meaning of the 'Values' reference list isn't clear, @@ -69,8 +69,8 @@ public interface State, ValueSubType extends Value * * @return the value of the 'Values' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getState_Values() - * @see fr.inria.diverse.trace.commons.model.trace.Value#getStates + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getState_Values() + * @see org.eclipse.gemoc.trace.commons.model.trace.Value#getStates * @model opposite="states" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Step.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Step.java index 130fe3b3e..64c028c7b 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Step.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Step.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.ecore.EObject; @@ -13,12 +13,12 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.Step#getStartingState Starting State}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.Step#getEndingState Ending State}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getStep() * @model abstract="true" * @generated */ @@ -33,14 +33,14 @@ public interface Step> extends EObject { * * @return the value of the 'Mseoccurrence' containment reference. * @see #setMseoccurrence(MSEOccurrence) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_Mseoccurrence() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getStep_Mseoccurrence() * @model containment="true" * @generated */ MSEOccurrence getMseoccurrence(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}' containment reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}' containment reference. * * * @param value the new value of the 'Mseoccurrence' containment reference. @@ -51,7 +51,7 @@ public interface Step> extends EObject { /** * Returns the value of the 'Starting State' reference. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.trace.commons.model.trace.State#getStartedSteps Started Steps}'. * *

    * If the meaning of the 'Starting State' reference isn't clear, @@ -60,15 +60,15 @@ public interface Step> extends EObject { * * @return the value of the 'Starting State' reference. * @see #setStartingState(State) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_StartingState() - * @see fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getStep_StartingState() + * @see org.eclipse.gemoc.trace.commons.model.trace.State#getStartedSteps * @model opposite="startedSteps" required="true" * @generated */ StateSubType getStartingState(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.trace.Step#getStartingState Starting State}' reference. * * * @param value the new value of the 'Starting State' reference. @@ -79,7 +79,7 @@ public interface Step> extends EObject { /** * Returns the value of the 'Ending State' reference. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.trace.commons.model.trace.State#getEndedSteps Ended Steps}'. * *

    * If the meaning of the 'Ending State' reference isn't clear, @@ -88,15 +88,15 @@ public interface Step> extends EObject { * * @return the value of the 'Ending State' reference. * @see #setEndingState(State) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getStep_EndingState() - * @see fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getStep_EndingState() + * @see org.eclipse.gemoc.trace.commons.model.trace.State#getEndedSteps * @model opposite="endedSteps" * @generated */ StateSubType getEndingState(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}' reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.trace.Step#getEndingState Ending State}' reference. * * * @param value the new value of the 'Ending State' reference. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Trace.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Trace.java index 86daa787e..6a74552d0 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Trace.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Trace.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; import org.eclipse.emf.common.util.EList; @@ -17,13 +17,13 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects Traced Objects}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getStates States}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.Trace#getRootStep Root Step}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.Trace#getTracedObjects Traced Objects}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.Trace#getStates States}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTrace() * @model abstract="true" * @generated */ @@ -38,14 +38,14 @@ public interface Trace, TracedObjectSubtype extends * * @return the value of the 'Root Step' containment reference. * @see #setRootStep(Step) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_RootStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTrace_RootStep() * @model containment="true" required="true" * @generated */ StepSubType getRootStep(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}' containment reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.trace.Trace#getRootStep Root Step}' containment reference. * * * @param value the new value of the 'Root Step' containment reference. @@ -63,7 +63,7 @@ public interface Trace, TracedObjectSubtype extends *

    * * @return the value of the 'Traced Objects' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_TracedObjects() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTrace_TracedObjects() * @model containment="true" * @generated */ @@ -78,7 +78,7 @@ public interface Trace, TracedObjectSubtype extends *

    * * @return the value of the 'States' containment reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_States() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTrace_States() * @model containment="true" * @generated */ @@ -94,14 +94,14 @@ public interface Trace, TracedObjectSubtype extends * * @return the value of the 'Launchconfiguration' containment reference. * @see #setLaunchconfiguration(LaunchConfiguration) - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTrace_Launchconfiguration() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTrace_Launchconfiguration() * @model containment="true" required="true" * @generated */ LaunchConfiguration getLaunchconfiguration(); /** - * Sets the value of the '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}' containment reference. + * Sets the value of the '{@link org.eclipse.gemoc.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}' containment reference. * * * @param value the new value of the 'Launchconfiguration' containment reference. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TraceFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TraceFactory.java index d1d92f0e6..8dfe1d776 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TraceFactory.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TraceFactory.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.ecore.EFactory; @@ -9,7 +9,7 @@ * The Factory for the model. * It provides a create method for each non-abstract class of the model. * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage * @generated */ public interface TraceFactory extends EFactory { @@ -19,7 +19,7 @@ public interface TraceFactory extends EFactory { * * @generated */ - TraceFactory eINSTANCE = fr.inria.diverse.trace.commons.model.trace.impl.TraceFactoryImpl.init(); + TraceFactory eINSTANCE = org.eclipse.gemoc.trace.commons.model.trace.impl.TraceFactoryImpl.init(); /** * Returns a new object of class 'MSE Occurrence'. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracePackage.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracePackage.java index 451fff743..cf7bc9ae7 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracePackage.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracePackage.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -22,7 +22,7 @@ *
  • and each data type
    • * * - * @see fr.inria.diverse.trace.commons.model.trace.TraceFactory + * @see org.eclipse.gemoc.trace.commons.model.trace.TraceFactory * @model kind="package" * @generated */ @@ -57,14 +57,14 @@ public interface TracePackage extends EPackage { * * @generated */ - TracePackage eINSTANCE = fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl.init(); + TracePackage eINSTANCE = org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl.init(); /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl MSE Occurrence}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.MSEOccurrenceImpl MSE Occurrence}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEOccurrence() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.MSEOccurrenceImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getMSEOccurrence() * @generated */ int MSE_OCCURRENCE = 0; @@ -115,11 +115,11 @@ public interface TracePackage extends EPackage { int MSE_OCCURRENCE_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl MSE}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.MSEImpl MSE}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSE() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.MSEImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getMSE() * @generated */ int MSE = 1; @@ -188,11 +188,11 @@ public interface TracePackage extends EPackage { int MSE_OPERATION_COUNT = EcorePackage.ENAMED_ELEMENT_OPERATION_COUNT + 2; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl MSE Model}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.MSEModelImpl MSE Model}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEModel() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.MSEModelImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getMSEModel() * @generated */ int MSE_MODEL = 2; @@ -225,11 +225,11 @@ public interface TracePackage extends EPackage { int MSE_MODEL_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl Generic MSE}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.GenericMSEImpl Generic MSE}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericMSE() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.GenericMSEImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getGenericMSE() * @generated */ int GENERIC_MSE = 3; @@ -316,11 +316,11 @@ public interface TracePackage extends EPackage { int GENERIC_MSE_OPERATION_COUNT = MSE_OPERATION_COUNT + 2; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl Step}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.StepImpl Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.StepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.StepImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getStep() * @generated */ int STEP = 4; @@ -371,11 +371,11 @@ public interface TracePackage extends EPackage { int STEP_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl Big Step}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.BigStepImpl Big Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getBigStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.BigStepImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getBigStep() * @generated */ int BIG_STEP = 5; @@ -435,11 +435,11 @@ public interface TracePackage extends EPackage { int BIG_STEP_OPERATION_COUNT = STEP_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl Small Step}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.SmallStepImpl Small Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSmallStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.SmallStepImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getSmallStep() * @generated */ int SMALL_STEP = 6; @@ -490,11 +490,11 @@ public interface TracePackage extends EPackage { int SMALL_STEP_OPERATION_COUNT = STEP_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl Sequential Step}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.SequentialStepImpl Sequential Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSequentialStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.SequentialStepImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getSequentialStep() * @generated */ int SEQUENTIAL_STEP = 7; @@ -554,11 +554,11 @@ public interface TracePackage extends EPackage { int SEQUENTIAL_STEP_OPERATION_COUNT = BIG_STEP_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl Parallel Step}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.ParallelStepImpl Parallel Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getParallelStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.ParallelStepImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getParallelStep() * @generated */ int PARALLEL_STEP = 8; @@ -618,11 +618,11 @@ public interface TracePackage extends EPackage { int PARALLEL_STEP_OPERATION_COUNT = BIG_STEP_OPERATION_COUNT + 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl Trace}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.TraceImpl Trace}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTrace() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TraceImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getTrace() * @generated */ int TRACE = 9; @@ -682,11 +682,11 @@ public interface TracePackage extends EPackage { int TRACE_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl Traced Object}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.TracedObjectImpl Traced Object}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTracedObject() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracedObjectImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getTracedObject() * @generated */ int TRACED_OBJECT = 10; @@ -728,11 +728,11 @@ public interface TracePackage extends EPackage { int TRACED_OBJECT_OPERATION_COUNT = 1; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getDimension() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.DimensionImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getDimension() * @generated */ int DIMENSION = 11; @@ -765,11 +765,11 @@ public interface TracePackage extends EPackage { int DIMENSION_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl Value}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.ValueImpl Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getValue() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.ValueImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getValue() * @generated */ int VALUE = 12; @@ -802,11 +802,11 @@ public interface TracePackage extends EPackage { int VALUE_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. + * The meta object id for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.StateImpl State}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.StateImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getState() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.StateImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getState() * @generated */ int STATE = 13; @@ -860,417 +860,417 @@ public interface TracePackage extends EPackage { * The meta object id for the 'ISerializable' data type. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() * @generated */ int ISERIALIZABLE = 14; /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence MSE Occurrence}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence MSE Occurrence}'. * * * @return the meta object for class 'MSE Occurrence'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence + * @see org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence * @generated */ EClass getMSEOccurrence(); /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse Mse}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence#getMse Mse}'. * * * @return the meta object for the reference 'Mse'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getMse() + * @see org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence#getMse() * @see #getMSEOccurrence() * @generated */ EReference getMSEOccurrence_Mse(); /** - * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters Parameters}'. + * Returns the meta object for the attribute list '{@link org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence#getParameters Parameters}'. * * * @return the meta object for the attribute list 'Parameters'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getParameters() + * @see org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence#getParameters() * @see #getMSEOccurrence() * @generated */ EAttribute getMSEOccurrence_Parameters(); /** - * Returns the meta object for the attribute list '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult Result}'. + * Returns the meta object for the attribute list '{@link org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence#getResult Result}'. * * * @return the meta object for the attribute list 'Result'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence#getResult() + * @see org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence#getResult() * @see #getMSEOccurrence() * @generated */ EAttribute getMSEOccurrence_Result(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSE MSE}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.MSE MSE}'. * * * @return the meta object for class 'MSE'. - * @see fr.inria.diverse.trace.commons.model.trace.MSE + * @see org.eclipse.gemoc.trace.commons.model.trace.MSE * @generated */ EClass getMSE(); /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.MSE#getCaller() Get Caller}' operation. + * Returns the meta object for the '{@link org.eclipse.gemoc.trace.commons.model.trace.MSE#getCaller() Get Caller}' operation. * * * @return the meta object for the 'Get Caller' operation. - * @see fr.inria.diverse.trace.commons.model.trace.MSE#getCaller() + * @see org.eclipse.gemoc.trace.commons.model.trace.MSE#getCaller() * @generated */ EOperation getMSE__GetCaller(); /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.MSE#getAction() Get Action}' operation. + * Returns the meta object for the '{@link org.eclipse.gemoc.trace.commons.model.trace.MSE#getAction() Get Action}' operation. * * * @return the meta object for the 'Get Action' operation. - * @see fr.inria.diverse.trace.commons.model.trace.MSE#getAction() + * @see org.eclipse.gemoc.trace.commons.model.trace.MSE#getAction() * @generated */ EOperation getMSE__GetAction(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel MSE Model}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.MSEModel MSE Model}'. * * * @return the meta object for class 'MSE Model'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEModel + * @see org.eclipse.gemoc.trace.commons.model.trace.MSEModel * @generated */ EClass getMSEModel(); /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs Owned MS Es}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.trace.commons.model.trace.MSEModel#getOwnedMSEs Owned MS Es}'. * * * @return the meta object for the containment reference list 'Owned MS Es'. - * @see fr.inria.diverse.trace.commons.model.trace.MSEModel#getOwnedMSEs() + * @see org.eclipse.gemoc.trace.commons.model.trace.MSEModel#getOwnedMSEs() * @see #getMSEModel() * @generated */ EReference getMSEModel_OwnedMSEs(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE Generic MSE}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.GenericMSE Generic MSE}'. * * * @return the meta object for class 'Generic MSE'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE + * @see org.eclipse.gemoc.trace.commons.model.trace.GenericMSE * @generated */ EClass getGenericMSE(); /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getCallerReference Caller Reference}'. * * * @return the meta object for the reference 'Caller Reference'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCallerReference() + * @see org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getCallerReference() * @see #getGenericMSE() * @generated */ EReference getGenericMSE_CallerReference(); /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getActionReference Action Reference}'. * * * @return the meta object for the reference 'Action Reference'. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getActionReference() + * @see org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getActionReference() * @see #getGenericMSE() * @generated */ EReference getGenericMSE_ActionReference(); /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCaller() Get Caller}' operation. + * Returns the meta object for the '{@link org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getCaller() Get Caller}' operation. * * * @return the meta object for the 'Get Caller' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getCaller() + * @see org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getCaller() * @generated */ EOperation getGenericMSE__GetCaller(); /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE#getAction() Get Action}' operation. + * Returns the meta object for the '{@link org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getAction() Get Action}' operation. * * * @return the meta object for the 'Get Action' operation. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE#getAction() + * @see org.eclipse.gemoc.trace.commons.model.trace.GenericMSE#getAction() * @generated */ EOperation getGenericMSE__GetAction(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.Step Step}'. * * * @return the meta object for class 'Step'. - * @see fr.inria.diverse.trace.commons.model.trace.Step + * @see org.eclipse.gemoc.trace.commons.model.trace.Step * @generated */ EClass getStep(); /** - * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}'. + * Returns the meta object for the containment reference '{@link org.eclipse.gemoc.trace.commons.model.trace.Step#getMseoccurrence Mseoccurrence}'. * * * @return the meta object for the containment reference 'Mseoccurrence'. - * @see fr.inria.diverse.trace.commons.model.trace.Step#getMseoccurrence() + * @see org.eclipse.gemoc.trace.commons.model.trace.Step#getMseoccurrence() * @see #getStep() * @generated */ EReference getStep_Mseoccurrence(); /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getStartingState Starting State}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.trace.commons.model.trace.Step#getStartingState Starting State}'. * * * @return the meta object for the reference 'Starting State'. - * @see fr.inria.diverse.trace.commons.model.trace.Step#getStartingState() + * @see org.eclipse.gemoc.trace.commons.model.trace.Step#getStartingState() * @see #getStep() * @generated */ EReference getStep_StartingState(); /** - * Returns the meta object for the reference '{@link fr.inria.diverse.trace.commons.model.trace.Step#getEndingState Ending State}'. + * Returns the meta object for the reference '{@link org.eclipse.gemoc.trace.commons.model.trace.Step#getEndingState Ending State}'. * * * @return the meta object for the reference 'Ending State'. - * @see fr.inria.diverse.trace.commons.model.trace.Step#getEndingState() + * @see org.eclipse.gemoc.trace.commons.model.trace.Step#getEndingState() * @see #getStep() * @generated */ EReference getStep_EndingState(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.BigStep Big Step}'. * * * @return the meta object for class 'Big Step'. - * @see fr.inria.diverse.trace.commons.model.trace.BigStep + * @see org.eclipse.gemoc.trace.commons.model.trace.BigStep * @generated */ EClass getBigStep(); /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps Sub Steps}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.trace.commons.model.trace.BigStep#getSubSteps Sub Steps}'. * * * @return the meta object for the containment reference list 'Sub Steps'. - * @see fr.inria.diverse.trace.commons.model.trace.BigStep#getSubSteps() + * @see org.eclipse.gemoc.trace.commons.model.trace.BigStep#getSubSteps() * @see #getBigStep() * @generated */ EReference getBigStep_SubSteps(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.SmallStep Small Step}'. * * * @return the meta object for class 'Small Step'. - * @see fr.inria.diverse.trace.commons.model.trace.SmallStep + * @see org.eclipse.gemoc.trace.commons.model.trace.SmallStep * @generated */ EClass getSmallStep(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.SequentialStep Sequential Step}'. * * * @return the meta object for class 'Sequential Step'. - * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep + * @see org.eclipse.gemoc.trace.commons.model.trace.SequentialStep * @generated */ EClass getSequentialStep(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.ParallelStep Parallel Step}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.ParallelStep Parallel Step}'. * * * @return the meta object for class 'Parallel Step'. - * @see fr.inria.diverse.trace.commons.model.trace.ParallelStep + * @see org.eclipse.gemoc.trace.commons.model.trace.ParallelStep * @generated */ EClass getParallelStep(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.Trace Trace}'. * * * @return the meta object for class 'Trace'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace + * @see org.eclipse.gemoc.trace.commons.model.trace.Trace * @generated */ EClass getTrace(); /** - * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep Root Step}'. + * Returns the meta object for the containment reference '{@link org.eclipse.gemoc.trace.commons.model.trace.Trace#getRootStep Root Step}'. * * * @return the meta object for the containment reference 'Root Step'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace#getRootStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.Trace#getRootStep() * @see #getTrace() * @generated */ EReference getTrace_RootStep(); /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects Traced Objects}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.trace.commons.model.trace.Trace#getTracedObjects Traced Objects}'. * * * @return the meta object for the containment reference list 'Traced Objects'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace#getTracedObjects() + * @see org.eclipse.gemoc.trace.commons.model.trace.Trace#getTracedObjects() * @see #getTrace() * @generated */ EReference getTrace_TracedObjects(); /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getStates States}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.trace.commons.model.trace.Trace#getStates States}'. * * * @return the meta object for the containment reference list 'States'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace#getStates() + * @see org.eclipse.gemoc.trace.commons.model.trace.Trace#getStates() * @see #getTrace() * @generated */ EReference getTrace_States(); /** - * Returns the meta object for the containment reference '{@link fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}'. + * Returns the meta object for the containment reference '{@link org.eclipse.gemoc.trace.commons.model.trace.Trace#getLaunchconfiguration Launchconfiguration}'. * * * @return the meta object for the containment reference 'Launchconfiguration'. - * @see fr.inria.diverse.trace.commons.model.trace.Trace#getLaunchconfiguration() + * @see org.eclipse.gemoc.trace.commons.model.trace.Trace#getLaunchconfiguration() * @see #getTrace() * @generated */ EReference getTrace_Launchconfiguration(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.TracedObject Traced Object}'. * * * @return the meta object for class 'Traced Object'. - * @see fr.inria.diverse.trace.commons.model.trace.TracedObject + * @see org.eclipse.gemoc.trace.commons.model.trace.TracedObject * @generated */ EClass getTracedObject(); /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions Dimensions}'. + * Returns the meta object for the reference list '{@link org.eclipse.gemoc.trace.commons.model.trace.TracedObject#getDimensions Dimensions}'. * * * @return the meta object for the reference list 'Dimensions'. - * @see fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracedObject#getDimensions() * @see #getTracedObject() * @generated */ EReference getTracedObject_Dimensions(); /** - * Returns the meta object for the '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensionsInternal() Get Dimensions Internal}' operation. + * Returns the meta object for the '{@link org.eclipse.gemoc.trace.commons.model.trace.TracedObject#getDimensionsInternal() Get Dimensions Internal}' operation. * * * @return the meta object for the 'Get Dimensions Internal' operation. - * @see fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensionsInternal() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracedObject#getDimensionsInternal() * @generated */ EOperation getTracedObject__GetDimensionsInternal(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.Dimension Dimension}'. * * * @return the meta object for class 'Dimension'. - * @see fr.inria.diverse.trace.commons.model.trace.Dimension + * @see org.eclipse.gemoc.trace.commons.model.trace.Dimension * @generated */ EClass getDimension(); /** - * Returns the meta object for the containment reference list '{@link fr.inria.diverse.trace.commons.model.trace.Dimension#getValues Values}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.gemoc.trace.commons.model.trace.Dimension#getValues Values}'. * * * @return the meta object for the containment reference list 'Values'. - * @see fr.inria.diverse.trace.commons.model.trace.Dimension#getValues() + * @see org.eclipse.gemoc.trace.commons.model.trace.Dimension#getValues() * @see #getDimension() * @generated */ EReference getDimension_Values(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.Value Value}'. * * * @return the meta object for class 'Value'. - * @see fr.inria.diverse.trace.commons.model.trace.Value + * @see org.eclipse.gemoc.trace.commons.model.trace.Value * @generated */ EClass getValue(); /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.Value#getStates States}'. + * Returns the meta object for the reference list '{@link org.eclipse.gemoc.trace.commons.model.trace.Value#getStates States}'. * * * @return the meta object for the reference list 'States'. - * @see fr.inria.diverse.trace.commons.model.trace.Value#getStates() + * @see org.eclipse.gemoc.trace.commons.model.trace.Value#getStates() * @see #getValue() * @generated */ EReference getValue_States(); /** - * Returns the meta object for class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. + * Returns the meta object for class '{@link org.eclipse.gemoc.trace.commons.model.trace.State State}'. * * * @return the meta object for class 'State'. - * @see fr.inria.diverse.trace.commons.model.trace.State + * @see org.eclipse.gemoc.trace.commons.model.trace.State * @generated */ EClass getState(); /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps Started Steps}'. + * Returns the meta object for the reference list '{@link org.eclipse.gemoc.trace.commons.model.trace.State#getStartedSteps Started Steps}'. * * * @return the meta object for the reference list 'Started Steps'. - * @see fr.inria.diverse.trace.commons.model.trace.State#getStartedSteps() + * @see org.eclipse.gemoc.trace.commons.model.trace.State#getStartedSteps() * @see #getState() * @generated */ EReference getState_StartedSteps(); /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps Ended Steps}'. + * Returns the meta object for the reference list '{@link org.eclipse.gemoc.trace.commons.model.trace.State#getEndedSteps Ended Steps}'. * * * @return the meta object for the reference list 'Ended Steps'. - * @see fr.inria.diverse.trace.commons.model.trace.State#getEndedSteps() + * @see org.eclipse.gemoc.trace.commons.model.trace.State#getEndedSteps() * @see #getState() * @generated */ EReference getState_EndedSteps(); /** - * Returns the meta object for the reference list '{@link fr.inria.diverse.trace.commons.model.trace.State#getValues Values}'. + * Returns the meta object for the reference list '{@link org.eclipse.gemoc.trace.commons.model.trace.State#getValues Values}'. * * * @return the meta object for the reference list 'Values'. - * @see fr.inria.diverse.trace.commons.model.trace.State#getValues() + * @see org.eclipse.gemoc.trace.commons.model.trace.State#getValues() * @see #getState() * @generated */ @@ -1310,11 +1310,11 @@ public interface TracePackage extends EPackage { */ interface Literals { /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl MSE Occurrence}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.MSEOccurrenceImpl MSE Occurrence}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEOccurrence() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.MSEOccurrenceImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getMSEOccurrence() * @generated */ EClass MSE_OCCURRENCE = eINSTANCE.getMSEOccurrence(); @@ -1344,11 +1344,11 @@ interface Literals { EAttribute MSE_OCCURRENCE__RESULT = eINSTANCE.getMSEOccurrence_Result(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl MSE}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.MSEImpl MSE}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSE() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.MSEImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getMSE() * @generated */ EClass MSE = eINSTANCE.getMSE(); @@ -1370,11 +1370,11 @@ interface Literals { EOperation MSE___GET_ACTION = eINSTANCE.getMSE__GetAction(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl MSE Model}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.MSEModelImpl MSE Model}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getMSEModel() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.MSEModelImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getMSEModel() * @generated */ EClass MSE_MODEL = eINSTANCE.getMSEModel(); @@ -1388,11 +1388,11 @@ interface Literals { EReference MSE_MODEL__OWNED_MS_ES = eINSTANCE.getMSEModel_OwnedMSEs(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl Generic MSE}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.GenericMSEImpl Generic MSE}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getGenericMSE() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.GenericMSEImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getGenericMSE() * @generated */ EClass GENERIC_MSE = eINSTANCE.getGenericMSE(); @@ -1430,11 +1430,11 @@ interface Literals { EOperation GENERIC_MSE___GET_ACTION = eINSTANCE.getGenericMSE__GetAction(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl Step}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.StepImpl Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.StepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.StepImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getStep() * @generated */ EClass STEP = eINSTANCE.getStep(); @@ -1464,11 +1464,11 @@ interface Literals { EReference STEP__ENDING_STATE = eINSTANCE.getStep_EndingState(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl Big Step}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.BigStepImpl Big Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getBigStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.BigStepImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getBigStep() * @generated */ EClass BIG_STEP = eINSTANCE.getBigStep(); @@ -1482,41 +1482,41 @@ interface Literals { EReference BIG_STEP__SUB_STEPS = eINSTANCE.getBigStep_SubSteps(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl Small Step}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.SmallStepImpl Small Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSmallStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.SmallStepImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getSmallStep() * @generated */ EClass SMALL_STEP = eINSTANCE.getSmallStep(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl Sequential Step}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.SequentialStepImpl Sequential Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getSequentialStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.SequentialStepImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getSequentialStep() * @generated */ EClass SEQUENTIAL_STEP = eINSTANCE.getSequentialStep(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl Parallel Step}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.ParallelStepImpl Parallel Step}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ParallelStepImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getParallelStep() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.ParallelStepImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getParallelStep() * @generated */ EClass PARALLEL_STEP = eINSTANCE.getParallelStep(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl Trace}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.TraceImpl Trace}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTrace() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TraceImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getTrace() * @generated */ EClass TRACE = eINSTANCE.getTrace(); @@ -1554,11 +1554,11 @@ interface Literals { EReference TRACE__LAUNCHCONFIGURATION = eINSTANCE.getTrace_Launchconfiguration(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl Traced Object}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.TracedObjectImpl Traced Object}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getTracedObject() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracedObjectImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getTracedObject() * @generated */ EClass TRACED_OBJECT = eINSTANCE.getTracedObject(); @@ -1580,11 +1580,11 @@ interface Literals { EOperation TRACED_OBJECT___GET_DIMENSIONS_INTERNAL = eINSTANCE.getTracedObject__GetDimensionsInternal(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.DimensionImpl Dimension}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getDimension() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.DimensionImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getDimension() * @generated */ EClass DIMENSION = eINSTANCE.getDimension(); @@ -1598,11 +1598,11 @@ interface Literals { EReference DIMENSION__VALUES = eINSTANCE.getDimension_Values(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl Value}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.ValueImpl Value}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getValue() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.ValueImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getValue() * @generated */ EClass VALUE = eINSTANCE.getValue(); @@ -1616,11 +1616,11 @@ interface Literals { EReference VALUE__STATES = eINSTANCE.getValue_States(); /** - * The meta object literal for the '{@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl State}' class. + * The meta object literal for the '{@link org.eclipse.gemoc.trace.commons.model.trace.impl.StateImpl State}' class. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.StateImpl - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getState() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.StateImpl + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getState() * @generated */ EClass STATE = eINSTANCE.getState(); @@ -1653,7 +1653,7 @@ interface Literals { * The meta object literal for the 'ISerializable' data type. * * - * @see fr.inria.diverse.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() + * @see org.eclipse.gemoc.trace.commons.model.trace.impl.TracePackageImpl#getISerializable() * @generated */ EDataType ISERIALIZABLE = eINSTANCE.getISerializable(); diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracedObject.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracedObject.java index a7b2f4d73..1c6666aeb 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracedObject.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/TracedObject.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.common.util.EList; @@ -15,10 +15,10 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.TracedObject#getDimensions Dimensions}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.TracedObject#getDimensions Dimensions}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTracedObject() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTracedObject() * @model abstract="true" * @generated */ @@ -32,7 +32,7 @@ public interface TracedObject> extends EOb *

    * * @return the value of the 'Dimensions' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getTracedObject_Dimensions() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getTracedObject_Dimensions() * @model transient="true" volatile="true" * annotation="http://www.eclipse.org/emf/2002/GenModel get='return getDimensionsInternal();'" * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Value.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Value.java index 75292c194..a12c0dc23 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Value.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/Value.java @@ -1,6 +1,6 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace; +package org.eclipse.gemoc.trace.commons.model.trace; import org.eclipse.emf.common.util.EList; @@ -15,17 +15,17 @@ * The following features are supported: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.Value#getStates States}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.Value#getStates States}
      • *
    * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue() + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getValue() * @model abstract="true" * @generated */ public interface Value> extends EObject { /** * Returns the value of the 'States' reference list. - * It is bidirectional and its opposite is '{@link fr.inria.diverse.trace.commons.model.trace.State#getValues Values}'. + * It is bidirectional and its opposite is '{@link org.eclipse.gemoc.trace.commons.model.trace.State#getValues Values}'. * *

    * If the meaning of the 'States' reference list isn't clear, @@ -33,8 +33,8 @@ public interface Value> extends EObject { *

    * * @return the value of the 'States' reference list. - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#getValue_States() - * @see fr.inria.diverse.trace.commons.model.trace.State#getValues + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#getValue_States() + * @see org.eclipse.gemoc.trace.commons.model.trace.State#getValues * @model opposite="values" * @generated */ diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/BigStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/BigStepImpl.java index b317200b9..60148bf27 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/BigStepImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/BigStepImpl.java @@ -1,11 +1,11 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import java.util.Collection; @@ -27,7 +27,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.BigStepImpl#getSubSteps Sub Steps}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.BigStepImpl#getSubSteps Sub Steps}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/DimensionImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/DimensionImpl.java index 76aefb7b9..e8184b007 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/DimensionImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/DimensionImpl.java @@ -1,10 +1,10 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.Value; import java.util.Collection; @@ -28,7 +28,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl#getValues Values}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.DimensionImpl#getValues Values}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/GenericMSEImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/GenericMSEImpl.java index b6555ea3e..ad45b4fa6 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/GenericMSEImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/GenericMSEImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.GenericMSE; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.GenericMSE; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import java.lang.reflect.InvocationTargetException; @@ -26,8 +26,8 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl#getCallerReference Caller Reference}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.GenericMSEImpl#getActionReference Action Reference}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.GenericMSEImpl#getCallerReference Caller Reference}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.GenericMSEImpl#getActionReference Action Reference}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEImpl.java index 7be75fa67..d9b5f1ead 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEImpl.java @@ -1,9 +1,9 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import java.lang.reflect.InvocationTargetException; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEModelImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEModelImpl.java index 4b5ca8752..f963eff5e 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEModelImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEModelImpl.java @@ -1,10 +1,10 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.MSEModel; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.MSEModel; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import java.util.Collection; @@ -28,7 +28,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEModelImpl#getOwnedMSEs Owned MS Es}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.MSEModelImpl#getOwnedMSEs Owned MS Es}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEOccurrenceImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEOccurrenceImpl.java index 11e20adba..541d107d7 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEOccurrenceImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/MSEOccurrenceImpl.java @@ -1,10 +1,10 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import java.util.Collection; @@ -28,9 +28,9 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl#getMse Mse}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl#getParameters Parameters}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.MSEOccurrenceImpl#getResult Result}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.MSEOccurrenceImpl#getMse Mse}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.MSEOccurrenceImpl#getParameters Parameters}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.MSEOccurrenceImpl#getResult Result}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ParallelStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ParallelStepImpl.java index 937c9f2b7..251f2ed19 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ParallelStepImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ParallelStepImpl.java @@ -1,11 +1,11 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.ParallelStep; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SequentialStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SequentialStepImpl.java index 73100df30..1497a7178 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SequentialStepImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SequentialStepImpl.java @@ -1,11 +1,11 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SmallStepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SmallStepImpl.java index 368c9512f..8cd2ef2df 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SmallStepImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/SmallStepImpl.java @@ -1,10 +1,10 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.SmallStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.SmallStep; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StateImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StateImpl.java index b57fb28f4..851574c68 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StateImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StateImpl.java @@ -1,11 +1,11 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.Value; import java.util.Collection; @@ -29,9 +29,9 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getStartedSteps Started Steps}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getEndedSteps Ended Steps}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.StateImpl#getValues Values}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.StateImpl#getStartedSteps Started Steps}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.StateImpl#getEndedSteps Ended Steps}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.StateImpl#getValues Values}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StepImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StepImpl.java index 39e4fca5c..67cc025ae 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StepImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/StepImpl.java @@ -1,11 +1,11 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -24,9 +24,9 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getMseoccurrence Mseoccurrence}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getStartingState Starting State}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.StepImpl#getEndingState Ending State}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.StepImpl#getMseoccurrence Mseoccurrence}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.StepImpl#getStartingState Starting State}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.StepImpl#getEndingState Ending State}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceFactoryImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceFactoryImpl.java index ad935fbbc..02e109241 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceFactoryImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceFactoryImpl.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.*; +import org.eclipse.gemoc.trace.commons.model.trace.*; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceImpl.java index 2b9d2321b..2ef64d091 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TraceImpl.java @@ -1,14 +1,14 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; import java.util.Collection; @@ -34,10 +34,10 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getRootStep Root Step}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getTracedObjects Traced Objects}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getStates States}
      • - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl#getLaunchconfiguration Launchconfiguration}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.TraceImpl#getRootStep Root Step}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.TraceImpl#getTracedObjects Traced Objects}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.TraceImpl#getStates States}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.TraceImpl#getLaunchconfiguration Launchconfiguration}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracePackageImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracePackageImpl.java index ce20edc95..4ec5068d7 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracePackageImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracePackageImpl.java @@ -1,24 +1,24 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; - -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; - -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.GenericMSE; -import fr.inria.diverse.trace.commons.model.trace.MSEModel; -import fr.inria.diverse.trace.commons.model.trace.MSEOccurrence; -import fr.inria.diverse.trace.commons.model.trace.ParallelStep; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.SmallStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TraceFactory; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; +package org.eclipse.gemoc.trace.commons.model.trace.impl; + +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchconfigurationPackage; + +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.GenericMSE; +import org.eclipse.gemoc.trace.commons.model.trace.MSEModel; +import org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence; +import org.eclipse.gemoc.trace.commons.model.trace.ParallelStep; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.SmallStep; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TraceFactory; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -155,7 +155,7 @@ public class TracePackageImpl extends EPackageImpl implements TracePackage { * * * @see org.eclipse.emf.ecore.EPackage.Registry - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage#eNS_URI + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage#eNS_URI * @see #init() * @generated */ @@ -809,7 +809,7 @@ public void initializePackageContents() { initEAttribute(getMSEOccurrence_Parameters(), ecorePackage.getEJavaObject(), "parameters", null, 0, -1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getMSEOccurrence_Result(), ecorePackage.getEJavaObject(), "result", null, 0, -1, MSEOccurrence.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(mseEClass, fr.inria.diverse.trace.commons.model.trace.MSE.class, "MSE", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(mseEClass, org.eclipse.gemoc.trace.commons.model.trace.MSE.class, "MSE", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEOperation(getMSE__GetCaller(), theEcorePackage.getEObject(), "getCaller", 0, 1, IS_UNIQUE, IS_ORDERED); diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracedObjectImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracedObjectImpl.java index 165e415be..0cee3ad07 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracedObjectImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/TracedObjectImpl.java @@ -1,10 +1,10 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; import java.lang.reflect.InvocationTargetException; import java.util.Collection; @@ -21,7 +21,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl#getDimensions Dimensions}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.TracedObjectImpl#getDimensions Dimensions}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ValueImpl.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ValueImpl.java index 784c5cc7b..020091c41 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ValueImpl.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/impl/ValueImpl.java @@ -1,10 +1,10 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.impl; +package org.eclipse.gemoc.trace.commons.model.trace.impl; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.Value; import java.util.Collection; @@ -28,7 +28,7 @@ * The following features are implemented: *

    *
      - *
    • {@link fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl#getStates States}
      • + *
    • {@link org.eclipse.gemoc.trace.commons.model.trace.impl.ValueImpl#getStates States}
      • *
    * * @generated diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceAdapterFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceAdapterFactory.java index 43d3cb3ef..dc0f38e83 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceAdapterFactory.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceAdapterFactory.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.util; +package org.eclipse.gemoc.trace.commons.model.trace.util; -import fr.inria.diverse.trace.commons.model.trace.*; +import org.eclipse.gemoc.trace.commons.model.trace.*; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -18,7 +18,7 @@ * The Adapter Factory for the model. * It provides an adapter createXXX method for each class of the model. * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage * @generated */ public class TraceAdapterFactory extends AdapterFactoryImpl { @@ -154,13 +154,13 @@ public Adapter createAdapter(Notifier target) { /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.MSEOccurrence MSE Occurrence}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence MSE Occurrence}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.MSEOccurrence + * @see org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence * @generated */ public Adapter createMSEOccurrenceAdapter() { @@ -168,13 +168,13 @@ public Adapter createMSEOccurrenceAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.MSE MSE}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.MSE MSE}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.MSE + * @see org.eclipse.gemoc.trace.commons.model.trace.MSE * @generated */ public Adapter createMSEAdapter() { @@ -182,13 +182,13 @@ public Adapter createMSEAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.MSEModel MSE Model}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.MSEModel MSE Model}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.MSEModel + * @see org.eclipse.gemoc.trace.commons.model.trace.MSEModel * @generated */ public Adapter createMSEModelAdapter() { @@ -196,13 +196,13 @@ public Adapter createMSEModelAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.GenericMSE Generic MSE}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.GenericMSE Generic MSE}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.GenericMSE + * @see org.eclipse.gemoc.trace.commons.model.trace.GenericMSE * @generated */ public Adapter createGenericMSEAdapter() { @@ -210,13 +210,13 @@ public Adapter createGenericMSEAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Step Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Step + * @see org.eclipse.gemoc.trace.commons.model.trace.Step * @generated */ public Adapter createStepAdapter() { @@ -224,13 +224,13 @@ public Adapter createStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.BigStep Big Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.BigStep + * @see org.eclipse.gemoc.trace.commons.model.trace.BigStep * @generated */ public Adapter createBigStepAdapter() { @@ -238,13 +238,13 @@ public Adapter createBigStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.SmallStep Small Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.SmallStep + * @see org.eclipse.gemoc.trace.commons.model.trace.SmallStep * @generated */ public Adapter createSmallStepAdapter() { @@ -252,13 +252,13 @@ public Adapter createSmallStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.SequentialStep Sequential Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep + * @see org.eclipse.gemoc.trace.commons.model.trace.SequentialStep * @generated */ public Adapter createSequentialStepAdapter() { @@ -266,13 +266,13 @@ public Adapter createSequentialStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.ParallelStep Parallel Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.ParallelStep Parallel Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.ParallelStep + * @see org.eclipse.gemoc.trace.commons.model.trace.ParallelStep * @generated */ public Adapter createParallelStepAdapter() { @@ -280,13 +280,13 @@ public Adapter createParallelStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Trace Trace}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Trace + * @see org.eclipse.gemoc.trace.commons.model.trace.Trace * @generated */ public Adapter createTraceAdapter() { @@ -294,13 +294,13 @@ public Adapter createTraceAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.TracedObject Traced Object}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.TracedObject + * @see org.eclipse.gemoc.trace.commons.model.trace.TracedObject * @generated */ public Adapter createTracedObjectAdapter() { @@ -308,13 +308,13 @@ public Adapter createTracedObjectAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Dimension Dimension}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Dimension + * @see org.eclipse.gemoc.trace.commons.model.trace.Dimension * @generated */ public Adapter createDimensionAdapter() { @@ -322,13 +322,13 @@ public Adapter createDimensionAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Value Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Value + * @see org.eclipse.gemoc.trace.commons.model.trace.Value * @generated */ public Adapter createValueAdapter() { @@ -336,13 +336,13 @@ public Adapter createValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.State State}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.State + * @see org.eclipse.gemoc.trace.commons.model.trace.State * @generated */ public Adapter createStateAdapter() { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceSwitch.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceSwitch.java index 2a1515946..7e7d01d39 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceSwitch.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons.model/src/org/eclipse/gemoc/trace/commons/model/trace/util/TraceSwitch.java @@ -1,8 +1,8 @@ /** */ -package fr.inria.diverse.trace.commons.model.trace.util; +package org.eclipse.gemoc.trace.commons.model.trace.util; -import fr.inria.diverse.trace.commons.model.trace.*; +import org.eclipse.gemoc.trace.commons.model.trace.*; import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.ENamedElement; @@ -21,7 +21,7 @@ * until a non-null result is returned, * which is the result of the switch. * - * @see fr.inria.diverse.trace.commons.model.trace.TracePackage + * @see org.eclipse.gemoc.trace.commons.model.trace.TracePackage * @generated */ public class TraceSwitch extends Switch { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/.project b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/.project index 1df09ed5d..70474dc62 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/.project +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.commons + org.eclipse.gemoc.trace.commons diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/META-INF/MANIFEST.MF b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/META-INF/MANIFEST.MF index ef7d02b61..a68628ff2 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Util -Bundle-SymbolicName: fr.inria.diverse.trace.commons +Bundle-SymbolicName: org.eclipse.gemoc.trace.commons Bundle-Version: 2.3.0.qualifier -Export-Package: fr.inria.diverse.trace.commons, - fr.inria.diverse.trace.commons.tracemetamodel, +Export-Package: org.eclipse.gemoc.trace.commons, + org.eclipse.gemoc.trace.commons.tracemetamodel, org.jdom2, org.jdom2.filter Require-Bundle: com.google.guava, diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/pom.xml b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/pom.xml index ef23a82e3..7b8e13e95 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/pom.xml +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.modeldebugging.trace.commons - fr.inria.diverse.trace.commons + org.eclipse.gemoc.trace.commons 2.3.0-SNAPSHOT eclipse-plugin diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/CodeGenUtil.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/CodeGenUtil.java index 494481f34..cfab1ccd3 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/CodeGenUtil.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/CodeGenUtil.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.commons; +package org.eclipse.gemoc.trace.commons; import java.util.Map; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFCompareUtil.xtend b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFCompareUtil.xtend index 6c9f21095..3b8b69e18 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFCompareUtil.xtend +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFCompareUtil.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.commons +package org.eclipse.gemoc.trace.commons import org.eclipse.emf.ecore.EObject import org.eclipse.emf.compare.scope.DefaultComparisonScope diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFUtil.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFUtil.java index 72742dd8a..76ca515b4 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFUtil.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EMFUtil.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.commons; +package org.eclipse.gemoc.trace.commons; import java.io.File; import java.io.IOException; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EclipseUtil.xtend b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EclipseUtil.xtend index cf80e33db..842f4672f 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EclipseUtil.xtend +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EclipseUtil.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package fr.inria.diverse.trace.commons + package org.eclipse.gemoc.trace.commons import java.io.File import java.io.FileInputStream diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EcoreCraftingUtil.xtend b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EcoreCraftingUtil.xtend index 78621d283..2730dd4d3 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EcoreCraftingUtil.xtend +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/EcoreCraftingUtil.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.commons +package org.eclipse.gemoc.trace.commons import org.eclipse.emf.ecore.EReference import org.eclipse.emf.ecore.EcoreFactory diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ExecutionMetamodelTraceability.xtend b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ExecutionMetamodelTraceability.xtend index 58dcad6a5..4925e93fe 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ExecutionMetamodelTraceability.xtend +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ExecutionMetamodelTraceability.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.commons +package org.eclipse.gemoc.trace.commons import org.eclipse.emf.ecore.EModelElement import org.eclipse.emf.ecore.EcoreFactory diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ManifestUtil.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ManifestUtil.java index d2becd2e6..ee432d1b2 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ManifestUtil.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/ManifestUtil.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.commons; +package org.eclipse.gemoc.trace.commons; import static com.google.common.collect.Sets.newHashSet; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/PluginXMLHelper.java b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/PluginXMLHelper.java index 810e52d22..8e472fd7c 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/PluginXMLHelper.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/PluginXMLHelper.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.commons; +package org.eclipse.gemoc.trace.commons; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/tracemetamodel/StepStrings.xtend b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/tracemetamodel/StepStrings.xtend index d0be3582c..629fc6c3e 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/tracemetamodel/StepStrings.xtend +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.commons/src/org/eclipse/gemoc/trace/commons/tracemetamodel/StepStrings.xtend @@ -8,10 +8,10 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.commons.tracemetamodel +package org.eclipse.gemoc.trace.commons.tracemetamodel import org.eclipse.emf.ecore.EClass -import fr.inria.diverse.trace.commons.EcoreCraftingUtil +import org.eclipse.gemoc.trace.commons.EcoreCraftingUtil import org.eclipse.emf.ecore.EOperation class StepStrings { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.project b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.project index 60e7deeb2..8fa9f0731 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.project +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.gemoc.api + org.eclipse.gemoc.trace.gemoc.api diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/META-INF/MANIFEST.MF b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/META-INF/MANIFEST.MF index cbf3667b5..f1c653b5b 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/META-INF/MANIFEST.MF +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/META-INF/MANIFEST.MF @@ -1,18 +1,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Api -Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.api +Bundle-SymbolicName: org.eclipse.gemoc.trace.gemoc.api Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.ecore;bundle-version="2.10.2", org.eclipse.gemoc.timeline;bundle-version="1.0.0", org.eclipse.gemoc.xdsmlframework.api;bundle-version="0.1.0", - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", + org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0", com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: fr.inria.diverse.trace.gemoc.api; uses:="org.eclipse.emf.ecore, org.eclipse.gemoc.executionframework.engine.mse, org.eclipse.gemoc.xdsmlframework.api.engine_addon, org.eclipse.gemoc.timeline.view" +Export-Package: org.eclipse.gemoc.trace.gemoc.api; uses:="org.eclipse.emf.ecore, org.eclipse.gemoc.executionframework.engine.mse, org.eclipse.gemoc.xdsmlframework.api.engine_addon, org.eclipse.gemoc.timeline.view" diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/pom.xml b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/pom.xml index a8a9ec580..69ac6961d 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/pom.xml +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.modeldebugging.trace.commons - fr.inria.diverse.trace.gemoc.api + org.eclipse.gemoc.trace.gemoc.api 2.3.0-SNAPSHOT eclipse-plugin diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IMultiDimensionalTraceAddon.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IMultiDimensionalTraceAddon.java index 64f675c04..f4d3da504 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IMultiDimensionalTraceAddon.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IMultiDimensionalTraceAddon.java @@ -8,17 +8,17 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; +package org.eclipse.gemoc.trace.gemoc.api; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.IEngineAddon; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; public interface IMultiDimensionalTraceAddon, StateSubType extends State, TracedObjectSubType extends TracedObject, DimensionSubType extends Dimension, ValueSubType extends Value> extends IEngineAddon { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStateManager.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStateManager.java index 4407d00e3..0b796478c 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStateManager.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStateManager.java @@ -8,9 +8,9 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; +package org.eclipse.gemoc.trace.gemoc.api; -import fr.inria.diverse.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.State; /** * Classes implementing this interface are responsible for the restoration of the model in any state. diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStepFactory.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStepFactory.java index af791c192..3aa042047 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStepFactory.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/IStepFactory.java @@ -8,12 +8,12 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; +package org.eclipse.gemoc.trace.gemoc.api; import java.util.List; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.Step; public interface IStepFactory { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceConstructor.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceConstructor.java index 1d2eb304b..49923c760 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceConstructor.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceConstructor.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; +package org.eclipse.gemoc.trace.gemoc.api; import java.util.List; @@ -16,8 +16,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.trace.Step; public interface ITraceConstructor { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExplorer.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExplorer.java index d380a1364..9731068d5 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExplorer.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExplorer.java @@ -8,16 +8,16 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; +package org.eclipse.gemoc.trace.gemoc.api; import java.util.List; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; public interface ITraceExplorer, StateSubType extends State, TracedObjectSubType extends TracedObject, DimensionSubType extends Dimension, ValueSubType extends Value> extends ITraceViewNotifier, ITraceListener { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExtractor.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExtractor.java index 15321dbcb..e144693a0 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExtractor.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceExtractor.java @@ -8,17 +8,17 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; +package org.eclipse.gemoc.trace.gemoc.api; import java.util.List; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; public interface ITraceExtractor, StateSubType extends State, TracedObjectSubType extends TracedObject, DimensionSubType extends Dimension, ValueSubType extends Value> extends ITraceViewNotifier, ITraceListener { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceListener.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceListener.java index 93962cddd..a5881fbf1 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceListener.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceListener.java @@ -8,14 +8,14 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; +package org.eclipse.gemoc.trace.gemoc.api; import java.util.List; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Value; public interface ITraceListener { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceNotifier.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceNotifier.java index 357143b70..d174d7a29 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceNotifier.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceNotifier.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; +package org.eclipse.gemoc.trace.gemoc.api; public interface ITraceNotifier { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewListener.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewListener.java index ebdec4fe3..50178cead 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewListener.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewListener.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; +package org.eclipse.gemoc.trace.gemoc.api; public interface ITraceViewListener { diff --git a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewNotifier.java b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewNotifier.java index 1b0ed11d1..1803b1c33 100644 --- a/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewNotifier.java +++ b/trace/commons/plugins/org.eclipse.gemoc.trace.gemoc.api/src/org/eclipse/gemoc/trace/gemoc/api/ITraceViewNotifier.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.api; +package org.eclipse.gemoc.trace.gemoc.api; public interface ITraceViewNotifier { diff --git a/trace/commons/pom.xml b/trace/commons/pom.xml index edd9f21dc..8d52a6dba 100644 --- a/trace/commons/pom.xml +++ b/trace/commons/pom.xml @@ -16,10 +16,10 @@ - plugins/fr.inria.diverse.trace.commons - plugins/fr.inria.diverse.trace.gemoc.api - plugins/fr.inria.diverse.trace.commons.model - releng/fr.inria.diverse.trace.commons.feature + plugins/org.eclipse.gemoc.trace.commons + plugins/org.eclipse.gemoc.trace.gemoc.api + plugins/org.eclipse.gemoc.trace.commons.model + releng/org.eclipse.gemoc.trace.commons.feature diff --git a/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/.project b/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/.project index 102098f94..6efe1f5f3 100644 --- a/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/.project +++ b/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.feature + org.eclipse.gemoc.trace.feature diff --git a/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/feature.xml b/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/feature.xml index 44bc944b3..5e5098406 100644 --- a/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/feature.xml +++ b/trace/commons/releng/org.eclipse.gemoc.trace.commons.feature/feature.xml @@ -19,21 +19,21 @@ - fr.inria.diverse.trace.annotations.edit + org.eclipse.gemoc.trace.annotations.edit diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/META-INF/MANIFEST.MF index b4a09013a..abf52201a 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.inria.diverse.trace.annotations.edit;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.trace.annotations.edit;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Activator: tracingannotations.provider.TracingannotationsEditPlugin$Implementation @@ -10,7 +10,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: tracingannotations.provider Require-Bundle: org.eclipse.core.runtime, - fr.inria.diverse.trace.annotations;visibility:=reexport, + org.eclipse.gemoc.trace.annotations;visibility:=reexport, org.eclipse.emf.edit;visibility:=reexport, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.edit;visibility:=reexport diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/pom.xml index 9c6aa5dae..65d96e1f5 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/pom.xml +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.edit/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.multidimensional_trace_management - fr.inria.diverse.trace.annotations.edit + org.eclipse.gemoc.trace.annotations.edit 2.3.0-SNAPSHOT eclipse-plugin diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/.project index f7abaa72d..18f3ab7be 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/.project +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.annotations.editor + org.eclipse.gemoc.trace.annotations.editor diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/META-INF/MANIFEST.MF index c4637fb48..4bff927e3 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.inria.diverse.trace.annotations.editor;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.trace.annotations.editor;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Activator: tracingannotations.presentation.TracingannotationsEditorPlugin$Implementation @@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: tracingannotations.presentation Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources;visibility:=reexport, - fr.inria.diverse.trace.annotations.edit;visibility:=reexport, + org.eclipse.gemoc.trace.annotations.edit;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, org.eclipse.emf.edit.ui;visibility:=reexport, org.eclipse.ui.ide;visibility:=reexport, diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/pom.xml index fef76e9c0..d0b6cbe8f 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/pom.xml +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.multidimensional_trace_management - fr.inria.diverse.trace.annotations.editor + org.eclipse.gemoc.trace.annotations.editor 2.3.0-SNAPSHOT eclipse-plugin diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java index a8b5b1127..ce5efe8de 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations.editor/src/tracingannotations/presentation/TracingannotationsEditor.java @@ -630,7 +630,7 @@ protected void updateProblemIndication() { BasicDiagnostic diagnostic = new BasicDiagnostic (Diagnostic.OK, - "fr.inria.diverse.trace.annotations.editor", + "org.eclipse.gemoc.trace.annotations.editor", 0, null, new Object [] { editingDomain.getResourceSet() }); @@ -994,7 +994,7 @@ public Diagnostic analyzeResourceProblems(Resource resource, Exception exception BasicDiagnostic basicDiagnostic = new BasicDiagnostic (Diagnostic.ERROR, - "fr.inria.diverse.trace.annotations.editor", + "org.eclipse.gemoc.trace.annotations.editor", 0, getString("_UI_CreateModelError_message", resource.getURI()), new Object [] { exception == null ? (Object)resource : exception }); @@ -1005,7 +1005,7 @@ else if (exception != null) { return new BasicDiagnostic (Diagnostic.ERROR, - "fr.inria.diverse.trace.annotations.editor", + "org.eclipse.gemoc.trace.annotations.editor", 0, getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception }); diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/.project index f6ae7a41d..365900d6a 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/.project +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.annotations + org.eclipse.gemoc.trace.annotations diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/META-INF/MANIFEST.MF index 03a635e7e..569668aa8 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.inria.diverse.trace.annotations;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.trace.annotations;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/pom.xml index e507cf57e..9c83df617 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/pom.xml +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.annotations/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.multidimensional_trace_management - fr.inria.diverse.trace.annotations + org.eclipse.gemoc.trace.annotations 2.3.0-SNAPSHOT eclipse-plugin diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.project index 75712fb3b..28c494197 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.project +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.gemoc.generator + org.eclipse.gemoc.trace.gemoc.generator diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/META-INF/MANIFEST.MF index 635c69a6a..0652f66ea 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/META-INF/MANIFEST.MF @@ -1,21 +1,21 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: fr.inria.diverse.tracemm.k3al.generator -Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.generator;singleton:=true +Bundle-Name: org.eclipse.gemoc.tracemm.k3al.generator +Bundle-SymbolicName: org.eclipse.gemoc.trace.gemoc.generator;singleton:=true Bundle-Version: 2.3.0.qualifier Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, org.eclipse.emf.ecore, - fr.inria.diverse.trace.commons;bundle-version="1.0.0", + org.eclipse.gemoc.trace.commons;bundle-version="1.0.0", org.eclipse.jdt.core;bundle-version="3.10.0", org.eclipse.ui, org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.core.resources;bundle-version="3.9.1", org.eclipse.gemoc.executionframework.ui;bundle-version="0.1.0", org.eclipse.gemoc.xdsmlframework.ide.ui;bundle-version="0.1.0", - fr.inria.diverse.trace.metamodel.generator;bundle-version="1.0.0", + org.eclipse.gemoc.trace.metamodel.generator;bundle-version="1.0.0", fr.inria.diverse.melange.ui, fr.inria.diverse.melange.metamodel, org.eclipse.xtext.ui, @@ -25,6 +25,6 @@ Require-Bundle: com.google.guava, org.eclipse.gemoc.opsemanticsview.gen;bundle-version="1.0.0" Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: fr.inria.diverse.trace.gemoc.generator, - fr.inria.diverse.trace.gemoc.generator.codegen, - fr.inria.diverse.trace.gemoc.generator.util +Export-Package: org.eclipse.gemoc.trace.gemoc.generator, + org.eclipse.gemoc.trace.gemoc.generator.codegen, + org.eclipse.gemoc.trace.gemoc.generator.util diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/pom.xml index 4220b7057..8ba6e65f5 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/pom.xml +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.multidimensional_trace_management - fr.inria.diverse.trace.gemoc.generator + org.eclipse.gemoc.trace.gemoc.generator 2.3.0-SNAPSHOT eclipse-plugin diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index 35016c1b6..f0eb3532d 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -8,18 +8,18 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator - -import fr.inria.diverse.trace.commons.CodeGenUtil -import fr.inria.diverse.trace.commons.EclipseUtil -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.commons.ManifestUtil -import fr.inria.diverse.trace.commons.PluginXMLHelper -import fr.inria.diverse.trace.gemoc.generator.codegen.StateManagerGeneratorJava -import fr.inria.diverse.trace.gemoc.generator.codegen.TraceConstructorGeneratorJava -import fr.inria.diverse.trace.gemoc.generator.util.StandaloneEMFProjectGenerator -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerator +package org.eclipse.gemoc.trace.gemoc.generator + +import org.eclipse.gemoc.trace.commons.CodeGenUtil +import org.eclipse.gemoc.trace.commons.EclipseUtil +import org.eclipse.gemoc.trace.commons.EcoreCraftingUtil +import org.eclipse.gemoc.trace.commons.ManifestUtil +import org.eclipse.gemoc.trace.commons.PluginXMLHelper +import org.eclipse.gemoc.trace.gemoc.generator.codegen.StateManagerGeneratorJava +import org.eclipse.gemoc.trace.gemoc.generator.codegen.TraceConstructorGeneratorJava +import org.eclipse.gemoc.trace.gemoc.generator.util.StandaloneEMFProjectGenerator +import org.eclipse.gemoc.trace.metamodel.generator.TraceMMGenerationTraceability +import org.eclipse.gemoc.trace.metamodel.generator.TraceMMGenerator import java.util.HashSet import java.util.List import java.util.Set @@ -201,15 +201,15 @@ class GenericEngineTraceAddonGenerator { ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.executionframework.engine") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.xtext") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.commons.eclipse") - ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.gemoc") - ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.gemoc.api") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.trace.gemoc") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.trace.gemoc.api") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.xdsmlframework.api") - ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.commons.model") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.trace.commons.model") ManifestUtil.addToPluginManifest(project, m, "org.gemoc.sequential_addons.multidimensional.timeline") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.timeline") - ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.commons") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.trace.commons") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.xdsmlframework.api") - ManifestUtil.addToPluginManifest(project, m, "fr.inria.diverse.trace.commons.model") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.trace.commons.model") ManifestUtil.setRequiredExecutionEnvironmentToPluginManifest(project, m, "JavaSE-1.8") } @@ -275,12 +275,12 @@ import java.util.Map; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.gemoc.api.IStateManager; -import fr.inria.diverse.trace.gemoc.api.IStepFactory; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; -import fr.inria.diverse.trace.gemoc.traceaddon.AbstractTraceAddon; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.gemoc.api.IStateManager; +import org.eclipse.gemoc.trace.gemoc.api.IStepFactory; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.gemoc.api.ITraceConstructor; +import org.eclipse.gemoc.trace.gemoc.traceaddon.AbstractTraceAddon; public class «className» extends AbstractTraceAddon { @@ -327,16 +327,16 @@ public class «className» extends AbstractTraceAddon { package «packageQN»; import java.util.List; - import fr.inria.diverse.trace.gemoc.api.IStepFactory; + import org.eclipse.gemoc.trace.gemoc.api.IStepFactory; public class «stepFactoryClassName» implements IStepFactory { @Override - public fr.inria.diverse.trace.commons.model.trace.Step createStep(fr.inria.diverse.trace.commons.model.trace.MSE mse, List parameters, List result) { + public org.eclipse.gemoc.trace.commons.model.trace.Step createStep(org.eclipse.gemoc.trace.commons.model.trace.MSE mse, List parameters, List result) { - fr.inria.diverse.trace.commons.model.trace.Step step = null; + org.eclipse.gemoc.trace.commons.model.trace.Step step = null; org.eclipse.emf.ecore.EClass ec = mse.getCaller().eClass(); -String stepRule = fr.inria.diverse.trace.commons.EcoreCraftingUtil.getFQN(ec, ".") + "." +String stepRule = org.eclipse.gemoc.trace.commons.EcoreCraftingUtil.getFQN(ec, ".") + "." + mse.getAction().getName(); «FOR Rule rule : opsemanticsview.rules.sortBy[baseFQN] SEPARATOR "else" AFTER "else"» @@ -364,10 +364,10 @@ String stepRule = fr.inria.diverse.trace.commons.EcoreCraftingUtil.getFQN(ec, ". «ENDFOR» { - step = fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory.eINSTANCE.createGenericSequentialStep(); + step = org.eclipse.gemoc.trace.commons.model.generictrace.GenerictraceFactory.eINSTANCE.createGenericSequentialStep(); } - fr.inria.diverse.trace.commons.model.trace.MSEOccurrence mseocc = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEOccurrence(); + org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence mseocc = org.eclipse.gemoc.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEOccurrence(); mseocc.setMse(mse); mseocc.getParameters().addAll(parameters); mseocc.getResult().addAll(result); diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend index 8c8f6f635..f2cbaf6b0 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/TraceAddonGeneratorIntegration.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator +package org.eclipse.gemoc.trace.gemoc.generator import fr.inria.diverse.melange.metamodel.melange.Language import fr.inria.diverse.melange.metamodel.melange.ModelTypingSpace @@ -80,7 +80,7 @@ class TraceAddonGeneratorIntegration { new Status( Status. ERROR, - "fr.inria.diverse.trace.gemoc.generator", + "org.eclipse.gemoc.trace.gemoc.generator", "Impossible to create a trace addon: couldn't find an opsemanticsview generator that can manage the chosen melange language." )); } @@ -116,7 +116,7 @@ class TraceAddonGeneratorIntegration { } // Else, error else { throw new CoreException( - new Status(Status.ERROR, "fr.inria.diverse.trace.gemoc.generator", + new Status(Status.ERROR, "org.eclipse.gemoc.trace.gemoc.generator", "Impossible to create a trace addon: a project already exists with this name.")); } } diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend index 280bffa4c..16cc9c5a9 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend @@ -8,11 +8,11 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.codegen +package org.eclipse.gemoc.trace.gemoc.generator.codegen -import fr.inria.diverse.trace.commons.CodeGenUtil -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability +import org.eclipse.gemoc.trace.commons.CodeGenUtil +import org.eclipse.gemoc.trace.commons.EcoreCraftingUtil +import org.eclipse.gemoc.trace.metamodel.generator.TraceMMGenerationTraceability import java.util.Set import org.eclipse.emf.codegen.ecore.genmodel.GenPackage import org.eclipse.emf.ecore.EClass @@ -108,9 +108,9 @@ class StateManagerGeneratorJava { import org.eclipse.emf.transaction.util.TransactionUtil; import org.eclipse.gemoc.executionframework.engine.core.CommandExecution; - import fr.inria.diverse.trace.commons.model.trace.State; - import fr.inria.diverse.trace.commons.model.trace.TracedObject; - import fr.inria.diverse.trace.gemoc.api.IStateManager; + import org.eclipse.gemoc.trace.commons.model.trace.State; + import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; + import org.eclipse.gemoc.trace.gemoc.api.IStateManager; ''' } diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend index c64091bef..f3f2348c1 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/TraceConstructorGeneratorJava.xtend @@ -8,12 +8,12 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.codegen +package org.eclipse.gemoc.trace.gemoc.generator.codegen -import fr.inria.diverse.trace.commons.CodeGenUtil -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.commons.model.trace.TracePackage -import fr.inria.diverse.trace.metamodel.generator.TraceMMGenerationTraceability +import org.eclipse.gemoc.trace.commons.CodeGenUtil +import org.eclipse.gemoc.trace.commons.EcoreCraftingUtil +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage +import org.eclipse.gemoc.trace.metamodel.generator.TraceMMGenerationTraceability import java.util.ArrayList import java.util.Collection import java.util.HashSet @@ -208,11 +208,11 @@ class TraceConstructorGeneratorJava { import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; - import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; - import fr.inria.diverse.trace.commons.model.trace.MSEModel; - import fr.inria.diverse.trace.commons.model.trace.SequentialStep; - import fr.inria.diverse.trace.commons.model.trace.TracedObject; - import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; + import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; + import org.eclipse.gemoc.trace.commons.model.trace.MSEModel; + import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; + import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; + import org.eclipse.gemoc.trace.gemoc.api.ITraceConstructor; ''' } @@ -662,12 +662,12 @@ private def String generateAddStateUsingListenerMethods() { «val stepRules = traceability.mmext.rules» @SuppressWarnings("unchecked") @Override - public void addStep(fr.inria.diverse.trace.commons.model.trace.Step step) { + public void addStep(org.eclipse.gemoc.trace.commons.model.trace.Step step) { «specificStepFQN» step_cast = null; if (step != null && step instanceof «specificStepFQN») { step_cast = («specificStepFQN») step; if (mseModel == null) { - mseModel = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEModel(); + mseModel = org.eclipse.gemoc.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEModel(); traceResource.getContents().add(mseModel); } mseModel.getOwnedMSEs().add(step_cast.getMseoccurrence().getMse()); @@ -719,7 +719,7 @@ private def String generateAddStateUsingListenerMethods() { } @Override - public void endStep(fr.inria.diverse.trace.commons.model.trace.Step step) { + public void endStep(org.eclipse.gemoc.trace.commons.model.trace.Step step) { «specificStepFQN» popped = context.pop(); if (popped != null) popped.setEndingState(lastState); @@ -737,7 +737,7 @@ private def String generateAddStateUsingListenerMethods() { traceRoot.setLaunchconfiguration(launchConfiguration); // Create root sequential step - fr.inria.diverse.trace.commons.model.trace.SequentialStep<«specificStepFQN», «stateFQN»> rootStep = «EcoreCraftingUtil.stringCreate(traceability.traceMMExplorer.getSpecificRootStepClass)»; + org.eclipse.gemoc.trace.commons.model.trace.SequentialStep<«specificStepFQN», «stateFQN»> rootStep = «EcoreCraftingUtil.stringCreate(traceability.traceMMExplorer.getSpecificRootStepClass)»; traceRoot.setRootStep(rootStep); // Put in the resource diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/ExtensionFilter.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/ExtensionFilter.xtend index 0c09942a4..c60d5f531 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/ExtensionFilter.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/ExtensionFilter.xtend @@ -8,9 +8,9 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.util +package org.eclipse.gemoc.trace.gemoc.generator.util -import fr.inria.diverse.trace.commons.EcoreCraftingUtil +import org.eclipse.gemoc.trace.commons.EcoreCraftingUtil import java.util.HashSet import java.util.Set import opsemanticsview.OperationalSemanticsView diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/PluginProjectHelper.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/PluginProjectHelper.xtend index 3c2ca8e83..792aabab3 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/PluginProjectHelper.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/PluginProjectHelper.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.util; +package org.eclipse.gemoc.trace.gemoc.generator.util; import java.io.ByteArrayInputStream import java.io.InputStream diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend index ae607b990..501e72537 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.generator.util +package org.eclipse.gemoc.trace.gemoc.generator.util import java.io.IOException import java.io.PrintWriter diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.project index ec689a054..7b406b5e2 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.project +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.gemoc.ui + org.eclipse.gemoc.trace.gemoc.ui diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/META-INF/MANIFEST.MF index a1a7f4b0d..3ee722a7a 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: fr.inria.diverse.trace.gemoc.wizards -Bundle-SymbolicName: fr.inria.diverse.trace.gemoc.ui;singleton:=true +Bundle-Name: org.eclipse.gemoc.trace.gemoc.wizards +Bundle-SymbolicName: org.eclipse.gemoc.trace.gemoc.ui;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0", @@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.jdt.core, org.eclipse.core.variables;bundle-version="3.2.800", org.eclipse.jdt.launching, - fr.inria.diverse.trace.gemoc.generator;bundle-version="1.0.0", + org.eclipse.gemoc.trace.gemoc.generator;bundle-version="1.0.0", org.eclipse.xtend.lib, org.eclipse.emf.ecore.xmi;bundle-version="2.10.2", - fr.inria.diverse.trace.gemoc.generator, + org.eclipse.gemoc.trace.gemoc.generator, org.eclipse.ui.navigator, fr.inria.diverse.melange.metamodel, org.eclipse.core.expressions, diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/plugin.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/plugin.xml index dd21c9a64..d5867220d 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/plugin.xml +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/plugin.xml @@ -8,12 +8,12 @@ diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/pom.xml index 6a0c88078..9e88c49e7 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/pom.xml +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.multidimensional_trace_management - fr.inria.diverse.trace.gemoc.ui + org.eclipse.gemoc.trace.gemoc.ui 2.3.0-SNAPSHOT eclipse-plugin diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/Activator.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/Activator.java index 865f62baf..31f78caa3 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/Activator.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.ui; +package org.eclipse.gemoc.trace.gemoc.ui; import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend index b33100bd2..eb08c4cd8 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/commands/XDSMLProject2TraceAddonHandler.xtend @@ -8,10 +8,10 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.ui.commands +package org.eclipse.gemoc.trace.gemoc.ui.commands import fr.inria.diverse.melange.metamodel.melange.Language -import fr.inria.diverse.trace.gemoc.generator.TraceAddonGeneratorIntegration +import org.eclipse.gemoc.trace.gemoc.generator.TraceAddonGeneratorIntegration import org.eclipse.core.commands.ExecutionEvent import org.eclipse.core.commands.ExecutionException import org.eclipse.core.commands.IHandler @@ -31,7 +31,7 @@ import org.eclipse.gemoc.xdsmlframework.ide.ui.xdsml.wizards.MelangeXDSMLProject * and will ask for selection of the language (if necessary) and launch the generation */ class XDSMLProject2TraceAddonHandler extends AbstractMelangeSelectHandler implements IHandler { - val static String pluginId = "fr.inria.diverse.trace.gemoc.ui" + val static String pluginId = "org.eclipse.gemoc.trace.gemoc.ui" override Object executeForSelectedLanguage(ExecutionEvent event, IProject updatedGemocLanguageProject, Language language) throws ExecutionException { diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/launch/EcoreFileFilter.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/launch/EcoreFileFilter.java index 652f626f1..682ce8dc3 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/launch/EcoreFileFilter.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.ui/src/org/eclipse/gemoc/trace/gemoc/ui/launch/EcoreFileFilter.java @@ -8,7 +8,7 @@ * Contributors: * Erwan Bousse - initial API and implementation ******************************************************************************/ -package fr.inria.diverse.trace.gemoc.ui.launch; +package org.eclipse.gemoc.trace.gemoc.ui.launch; import java.io.File; import java.io.FileFilter; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.project index 57803987f..2a5a4fc99 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.project +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.gemoc + org.eclipse.gemoc.trace.gemoc diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/META-INF/MANIFEST.MF index 76697848a..1724b025e 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: fr.inria.diverse.tracemm.gemoctrace -Bundle-SymbolicName: fr.inria.diverse.trace.gemoc;singleton:=true +Bundle-Name: org.eclipse.gemoc.tracemm.gemoctrace +Bundle-SymbolicName: org.eclipse.gemoc.trace.gemoc;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.gemoc.timeline;bundle-version="1.0.0", @@ -9,12 +9,12 @@ Require-Bundle: org.eclipse.gemoc.timeline;bundle-version="1.0.0", org.eclipse.xtend.lib, org.eclipse.gemoc.executionframework.engine;bundle-version="0.1.0", org.eclipse.emf.transaction;bundle-version="1.8.0", - fr.inria.diverse.trace.gemoc.api;bundle-version="1.0.0", + org.eclipse.gemoc.trace.gemoc.api;bundle-version="1.0.0", org.eclipse.xtext, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0", + org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0", org.eclipse.gemoc.commons.eclipse;bundle-version="0.1.0", org.eclipse.emf.compare, org.eclipse.gemoc.xdsmlframework.commons -Export-Package: fr.inria.diverse.trace.gemoc.traceaddon +Export-Package: org.eclipse.gemoc.trace.gemoc.traceaddon Bundle-ActivationPolicy: lazy diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml index ce8c3f2e7..b10a128cd 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml @@ -4,6 +4,6 @@ --> - + diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/pom.xml index bd4663374..359872d03 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/pom.xml +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.multidimensional_trace_management - fr.inria.diverse.trace.gemoc + org.eclipse.gemoc.trace.gemoc 2.3.0-SNAPSHOT eclipse-plugin diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/AbstractTraceAddon.xtend similarity index 91% rename from trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/AbstractTraceAddon.xtend index 51bc356d8..ea3537f1f 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/AbstractTraceAddon.xtend @@ -8,22 +8,22 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.traceaddon +package org.eclipse.gemoc.trace.gemoc.traceaddon import com.google.common.collect.BiMap import com.google.common.collect.HashBiMap -import fr.inria.diverse.trace.commons.model.trace.Dimension -import fr.inria.diverse.trace.commons.model.trace.State -import fr.inria.diverse.trace.commons.model.trace.Step -import fr.inria.diverse.trace.commons.model.trace.Trace -import fr.inria.diverse.trace.commons.model.trace.TracedObject -import fr.inria.diverse.trace.commons.model.trace.Value -import fr.inria.diverse.trace.gemoc.api.IMultiDimensionalTraceAddon -import fr.inria.diverse.trace.gemoc.api.IStateManager -import fr.inria.diverse.trace.gemoc.api.ITraceConstructor -import fr.inria.diverse.trace.gemoc.api.ITraceExplorer -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor -import fr.inria.diverse.trace.gemoc.api.ITraceNotifier +import org.eclipse.gemoc.trace.commons.model.trace.Dimension +import org.eclipse.gemoc.trace.commons.model.trace.State +import org.eclipse.gemoc.trace.commons.model.trace.Step +import org.eclipse.gemoc.trace.commons.model.trace.Trace +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject +import org.eclipse.gemoc.trace.commons.model.trace.Value +import org.eclipse.gemoc.trace.gemoc.api.IMultiDimensionalTraceAddon +import org.eclipse.gemoc.trace.gemoc.api.IStateManager +import org.eclipse.gemoc.trace.gemoc.api.ITraceConstructor +import org.eclipse.gemoc.trace.gemoc.api.ITraceExplorer +import org.eclipse.gemoc.trace.gemoc.api.ITraceExtractor +import org.eclipse.gemoc.trace.gemoc.api.ITraceNotifier import java.util.ArrayList import java.util.HashSet import java.util.List diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericStateManager.java similarity index 76% rename from trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericStateManager.java index 49e1d3877..821675d09 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericStateManager.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericStateManager.java @@ -1,4 +1,4 @@ -package fr.inria.diverse.trace.gemoc.traceaddon; +package org.eclipse.gemoc.trace.gemoc.traceaddon; import java.util.List; import java.util.Map; @@ -12,18 +12,18 @@ import org.eclipse.emf.transaction.util.TransactionUtil; import org.eclipse.gemoc.executionframework.engine.core.CommandExecution; -import fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; -import fr.inria.diverse.trace.commons.model.generictrace.GenericState; -import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; -import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; -import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; -import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.gemoc.api.IStateManager; +import org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericState; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject; +import org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.gemoc.api.IStateManager; public class GenericStateManager implements IStateManager> { diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceConstructor.java similarity index 90% rename from trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceConstructor.java index c0c20d7c0..5a634050e 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceConstructor.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceConstructor.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.traceaddon; +package org.eclipse.gemoc.trace.gemoc.traceaddon; import java.util.Deque; import java.util.HashSet; @@ -35,27 +35,27 @@ import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.RemovedObjectModelChange; import org.eclipse.gemoc.xdsmlframework.commons.DynamicAnnotationHelper; -import fr.inria.diverse.trace.commons.model.generictrace.BooleanAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; -import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericSmallStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericState; -import fr.inria.diverse.trace.commons.model.generictrace.GenericStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; -import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; -import fr.inria.diverse.trace.commons.model.generictrace.IntegerAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.IntegerObjectAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.ManyReferenceValue; -import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; -import fr.inria.diverse.trace.commons.model.generictrace.StringAttributeValue; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.MSEModel; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; +import org.eclipse.gemoc.trace.commons.model.generictrace.BooleanAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericSequentialStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericSmallStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericState; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictraceFactory; +import org.eclipse.gemoc.trace.commons.model.generictrace.IntegerAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.IntegerObjectAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.ManyReferenceValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.StringAttributeValue; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.MSEModel; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.gemoc.api.ITraceConstructor; public class GenericTraceConstructor implements ITraceConstructor { @@ -351,7 +351,7 @@ public void addStep(Step step) { if (step != null && step instanceof GenericSequentialStep) { step_cast = (GenericSequentialStep) step; if (mseModel == null) { - mseModel = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEModel(); + mseModel = org.eclipse.gemoc.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEModel(); traceResource.getContents().add(mseModel); } mseModel.getOwnedMSEs().add(step_cast.getMseoccurrence().getMse()); diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceEngineAddon.java similarity index 78% rename from trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceEngineAddon.java index 06428d4f1..dabf9ca6c 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceEngineAddon.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceEngineAddon.java @@ -8,19 +8,19 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.traceaddon; +package org.eclipse.gemoc.trace.gemoc.traceaddon; import java.util.Map; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.gemoc.api.IStateManager; -import fr.inria.diverse.trace.gemoc.api.IStepFactory; -import fr.inria.diverse.trace.gemoc.api.ITraceConstructor; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.gemoc.api.IStateManager; +import org.eclipse.gemoc.trace.gemoc.api.IStepFactory; +import org.eclipse.gemoc.trace.gemoc.api.ITraceConstructor; public class GenericTraceEngineAddon extends AbstractTraceAddon { diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceExplorer.java similarity index 95% rename from trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceExplorer.java index d3affd8ed..06ff7229f 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExplorer.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceExplorer.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.traceaddon; +package org.eclipse.gemoc.trace.gemoc.traceaddon; import java.util.ArrayList; import java.util.Collections; @@ -22,17 +22,17 @@ import org.eclipse.emf.ecore.EObject; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; -import fr.inria.diverse.trace.gemoc.api.IStateManager; -import fr.inria.diverse.trace.gemoc.api.ITraceExplorer; -import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.gemoc.api.IStateManager; +import org.eclipse.gemoc.trace.gemoc.api.ITraceExplorer; +import org.eclipse.gemoc.trace.gemoc.api.ITraceViewListener; public class GenericTraceExplorer implements ITraceExplorer, State, TracedObject, Dimension, Value> { diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceExtractor.java similarity index 95% rename from trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceExtractor.java index 2c276a74f..caaa2c6d0 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceExtractor.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceExtractor.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.traceaddon; +package org.eclipse.gemoc.trace.gemoc.traceaddon; import java.util.ArrayList; import java.util.Collection; @@ -46,21 +46,21 @@ import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; -import fr.inria.diverse.trace.commons.model.generictrace.GenericAttributeValue; -import fr.inria.diverse.trace.commons.model.generictrace.GenericDimension; -import fr.inria.diverse.trace.commons.model.generictrace.GenericTracedObject; -import fr.inria.diverse.trace.commons.model.generictrace.GenericValue; -import fr.inria.diverse.trace.commons.model.generictrace.SingleReferenceValue; -import fr.inria.diverse.trace.commons.model.launchconfiguration.LaunchConfiguration; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; -import fr.inria.diverse.trace.gemoc.api.ITraceExtractor; -import fr.inria.diverse.trace.gemoc.api.ITraceViewListener; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericAttributeValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericDimension; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericTracedObject; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericValue; +import org.eclipse.gemoc.trace.commons.model.generictrace.SingleReferenceValue; +import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.gemoc.api.ITraceExtractor; +import org.eclipse.gemoc.trace.gemoc.api.ITraceViewListener; @SuppressWarnings("restriction") public class GenericTraceExtractor diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceNotifier.java similarity index 86% rename from trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceNotifier.java index a9e82c5a7..0f73b256b 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceNotifier.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceNotifier.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.traceaddon; +package org.eclipse.gemoc.trace.gemoc.traceaddon; import java.util.ArrayList; import java.util.List; @@ -18,13 +18,13 @@ import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.ModelChange; import org.eclipse.gemoc.xdsmlframework.api.engine_addon.modelchangelistener.NewObjectModelChange; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; -import fr.inria.diverse.trace.gemoc.api.ITraceListener; -import fr.inria.diverse.trace.gemoc.api.ITraceNotifier; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.gemoc.api.ITraceListener; +import org.eclipse.gemoc.trace.gemoc.api.ITraceNotifier; public class GenericTraceNotifier implements ITraceNotifier { diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceStepFactory.java similarity index 64% rename from trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java rename to trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceStepFactory.java index 8f1c0298d..92ebdff25 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/GenericTraceStepFactory.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/src/org/eclipse/gemoc/trace/gemoc/traceaddon/GenericTraceStepFactory.java @@ -8,22 +8,22 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.gemoc.traceaddon; +package org.eclipse.gemoc.trace.gemoc.traceaddon; import java.util.List; -import fr.inria.diverse.trace.commons.model.trace.MSE; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.generictrace.GenericSequentialStep; -import fr.inria.diverse.trace.commons.model.generictrace.GenerictraceFactory; -import fr.inria.diverse.trace.gemoc.api.IStepFactory; +import org.eclipse.gemoc.trace.commons.model.trace.MSE; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenericSequentialStep; +import org.eclipse.gemoc.trace.commons.model.generictrace.GenerictraceFactory; +import org.eclipse.gemoc.trace.gemoc.api.IStepFactory; public class GenericTraceStepFactory implements IStepFactory { @Override public Step createStep(MSE mse, List parameters, List result) { final GenericSequentialStep step = GenerictraceFactory.eINSTANCE.createGenericSequentialStep(); - fr.inria.diverse.trace.commons.model.trace.MSEOccurrence mseocc = fr.inria.diverse.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEOccurrence(); + org.eclipse.gemoc.trace.commons.model.trace.MSEOccurrence mseocc = org.eclipse.gemoc.trace.commons.model.trace.TraceFactory.eINSTANCE.createMSEOccurrence(); mseocc.setMse(mse); mseocc.getParameters().addAll(parameters); mseocc.getResult().addAll(result); diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.project b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.project index 698f50837..c11cfa9ee 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.project +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/.project @@ -1,6 +1,6 @@ - fr.inria.diverse.trace.metamodel.generator + org.eclipse.gemoc.trace.metamodel.generator diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/META-INF/MANIFEST.MF index 9565c72d3..be56072c0 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/META-INF/MANIFEST.MF @@ -1,21 +1,21 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: fr.inria.diverse.trace.metamodel.generator;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.trace.metamodel.generator;singleton:=true Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.emf.ecore.xmi;bundle-version="2.10.1", - fr.inria.diverse.trace.commons;bundle-version="1.0.0", + org.eclipse.gemoc.trace.commons;bundle-version="1.0.0", org.eclipse.emf.codegen.ecore;bundle-version="2.10.2", org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, - fr.inria.diverse.trace.commons.model;bundle-version="0.1.0";visibility:=reexport, + org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0";visibility:=reexport, org.eclipse.gemoc.opsemanticsview.model;bundle-version="0.1.0" Bundle-ActivationPolicy: lazy -Export-Package: fr.inria.diverse.trace.metamodel.generator, +Export-Package: org.eclipse.gemoc.trace.metamodel.generator, base, base.States, base.States.impl, diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/pom.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/pom.xml index cff28bc47..757f74003 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/pom.xml +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/pom.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.gemoc.multidimensional_trace_management - fr.inria.diverse.trace.metamodel.generator + org.eclipse.gemoc.trace.metamodel.generator 2.3.0-SNAPSHOT eclipse-plugin diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/BasePackage.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/BasePackage.java index 75456ea51..8a513e4be 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/BasePackage.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/BasePackage.java @@ -2,7 +2,7 @@ */ package base; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/SpecificTrace.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/SpecificTrace.java index 5048b6f6e..76abf5c28 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/SpecificTrace.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/SpecificTrace.java @@ -9,8 +9,8 @@ import base.Steps.SpecificStep; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; /** * diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificDimension.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificDimension.java index 5585f155a..d72b60ae2 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificDimension.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificDimension.java @@ -2,7 +2,7 @@ */ package base.States; -import fr.inria.diverse.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; /** * diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificState.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificState.java index 017854147..901677a3e 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificState.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificState.java @@ -4,7 +4,7 @@ import base.Steps.SpecificStep; -import fr.inria.diverse.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.State; /** * diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificTracedObject.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificTracedObject.java index 4f3c347ba..a678590a4 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificTracedObject.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificTracedObject.java @@ -2,7 +2,7 @@ */ package base.States; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; /** * diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificValue.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificValue.java index b15cf3c7d..82d2417a6 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificValue.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/SpecificValue.java @@ -2,7 +2,7 @@ */ package base.States; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.Value; /** * diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/StatesPackage.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/StatesPackage.java index 28dc64f6d..d1449d75f 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/StatesPackage.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/StatesPackage.java @@ -2,7 +2,7 @@ */ package base.States; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java index fddef93f7..321df315c 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificDimensionImpl.java @@ -6,7 +6,7 @@ import base.States.SpecificValue; import base.States.StatesPackage; -import fr.inria.diverse.trace.commons.model.trace.impl.DimensionImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.DimensionImpl; import org.eclipse.emf.common.util.EList; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java index e61ba9e8e..a80079df5 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificStateImpl.java @@ -7,10 +7,10 @@ import base.States.StatesPackage; import base.Steps.SpecificStep; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.Value; -import fr.inria.diverse.trace.commons.model.trace.impl.StateImpl; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.impl.StateImpl; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java index be34c1b88..481806f22 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificTracedObjectImpl.java @@ -7,7 +7,7 @@ import base.States.SpecificValue; import base.States.StatesPackage; -import fr.inria.diverse.trace.commons.model.trace.impl.TracedObjectImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.TracedObjectImpl; import org.eclipse.emf.ecore.EClass; /** diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java index e72a2c488..0776665c6 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/SpecificValueImpl.java @@ -6,9 +6,9 @@ import base.States.SpecificValue; import base.States.StatesPackage; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; -import fr.inria.diverse.trace.commons.model.trace.impl.ValueImpl; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.impl.ValueImpl; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java index 3609e699c..c01235d0e 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/impl/StatesPackageImpl.java @@ -19,7 +19,7 @@ import base.impl.BasePackageImpl; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java index e8ed139dd..1dc1d27ec 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesAdapterFactory.java @@ -4,11 +4,11 @@ import base.States.*; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -218,13 +218,13 @@ public Adapter createSpecificValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.State State}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.State State}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.State + * @see org.eclipse.gemoc.trace.commons.model.trace.State * @generated */ public Adapter createStateAdapter() { @@ -232,13 +232,13 @@ public Adapter createStateAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Value Value}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Value Value}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Value + * @see org.eclipse.gemoc.trace.commons.model.trace.Value * @generated */ public Adapter createValueAdapter() { @@ -246,13 +246,13 @@ public Adapter createValueAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Dimension Dimension}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Dimension Dimension}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Dimension + * @see org.eclipse.gemoc.trace.commons.model.trace.Dimension * @generated */ public Adapter createDimensionAdapter() { @@ -260,13 +260,13 @@ public Adapter createDimensionAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.TracedObject Traced Object}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.TracedObject Traced Object}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.TracedObject + * @see org.eclipse.gemoc.trace.commons.model.trace.TracedObject * @generated */ public Adapter createTracedObjectAdapter() { diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesSwitch.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesSwitch.java index 5d4c60c63..0c7f746c3 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesSwitch.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/States/util/StatesSwitch.java @@ -4,11 +4,11 @@ import base.States.*; -import fr.inria.diverse.trace.commons.model.trace.Dimension; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; -import fr.inria.diverse.trace.commons.model.trace.Value; +import org.eclipse.gemoc.trace.commons.model.trace.Dimension; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.Value; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java index 7d344908c..90a56d4a2 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/RootImplicitStep.java @@ -4,7 +4,7 @@ import base.States.SpecificState; -import fr.inria.diverse.trace.commons.model.trace.SmallStep; +import org.eclipse.gemoc.trace.commons.model.trace.SmallStep; /** * diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java index 0f89fb33b..0eea5ea00 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificRootStep.java @@ -4,7 +4,7 @@ import base.States.SpecificState; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; /** * diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificStep.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificStep.java index f8582f460..2e4975775 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificStep.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/SpecificStep.java @@ -4,7 +4,7 @@ import base.States.SpecificState; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Step; /** * diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/StepsPackage.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/StepsPackage.java index 3aac3aa49..23eaad6f1 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/StepsPackage.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/StepsPackage.java @@ -2,7 +2,7 @@ */ package base.Steps; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java index ef8a2a32d..1fb29c135 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/RootImplicitStepImpl.java @@ -7,7 +7,7 @@ import base.Steps.RootImplicitStep; import base.Steps.StepsPackage; -import fr.inria.diverse.trace.commons.model.trace.impl.SmallStepImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.SmallStepImpl; import org.eclipse.emf.ecore.EClass; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java index 4782eab54..6a0a3d7d6 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificRootStepImpl.java @@ -7,7 +7,7 @@ import base.Steps.SpecificStep; import base.Steps.StepsPackage; -import fr.inria.diverse.trace.commons.model.trace.impl.SequentialStepImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.SequentialStepImpl; import org.eclipse.emf.ecore.EClass; /** diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java index 2a18b8ab3..3b4ff86da 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/SpecificStepImpl.java @@ -6,7 +6,7 @@ import base.Steps.SpecificStep; import base.Steps.StepsPackage; -import fr.inria.diverse.trace.commons.model.trace.impl.StepImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.StepImpl; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java index d5ad8a763..044cb0380 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/impl/StepsPackageImpl.java @@ -16,7 +16,7 @@ import base.impl.BasePackageImpl; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java index 54e4a441e..c1da5a61b 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsAdapterFactory.java @@ -4,11 +4,11 @@ import base.Steps.*; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.SmallStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.SmallStep; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -164,13 +164,13 @@ public Adapter createSpecificRootStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Step Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Step Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Step + * @see org.eclipse.gemoc.trace.commons.model.trace.Step * @generated */ public Adapter createStepAdapter() { @@ -178,13 +178,13 @@ public Adapter createStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SmallStep Small Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.SmallStep Small Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.SmallStep + * @see org.eclipse.gemoc.trace.commons.model.trace.SmallStep * @generated */ public Adapter createSmallStepAdapter() { @@ -192,13 +192,13 @@ public Adapter createSmallStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.BigStep Big Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.BigStep Big Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.BigStep + * @see org.eclipse.gemoc.trace.commons.model.trace.BigStep * @generated */ public Adapter createBigStepAdapter() { @@ -206,13 +206,13 @@ public Adapter createBigStepAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.SequentialStep Sequential Step}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.SequentialStep Sequential Step}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.SequentialStep + * @see org.eclipse.gemoc.trace.commons.model.trace.SequentialStep * @generated */ public Adapter createSequentialStepAdapter() { diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java index b89fac621..fb95e2e12 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/Steps/util/StepsSwitch.java @@ -4,11 +4,11 @@ import base.Steps.*; -import fr.inria.diverse.trace.commons.model.trace.BigStep; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.SmallStep; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.BigStep; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.SmallStep; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/BasePackageImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/BasePackageImpl.java index 604cc5f1b..dbbe70553 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/BasePackageImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/BasePackageImpl.java @@ -14,7 +14,7 @@ import base.Steps.impl.StepsPackageImpl; -import fr.inria.diverse.trace.commons.model.trace.TracePackage; +import org.eclipse.gemoc.trace.commons.model.trace.TracePackage; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java index f980c7aac..6fc039253 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/impl/SpecificTraceImpl.java @@ -12,9 +12,9 @@ import base.Steps.SpecificStep; -import fr.inria.diverse.trace.commons.model.trace.SequentialStep; +import org.eclipse.gemoc.trace.commons.model.trace.SequentialStep; -import fr.inria.diverse.trace.commons.model.trace.impl.TraceImpl; +import org.eclipse.gemoc.trace.commons.model.trace.impl.TraceImpl; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java index 8a9347ed5..010558dc5 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseAdapterFactory.java @@ -4,10 +4,10 @@ import base.*; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -115,13 +115,13 @@ public Adapter createSpecificTraceAdapter() { } /** - * Creates a new adapter for an object of class '{@link fr.inria.diverse.trace.commons.model.trace.Trace Trace}'. + * Creates a new adapter for an object of class '{@link org.eclipse.gemoc.trace.commons.model.trace.Trace Trace}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see fr.inria.diverse.trace.commons.model.trace.Trace + * @see org.eclipse.gemoc.trace.commons.model.trace.Trace * @generated */ public Adapter createTraceAdapter() { diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseSwitch.java b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseSwitch.java index 29f933b2d..bd7179a96 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseSwitch.java +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/base/util/BaseSwitch.java @@ -4,10 +4,10 @@ import base.*; -import fr.inria.diverse.trace.commons.model.trace.State; -import fr.inria.diverse.trace.commons.model.trace.Step; -import fr.inria.diverse.trace.commons.model.trace.Trace; -import fr.inria.diverse.trace.commons.model.trace.TracedObject; +import org.eclipse.gemoc.trace.commons.model.trace.State; +import org.eclipse.gemoc.trace.commons.model.trace.Step; +import org.eclipse.gemoc.trace.commons.model.trace.Trace; +import org.eclipse.gemoc.trace.commons.model.trace.TracedObject; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMExplorer.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMExplorer.xtend index 04c31d169..9822bfa5e 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMExplorer.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMExplorer.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.metamodel.generator +package org.eclipse.gemoc.trace.metamodel.generator import java.util.HashMap import java.util.HashSet diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerationTraceability.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerationTraceability.xtend index ed16fa885..11e58e064 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerationTraceability.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerationTraceability.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.metamodel.generator +package org.eclipse.gemoc.trace.metamodel.generator import java.util.HashMap import java.util.HashSet diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerator.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerator.xtend index ff33fcace..06d82cb9b 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerator.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGenerator.xtend @@ -8,9 +8,9 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.metamodel.generator +package org.eclipse.gemoc.trace.metamodel.generator -import fr.inria.diverse.trace.commons.EMFUtil +import org.eclipse.gemoc.trace.commons.EMFUtil import java.io.IOException import java.util.Set import opsemanticsview.OperationalSemanticsView @@ -58,7 +58,7 @@ class TraceMMGenerator { // Create the root package by loading the base ecore and changing its name and stuff val Resource base = EMFUtil.loadModelURI( - URI.createPlatformPluginURI("fr.inria.diverse.trace.metamodel.generator/model/base.ecore", true), rs) + URI.createPlatformPluginURI("org.eclipse.gemoc.trace.metamodel.generator/model/base.ecore", true), rs) tracemmresult = base.contents.get(0) as EPackage base.contents.remove(tracemmresult) tracemmresult.name = languageName diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorStates.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorStates.xtend index 9fd539c72..1f25bb4ed 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorStates.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorStates.xtend @@ -8,10 +8,10 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.metamodel.generator +package org.eclipse.gemoc.trace.metamodel.generator -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.commons.ExecutionMetamodelTraceability +import org.eclipse.gemoc.trace.commons.EcoreCraftingUtil +import org.eclipse.gemoc.trace.commons.ExecutionMetamodelTraceability import java.util.ArrayList import java.util.HashMap import java.util.HashSet @@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EStructuralFeature import org.eclipse.emf.ecore.EcoreFactory import org.eclipse.emf.ecore.util.EcoreUtil -import static fr.inria.diverse.trace.commons.EcoreCraftingUtil.* +import static org.eclipse.gemoc.trace.commons.EcoreCraftingUtil.* import opsemanticsview.OperationalSemanticsView class TraceMMGeneratorStates { diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorSteps.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorSteps.xtend index 947fc87ad..55c562edc 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorSteps.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMGeneratorSteps.xtend @@ -8,10 +8,10 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.metamodel.generator +package org.eclipse.gemoc.trace.metamodel.generator -import fr.inria.diverse.trace.commons.EcoreCraftingUtil -import fr.inria.diverse.trace.commons.tracemetamodel.StepStrings +import org.eclipse.gemoc.trace.commons.EcoreCraftingUtil +import org.eclipse.gemoc.trace.commons.tracemetamodel.StepStrings import java.util.HashMap import java.util.HashSet import java.util.Map @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EOperation import org.eclipse.emf.ecore.EPackage import org.eclipse.emf.ecore.EcoreFactory -import static fr.inria.diverse.trace.commons.EcoreCraftingUtil.* +import static org.eclipse.gemoc.trace.commons.EcoreCraftingUtil.* import opsemanticsview.OperationalSemanticsView import opsemanticsview.Rule diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMStrings.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMStrings.xtend index 483e85596..577ad00f5 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMStrings.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.metamodel.generator/src/org/eclipse/gemoc/trace/metamodel/generator/TraceMMStrings.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package fr.inria.diverse.trace.metamodel.generator +package org.eclipse.gemoc.trace.metamodel.generator import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EStructuralFeature diff --git a/trace/generator/pom.xml b/trace/generator/pom.xml index f72e6e632..6becf4231 100644 --- a/trace/generator/pom.xml +++ b/trace/generator/pom.xml @@ -17,11 +17,11 @@ - plugins/fr.inria.diverse.trace.gemoc - plugins/fr.inria.diverse.trace.gemoc.generator - plugins/fr.inria.diverse.trace.gemoc.ui - plugins/fr.inria.diverse.trace.metamodel.generator - plugins/fr.inria.diverse.trace.annotations + plugins/org.eclipse.gemoc.trace.gemoc + plugins/org.eclipse.gemoc.trace.gemoc.generator + plugins/org.eclipse.gemoc.trace.gemoc.ui + plugins/org.eclipse.gemoc.trace.metamodel.generator + plugins/org.eclipse.gemoc.trace.annotations releng/org.gemoc.modeldebugging.trace.generator.feature @@ -67,7 +67,7 @@ - releng/org.gemoc.modeldebugging.trace.generator.feature + releng/org.eclipse.gemoc.trace.generator.feature diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/.project b/trace/generator/releng/org.eclipse.gemoc.trace.generator.feature/.project similarity index 100% rename from trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/.project rename to trace/generator/releng/org.eclipse.gemoc.trace.generator.feature/.project diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/build.properties b/trace/generator/releng/org.eclipse.gemoc.trace.generator.feature/build.properties similarity index 100% rename from trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/build.properties rename to trace/generator/releng/org.eclipse.gemoc.trace.generator.feature/build.properties diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml b/trace/generator/releng/org.eclipse.gemoc.trace.generator.feature/feature.xml similarity index 95% rename from trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml rename to trace/generator/releng/org.eclipse.gemoc.trace.generator.feature/feature.xml index a61b84938..72666b631 100644 --- a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/feature.xml +++ b/trace/generator/releng/org.eclipse.gemoc.trace.generator.feature/feature.xml @@ -1,6 +1,6 @@ diff --git a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/pom.xml b/trace/generator/releng/org.eclipse.gemoc.trace.generator.feature/pom.xml similarity index 89% rename from trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/pom.xml rename to trace/generator/releng/org.eclipse.gemoc.trace.generator.feature/pom.xml index dd1a24383..55ac1c6c5 100644 --- a/trace/generator/releng/org.gemoc.modeldebugging.trace.generator.feature/pom.xml +++ b/trace/generator/releng/org.eclipse.gemoc.trace.generator.feature/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.gemoc.modeldebugging.trace.generator - org.gemoc.modeldebugging.trace.generator.feature + org.eclipse.gemoc.trace.generator.feature 2.3.0-SNAPSHOT eclipse-feature From 284fbb5df597b446a3e47d66d89e52eabc8aa769 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 11:43:17 +0200 Subject: [PATCH 239/267] rename org.gemoc.modeldebugging.trace.manager.feature in org.eclipse.gemoc.trace.manager.feature --- .../org.gemoc.execution.sequential.javaxdsml.tests/pom.xml | 2 +- releng/org.gemoc.siriusanimation.repository/category.xml | 4 ++-- trace/manager/pom.xml | 2 +- .../.project | 0 .../about.html | 0 .../build.properties | 0 .../feature.xml | 2 +- .../pom.xml | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename trace/manager/releng/{org.gemoc.modeldebugging.trace.manager.feature => org.eclipse.gemoc.trace.manager.feature}/.project (100%) rename trace/manager/releng/{org.gemoc.modeldebugging.trace.manager.feature => org.eclipse.gemoc.trace.manager.feature}/about.html (100%) rename trace/manager/releng/{org.gemoc.modeldebugging.trace.manager.feature => org.eclipse.gemoc.trace.manager.feature}/build.properties (100%) rename trace/manager/releng/{org.gemoc.modeldebugging.trace.manager.feature => org.eclipse.gemoc.trace.manager.feature}/feature.xml (94%) rename trace/manager/releng/{org.gemoc.modeldebugging.trace.manager.feature => org.eclipse.gemoc.trace.manager.feature}/pom.xml (89%) diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml index 4d37ee33d..c6a908012 100644 --- a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml +++ b/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml @@ -131,7 +131,7 @@ eclipse-feature - org.gemoc.modeldebugging.trace.manager.feature + org.eclipse.gemoc.trace.manager.feature 1.0.0 diff --git a/releng/org.gemoc.siriusanimation.repository/category.xml b/releng/org.gemoc.siriusanimation.repository/category.xml index 9e7d28384..247546aaa 100644 --- a/releng/org.gemoc.siriusanimation.repository/category.xml +++ b/releng/org.gemoc.siriusanimation.repository/category.xml @@ -12,10 +12,10 @@ - + - + diff --git a/trace/manager/pom.xml b/trace/manager/pom.xml index fbf34f110..cc8516963 100644 --- a/trace/manager/pom.xml +++ b/trace/manager/pom.xml @@ -22,7 +22,7 @@ plugins/org.gemoc.sequential_addons.diffviewer - releng/org.gemoc.modeldebugging.trace.manager.feature + releng/org.eclipse.gemoc.trace.manager.feature diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/.project b/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/.project similarity index 100% rename from trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/.project rename to trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/.project diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/about.html b/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/about.html similarity index 100% rename from trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/about.html rename to trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/about.html diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/build.properties b/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/build.properties similarity index 100% rename from trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/build.properties rename to trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/build.properties diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml b/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/feature.xml similarity index 94% rename from trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml rename to trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/feature.xml index da86a0d36..b29ea728e 100644 --- a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/feature.xml +++ b/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/feature.xml @@ -1,6 +1,6 @@ diff --git a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/pom.xml b/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/pom.xml similarity index 89% rename from trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/pom.xml rename to trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/pom.xml index 095f42c03..36740ef39 100644 --- a/trace/manager/releng/org.gemoc.modeldebugging.trace.manager.feature/pom.xml +++ b/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.gemoc.modeldebugging.trace.manager - org.gemoc.modeldebugging.trace.manager.feature + org.eclipse.gemoc.trace.manager.feature 2.3.0-SNAPSHOT eclipse-feature From 78ed73d06c9af259600151c00669e2bc754af4a4 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 11:46:55 +0200 Subject: [PATCH 240/267] rename org.gemoc.sequential_addons in org.eclipse.gemoc.sequential_addons --- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../icons/IconeGemocModel-16.png | Bin .../icons/insp_sbook.gif | Bin .../icons/scoped_ovr.gif | Bin .../plugin.xml | 0 .../pom.xml | 0 .../sequential_addons/diffviewer/Activator.java | 0 .../sequential_addons/diffviewer/logic/Diff.java | 0 .../diffviewer/logic/DiffComputer.java | 0 .../views/TimelineDiffViewerRenderer.java | 0 .../views/TimelineDiffViewerViewPart.java | 0 .../diffviewer/views/TraceSectionsDialog.java | 0 .../diffviewer/views/ValueView.java | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../icons/IconeGemocModel-16.png | Bin .../icons/backvalue.png | Bin .../icons/insp_sbook.gif | Bin .../icons/jload_obj.gif | Bin .../icons/lock_co.gif | Bin .../icons/nav_backward.gif | Bin .../icons/nav_forward.gif | Bin .../icons/play-4-16.png | Bin .../icons/remove.gif | Bin .../icons/restart_task.gif | Bin .../icons/runtoline_co.gif | Bin .../icons/save.gif | Bin .../icons/start_task.gif | Bin .../icons/state_coloration.gif | Bin .../icons/stepvalue.png | Bin .../icons/synced.gif | Bin .../plugin.xml | 0 .../pom.xml | 0 .../multidimensional/timeline/Activator.java | 0 .../views/MultidimensionalTimelineRenderer.java | 0 .../views/MultidimensionalTimelineViewPart.java | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../icons/IconeGemocModel-16.png | Bin .../icons/cycle_coloration.gif | Bin .../icons/jload_obj.gif | Bin .../icons/refresh_layout.gif | Bin .../plugin.xml | 0 .../pom.xml | 0 .../sequential_addons/stategraph/Activator.java | 0 .../stategraph/layout/StateGraphLayoutCommand.java | 0 .../layout/StateGraphLayoutConnector.java | 0 .../stategraph/layout/StateGraphLayoutSetup.java | 0 .../stategraph/logic/DirectedGraph.java | 0 .../stategraph/logic/StateGraph.java | 0 .../stategraph/logic/StateVertex.java | 0 .../stategraph/logic/alg/IHullAlgorithm.java | 0 .../stategraph/logic/alg/JarvisMarch.java | 0 .../stategraph/logic/alg/JohnsonSimpleCycles.java | 0 .../stategraph/views/CurvedEdgeView.java | 0 .../stategraph/views/CycleView.java | 0 .../stategraph/views/EdgeView.java | 0 .../stategraph/views/StateGraphRenderer.java | 0 .../stategraph/views/StateGraphViewPart.java | 0 .../stategraph/views/StraightEdgeView.java | 0 .../stategraph/views/VertexView.java | 0 72 files changed, 0 insertions(+), 0 deletions(-) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer => org.eclipse.gemoc.sequential_addons.diffviewer}/.classpath (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer => org.eclipse.gemoc.sequential_addons.diffviewer}/.project (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer => org.eclipse.gemoc.sequential_addons.diffviewer}/.settings/org.eclipse.jdt.core.prefs (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer => org.eclipse.gemoc.sequential_addons.diffviewer}/META-INF/MANIFEST.MF (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer => org.eclipse.gemoc.sequential_addons.diffviewer}/build.properties (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer => org.eclipse.gemoc.sequential_addons.diffviewer}/icons/IconeGemocModel-16.png (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer => org.eclipse.gemoc.sequential_addons.diffviewer}/icons/insp_sbook.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer => org.eclipse.gemoc.sequential_addons.diffviewer}/icons/scoped_ovr.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer => org.eclipse.gemoc.sequential_addons.diffviewer}/plugin.xml (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer => org.eclipse.gemoc.sequential_addons.diffviewer}/pom.xml (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer/src/org => org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse}/gemoc/sequential_addons/diffviewer/Activator.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer/src/org => org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse}/gemoc/sequential_addons/diffviewer/logic/Diff.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer/src/org => org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse}/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer/src/org => org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse}/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer/src/org => org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse}/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer/src/org => org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse}/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.diffviewer/src/org => org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse}/gemoc/sequential_addons/diffviewer/views/ValueView.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/.classpath (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/.gitignore (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/.project (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/META-INF/MANIFEST.MF (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/about.html (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/build.properties (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/IconeGemocModel-16.png (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/backvalue.png (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/insp_sbook.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/jload_obj.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/lock_co.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/nav_backward.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/nav_forward.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/play-4-16.png (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/remove.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/restart_task.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/runtoline_co.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/save.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/start_task.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/state_coloration.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/stepvalue.png (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/icons/synced.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/plugin.xml (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline => org.eclipse.gemoc.sequential_addons.multidimensional.timeline}/pom.xml (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline/src/org => org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse}/gemoc/sequential_addons/multidimensional/timeline/Activator.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline/src/org => org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse}/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.multidimensional.timeline/src/org => org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse}/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/.classpath (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/.project (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/.settings/org.eclipse.jdt.core.prefs (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/META-INF/MANIFEST.MF (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/build.properties (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/icons/IconeGemocModel-16.png (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/icons/cycle_coloration.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/icons/jload_obj.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/icons/refresh_layout.gif (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/plugin.xml (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph => org.eclipse.gemoc.sequential_addons.stategraph}/pom.xml (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/Activator.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/logic/DirectedGraph.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/logic/StateGraph.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/logic/StateVertex.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/logic/alg/IHullAlgorithm.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/logic/alg/JarvisMarch.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/logic/alg/JohnsonSimpleCycles.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/views/CycleView.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/views/EdgeView.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java (100%) rename trace/manager/plugins/{org.gemoc.sequential_addons.stategraph/src/org => org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse}/gemoc/sequential_addons/stategraph/views/VertexView.java (100%) diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.classpath b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/.classpath similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.classpath rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/.classpath diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.project b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/.project similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.project rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/.project diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.settings/org.eclipse.jdt.core.prefs b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/.settings/org.eclipse.jdt.core.prefs rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/.settings/org.eclipse.jdt.core.prefs diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/build.properties b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/build.properties similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/build.properties rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/build.properties diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/IconeGemocModel-16.png b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/icons/IconeGemocModel-16.png similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/IconeGemocModel-16.png rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/icons/IconeGemocModel-16.png diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/insp_sbook.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/icons/insp_sbook.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/insp_sbook.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/icons/insp_sbook.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/scoped_ovr.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/icons/scoped_ovr.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/icons/scoped_ovr.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/icons/scoped_ovr.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/plugin.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/plugin.xml similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/plugin.xml rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/plugin.xml diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/pom.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/pom.xml similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/pom.xml rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/pom.xml diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/Activator.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/Activator.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/Activator.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/Activator.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/Diff.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/Diff.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/Diff.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/Diff.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/ValueView.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.diffviewer/src/org/gemoc/sequential_addons/diffviewer/views/ValueView.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/ValueView.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/.classpath b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/.classpath similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/.classpath rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/.classpath diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/.gitignore b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/.gitignore similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/.gitignore rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/.gitignore diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/.project b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/.project similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/.project rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/.project diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/about.html b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/about.html similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/about.html rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/about.html diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/build.properties b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/build.properties similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/build.properties rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/build.properties diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/IconeGemocModel-16.png b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/IconeGemocModel-16.png similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/IconeGemocModel-16.png rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/IconeGemocModel-16.png diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/backvalue.png b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/backvalue.png similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/backvalue.png rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/backvalue.png diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/insp_sbook.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/insp_sbook.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/insp_sbook.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/insp_sbook.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/jload_obj.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/jload_obj.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/jload_obj.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/jload_obj.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/lock_co.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/lock_co.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/lock_co.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/lock_co.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/nav_backward.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/nav_backward.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/nav_backward.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/nav_backward.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/nav_forward.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/nav_forward.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/nav_forward.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/nav_forward.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/play-4-16.png b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/play-4-16.png similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/play-4-16.png rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/play-4-16.png diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/remove.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/remove.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/remove.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/remove.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/restart_task.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/restart_task.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/restart_task.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/restart_task.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/runtoline_co.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/runtoline_co.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/runtoline_co.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/runtoline_co.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/save.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/save.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/save.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/save.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/start_task.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/start_task.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/start_task.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/start_task.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/state_coloration.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/state_coloration.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/state_coloration.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/state_coloration.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/stepvalue.png b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/stepvalue.png similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/stepvalue.png rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/stepvalue.png diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/synced.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/synced.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/icons/synced.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/icons/synced.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/plugin.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/plugin.xml similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/plugin.xml rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/plugin.xml diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/pom.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/pom.xml similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/pom.xml rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/pom.xml diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/Activator.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/Activator.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/Activator.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/Activator.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.multidimensional.timeline/src/org/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/.classpath b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/.classpath similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/.classpath rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/.classpath diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/.project b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/.project similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/.project rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/.project diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/.settings/org.eclipse.jdt.core.prefs b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/.settings/org.eclipse.jdt.core.prefs rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/.settings/org.eclipse.jdt.core.prefs diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/build.properties b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/build.properties similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/build.properties rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/build.properties diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/IconeGemocModel-16.png b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/icons/IconeGemocModel-16.png similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/IconeGemocModel-16.png rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/icons/IconeGemocModel-16.png diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/cycle_coloration.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/icons/cycle_coloration.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/cycle_coloration.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/icons/cycle_coloration.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/jload_obj.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/icons/jload_obj.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/jload_obj.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/icons/jload_obj.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/refresh_layout.gif b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/icons/refresh_layout.gif similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/icons/refresh_layout.gif rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/icons/refresh_layout.gif diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/plugin.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/plugin.xml similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/plugin.xml rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/plugin.xml diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/pom.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/pom.xml similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/pom.xml rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/pom.xml diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/Activator.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/Activator.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/Activator.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/Activator.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/DirectedGraph.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/DirectedGraph.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/DirectedGraph.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/DirectedGraph.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateGraph.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateGraph.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateGraph.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateVertex.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateVertex.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/StateVertex.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateVertex.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/alg/IHullAlgorithm.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/IHullAlgorithm.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/alg/IHullAlgorithm.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/IHullAlgorithm.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/alg/JarvisMarch.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JarvisMarch.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/alg/JarvisMarch.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JarvisMarch.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/alg/JohnsonSimpleCycles.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JohnsonSimpleCycles.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/logic/alg/JohnsonSimpleCycles.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JohnsonSimpleCycles.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CycleView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CycleView.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/CycleView.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CycleView.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/EdgeView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/EdgeView.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/EdgeView.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/EdgeView.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java diff --git a/trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/VertexView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/VertexView.java similarity index 100% rename from trace/manager/plugins/org.gemoc.sequential_addons.stategraph/src/org/gemoc/sequential_addons/stategraph/views/VertexView.java rename to trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/VertexView.java From 627972f5d185a5ce680e4dac05a742de12a9f95d Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 11:50:04 +0200 Subject: [PATCH 241/267] rename org.gemoc.sequential_addons in org.eclipse.gemoc.sequential_addons --- .../generator/GenericEngineTraceAddonGenerator.xtend | 4 ++-- .../plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../plugin.xml | 8 ++++---- .../pom.xml | 2 +- .../sequential_addons/diffviewer/Activator.java | 4 ++-- .../sequential_addons/diffviewer/logic/Diff.java | 2 +- .../diffviewer/logic/DiffComputer.java | 4 ++-- .../diffviewer/views/TimelineDiffViewerRenderer.java | 8 ++++---- .../diffviewer/views/TimelineDiffViewerViewPart.java | 6 +++--- .../diffviewer/views/TraceSectionsDialog.java | 2 +- .../diffviewer/views/ValueView.java | 4 ++-- .../.project | 2 +- .../META-INF/MANIFEST.MF | 8 ++++---- .../plugin.xml | 8 ++++---- .../pom.xml | 2 +- .../multidimensional/timeline/Activator.java | 4 ++-- .../views/MultidimensionalTimelineRenderer.java | 2 +- .../views/MultidimensionalTimelineViewPart.java | 6 +++--- .../.project | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../plugin.xml | 8 ++++---- .../pom.xml | 2 +- .../sequential_addons/stategraph/Activator.java | 4 ++-- .../stategraph/layout/StateGraphLayoutCommand.java | 6 +++--- .../stategraph/layout/StateGraphLayoutConnector.java | 12 ++++++------ .../stategraph/layout/StateGraphLayoutSetup.java | 6 +++--- .../stategraph/logic/DirectedGraph.java | 2 +- .../stategraph/logic/StateGraph.java | 2 +- .../stategraph/logic/StateVertex.java | 2 +- .../stategraph/logic/alg/IHullAlgorithm.java | 2 +- .../stategraph/logic/alg/JarvisMarch.java | 2 +- .../stategraph/logic/alg/JohnsonSimpleCycles.java | 6 +++--- .../stategraph/views/CurvedEdgeView.java | 2 +- .../stategraph/views/CycleView.java | 6 +++--- .../sequential_addons/stategraph/views/EdgeView.java | 2 +- .../stategraph/views/StateGraphRenderer.java | 12 ++++++------ .../stategraph/views/StateGraphViewPart.java | 12 ++++++------ .../stategraph/views/StraightEdgeView.java | 2 +- .../stategraph/views/VertexView.java | 4 ++-- trace/manager/pom.xml | 6 +++--- .../feature.xml | 6 +++--- 43 files changed, 98 insertions(+), 98 deletions(-) diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index f0eb3532d..044e4305d 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -205,7 +205,7 @@ class GenericEngineTraceAddonGenerator { ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.trace.gemoc.api") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.xdsmlframework.api") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.trace.commons.model") - ManifestUtil.addToPluginManifest(project, m, "org.gemoc.sequential_addons.multidimensional.timeline") + ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.sequential_addons.multidimensional.timeline") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.timeline") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.trace.commons") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.xdsmlframework.api") @@ -241,7 +241,7 @@ class GenericEngineTraceAddonGenerator { "MultiDimensional Trace support dedicated to "+tracedLanguageName+" language" ); updateDefinitionAttributeInExtensionPoint(extensionPoint, - EngineAddonSpecificationExtensionPoint.GEMOC_ENGINE_ADDON_EXTENSION_POINT_OPENVIEWIDS, "org.gemoc.sequential_addons.multidimensional.timeline.views.timeline.MultidimensionalTimeLineView" + EngineAddonSpecificationExtensionPoint.GEMOC_ENGINE_ADDON_EXTENSION_POINT_OPENVIEWIDS, "org.eclipse.gemoc.sequential_addons.multidimensional.timeline.views.timeline.MultidimensionalTimeLineView" ); updateDefinitionAttributeInExtensionPoint(extensionPoint, EngineAddonSpecificationExtensionPoint.GEMOC_ENGINE_ADDON_EXTENSION_POINT_ADDONGROUPID, "Sequential.AddonGroup" diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml index b10a128cd..7b1807e8d 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/plugin.xml @@ -4,6 +4,6 @@ --> - + diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/.project b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/.project index 820dc2c9a..26c77d866 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/.project +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/.project @@ -1,6 +1,6 @@ - org.gemoc.sequential_addons.diffviewer + org.eclipse.gemoc.sequential_addons.diffviewer diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF index 002a93ea8..d71894486 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Diffviewer -Bundle-SymbolicName: org.gemoc.sequential_addons.diffviewer;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.sequential_addons.diffviewer;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.sequential_addons.diffviewer.Activator +Bundle-Activator: org.eclipse.gemoc.sequential_addons.diffviewer.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.gemoc.trace.gemoc.api;bundle-version="1.0.0", diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/plugin.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/plugin.xml index 69cf19471..8cd34f98d 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/plugin.xml +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/plugin.xml @@ -9,9 +9,9 @@ @@ -27,13 +27,13 @@ + id="org.eclipse.gemoc.sequential_addons.diffviewer.TimelineDiffView"> + id="org.eclipse.gemoc.sequential_addons.diffviewer.TimelineDiffViewer"> diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/pom.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/pom.xml index 7692a947c..65baed51b 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/pom.xml +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/pom.xml @@ -9,7 +9,7 @@ ../.. - org.gemoc.sequential_addons.diffviewer + org.eclipse.gemoc.sequential_addons.diffviewer eclipse-plugin 2.3.0-SNAPSHOT \ No newline at end of file diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/Activator.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/Activator.java index 1a26f5eef..c3423d09c 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/Activator.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/Activator.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.diffviewer; +package org.eclipse.gemoc.sequential_addons.diffviewer; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -9,7 +9,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.sequential_addons.diffviewer"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.sequential_addons.diffviewer"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/Diff.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/Diff.java index 23566fdfd..8ae456065 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/Diff.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/Diff.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.diffviewer.logic; +package org.eclipse.gemoc.sequential_addons.diffviewer.logic; public class Diff { diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java index 89a08faa6..42a8d4d97 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/logic/DiffComputer.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.diffviewer.logic; +package org.eclipse.gemoc.sequential_addons.diffviewer.logic; import java.util.ArrayList; import java.util.Collection; @@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; -import org.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; +import org.eclipse.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; import org.eclipse.gemoc.trace.commons.model.trace.Value; import javafx.util.Pair; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java index a86053e7f..05fbb1313 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerRenderer.java @@ -1,13 +1,13 @@ -package org.gemoc.sequential_addons.diffviewer.views; +package org.eclipse.gemoc.sequential_addons.diffviewer.views; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.gemoc.sequential_addons.diffviewer.logic.Diff; -import org.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; -import org.gemoc.sequential_addons.diffviewer.logic.DiffComputer; +import org.eclipse.gemoc.sequential_addons.diffviewer.logic.Diff; +import org.eclipse.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; +import org.eclipse.gemoc.sequential_addons.diffviewer.logic.DiffComputer; import org.eclipse.gemoc.trace.commons.model.trace.Dimension; import org.eclipse.gemoc.trace.commons.model.trace.State; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java index 8fcef55cd..64edf4955 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TimelineDiffViewerViewPart.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.sequential_addons.diffviewer.views; +package org.eclipse.gemoc.sequential_addons.diffviewer.views; import java.util.Map; @@ -35,7 +35,7 @@ import org.eclipse.ui.IActionBars; import org.eclipse.ui.part.ViewPart; import org.eclipse.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; -import org.gemoc.sequential_addons.diffviewer.Activator; +import org.eclipse.gemoc.sequential_addons.diffviewer.Activator; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.eclipse.gemoc.trace.gemoc.api.ITraceExtractor; @@ -45,7 +45,7 @@ public class TimelineDiffViewerViewPart extends ViewPart { - public static final String ID = "org.gemoc.sequential_addons.diffviewer.views.TimelineDiffViewerRenderer"; + public static final String ID = "org.eclipse.gemoc.sequential_addons.diffviewer.views.TimelineDiffViewerRenderer"; private FXCanvas fxCanvas; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java index 960fd8ef2..db716acd3 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/TraceSectionsDialog.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.diffviewer.views; +package org.eclipse.gemoc.sequential_addons.diffviewer.views; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.TitleAreaDialog; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/ValueView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/ValueView.java index 00a5a9a58..330f44b27 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/ValueView.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.diffviewer/src/org/eclipse/gemoc/sequential_addons/diffviewer/views/ValueView.java @@ -1,9 +1,9 @@ -package org.gemoc.sequential_addons.diffviewer.views; +package org.eclipse.gemoc.sequential_addons.diffviewer.views; import java.util.ArrayList; import java.util.List; -import org.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; +import org.eclipse.gemoc.sequential_addons.diffviewer.logic.Diff.DiffKind; import javafx.scene.control.Tooltip; import javafx.scene.layout.HBox; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/.project b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/.project index e9a856ed5..31c430c5c 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/.project +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/.project @@ -1,6 +1,6 @@ - org.gemoc.sequential_addons.multidimensional.timeline + org.eclipse.gemoc.sequential_addons.multidimensional.timeline diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF index 32ace25c2..9e6d10831 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc MultiDimensional Timeline Addon -Bundle-SymbolicName: org.gemoc.sequential_addons.multidimensional.timeline;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.sequential_addons.multidimensional.timeline;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.sequential_addons.multidimensional.timeline.Activator +Bundle-Activator: org.eclipse.gemoc.sequential_addons.multidimensional.timeline.Activator Require-Bundle: org.eclipse.gemoc.timeline;bundle-version="1.0.0", org.eclipse.gemoc.executionframework.engine, org.eclipse.emf.edit.ui, @@ -51,6 +51,6 @@ Import-Package: javafx.animation;version="2.0.0", javafx.util;version="2.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.gemoc.sequential_addons.multidimensional.timeline, - org.gemoc.sequential_addons.multidimensional.timeline.views +Export-Package: org.eclipse.gemoc.sequential_addons.multidimensional.timeline, + org.eclipse.gemoc.sequential_addons.multidimensional.timeline.views diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/plugin.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/plugin.xml index dff77cef9..01ffbb4ee 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/plugin.xml +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/plugin.xml @@ -9,9 +9,9 @@ @@ -27,13 +27,13 @@ + id="org.eclipse.gemoc.sequential_addons.multidimensional.timeline.views.timeline.MultidimensionalTimeLineView"> + id="org.eclipse.gemoc.sequential_addons.multidimensional.timeline.views.timeline.MultidimensionalTimeLineView"> diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/pom.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/pom.xml index 5fa87b250..5c5bd1654 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/pom.xml +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/pom.xml @@ -9,7 +9,7 @@ ../.. - org.gemoc.sequential_addons.multidimensional.timeline + org.eclipse.gemoc.sequential_addons.multidimensional.timeline eclipse-plugin 2.3.0-SNAPSHOT \ No newline at end of file diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/Activator.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/Activator.java index 9fbb15b2f..0220069de 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/Activator.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.sequential_addons.multidimensional.timeline; +package org.eclipse.gemoc.sequential_addons.multidimensional.timeline; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -22,7 +22,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.sequential_addons.multidimensional.timeline"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.sequential_addons.multidimensional.timeline"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java index 8d2eee520..dae4a1d12 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineRenderer.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.sequential_addons.multidimensional.timeline.views; +package org.eclipse.gemoc.sequential_addons.multidimensional.timeline.views; import java.util.ArrayList; import java.util.Collections; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java index 493f6530b..f9943c05c 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline/src/org/eclipse/gemoc/sequential_addons/multidimensional/timeline/views/MultidimensionalTimelineViewPart.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.sequential_addons.multidimensional.timeline.views; +package org.eclipse.gemoc.sequential_addons.multidimensional.timeline.views; import java.util.ArrayList; import java.util.Arrays; @@ -58,7 +58,7 @@ import org.eclipse.gemoc.executionframework.engine.ui.launcher.AbstractGemocLauncher; import org.eclipse.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; import org.eclipse.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; -import org.gemoc.sequential_addons.multidimensional.timeline.Activator; +import org.eclipse.gemoc.sequential_addons.multidimensional.timeline.Activator; import org.eclipse.gemoc.xdsmlframework.api.core.EngineStatus.RunStatus; import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; @@ -79,7 +79,7 @@ public class MultidimensionalTimelineViewPart extends EngineSelectionDependentViewPart { - public static final String ID = "org.gemoc.sequential_addons.multidimensional.timeline.views.timeline.MultidimensionalTimeLineView"; + public static final String ID = "org.eclipse.gemoc.sequential_addons.multidimensional.timeline.views.timeline.MultidimensionalTimeLineView"; private FXCanvas fxCanvas; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/.project b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/.project index 86ab4ffe1..4075d6b37 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/.project +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/.project @@ -1,6 +1,6 @@ - org.gemoc.sequential_addons.stategraph + org.eclipse.gemoc.sequential_addons.stategraph diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF index bf8b1be60..25fe68f5d 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.gemoc.sequential_addons.stategraph;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.sequential_addons.stategraph;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-Activator: org.gemoc.sequential_addons.stategraph.Activator +Bundle-Activator: org.eclipse.gemoc.sequential_addons.stategraph.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.fx.ui.workbench3, diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/plugin.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/plugin.xml index 89f295109..923022886 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/plugin.xml +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/plugin.xml @@ -7,14 +7,14 @@ + class="org.eclipse.gemoc.sequential_addons.stategraph.views.StateGraphViewPart" + id="org.eclipse.gemoc.sequential_addons.stategraph.views.StateGraphViewPart"> + class="org.eclipse.gemoc.sequential_addons.stategraph.layout.StateGraphLayoutSetup"> @@ -22,7 +22,7 @@ diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/pom.xml b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/pom.xml index c1530bf15..e5dcc6e7e 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/pom.xml +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/pom.xml @@ -9,7 +9,7 @@ ../.. - org.gemoc.sequential_addons.stategraph + org.eclipse.gemoc.sequential_addons.stategraph eclipse-plugin 2.3.0-SNAPSHOT \ No newline at end of file diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/Activator.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/Activator.java index 46f663616..c836e8b35 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/Activator.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/Activator.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph; +package org.eclipse.gemoc.sequential_addons.stategraph; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -13,7 +13,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.sequential_addons.stategraph"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.sequential_addons.stategraph"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java index 02a972107..630b56a79 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutCommand.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.layout; +package org.eclipse.gemoc.sequential_addons.stategraph.layout; import java.util.HashMap; import java.util.Map; @@ -13,8 +13,8 @@ import org.eclipse.elk.graph.KNode; import org.eclipse.elk.graph.properties.Property; import org.eclipse.ui.IWorkbenchPart; -import org.gemoc.sequential_addons.stategraph.logic.StateVertex; -import org.gemoc.sequential_addons.stategraph.views.VertexView; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.StateVertex; +import org.eclipse.gemoc.sequential_addons.stategraph.views.VertexView; public class StateGraphLayoutCommand { diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java index f0a05702f..28108ecb1 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutConnector.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.layout; +package org.eclipse.gemoc.sequential_addons.stategraph.layout; import java.util.ArrayList; import java.util.HashMap; @@ -21,11 +21,11 @@ import org.eclipse.elk.graph.properties.IPropertyHolder; import org.eclipse.elk.graph.properties.Property; import org.eclipse.ui.IWorkbenchPart; -import org.gemoc.sequential_addons.stategraph.logic.DirectedGraph; -import org.gemoc.sequential_addons.stategraph.logic.StateGraph; -import org.gemoc.sequential_addons.stategraph.logic.StateVertex; -import org.gemoc.sequential_addons.stategraph.views.StateGraphViewPart; -import org.gemoc.sequential_addons.stategraph.views.VertexView; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.DirectedGraph; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.StateGraph; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.StateVertex; +import org.eclipse.gemoc.sequential_addons.stategraph.views.StateGraphViewPart; +import org.eclipse.gemoc.sequential_addons.stategraph.views.VertexView; public class StateGraphLayoutConnector implements IDiagramLayoutConnector { diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java index 9fb6cc9c5..b98dc54f8 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/layout/StateGraphLayoutSetup.java @@ -1,11 +1,11 @@ -package org.gemoc.sequential_addons.stategraph.layout; +package org.eclipse.gemoc.sequential_addons.stategraph.layout; import java.util.Collection; import org.eclipse.elk.core.service.IDiagramLayoutConnector; import org.eclipse.elk.core.service.ILayoutSetup; -import org.gemoc.sequential_addons.stategraph.logic.StateVertex; -import org.gemoc.sequential_addons.stategraph.views.StateGraphViewPart; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.StateVertex; +import org.eclipse.gemoc.sequential_addons.stategraph.views.StateGraphViewPart; import com.google.inject.Binder; import com.google.inject.Guice; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/DirectedGraph.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/DirectedGraph.java index b71ac3cfd..66f043dc6 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/DirectedGraph.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/DirectedGraph.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.logic; +package org.eclipse.gemoc.sequential_addons.stategraph.logic; import java.util.ArrayList; import java.util.Collections; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateGraph.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateGraph.java index dcb09325d..2d06b8b1d 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateGraph.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateGraph.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.logic; +package org.eclipse.gemoc.sequential_addons.stategraph.logic; import java.util.ArrayList; import java.util.Collection; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateVertex.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateVertex.java index a3e1f24d8..4d66b48ec 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateVertex.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/StateVertex.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.logic; +package org.eclipse.gemoc.sequential_addons.stategraph.logic; import java.util.function.Consumer; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/IHullAlgorithm.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/IHullAlgorithm.java index 28e2c6613..0f6c31a3c 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/IHullAlgorithm.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/IHullAlgorithm.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.logic.alg; +package org.eclipse.gemoc.sequential_addons.stategraph.logic.alg; import java.util.List; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JarvisMarch.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JarvisMarch.java index c012834d8..b0d381e77 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JarvisMarch.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JarvisMarch.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.logic.alg; +package org.eclipse.gemoc.sequential_addons.stategraph.logic.alg; import java.util.ArrayList; import java.util.List; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JohnsonSimpleCycles.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JohnsonSimpleCycles.java index 106fd3474..4c938da84 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JohnsonSimpleCycles.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/logic/alg/JohnsonSimpleCycles.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.logic.alg; +package org.eclipse.gemoc.sequential_addons.stategraph.logic.alg; import java.util.ArrayDeque; import java.util.ArrayList; @@ -9,8 +9,8 @@ import java.util.Map; import java.util.Set; -import org.gemoc.sequential_addons.stategraph.logic.DirectedGraph; -import org.gemoc.sequential_addons.stategraph.logic.DirectedGraph.Edge; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.DirectedGraph; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.DirectedGraph.Edge; public class JohnsonSimpleCycles { // The graph diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java index 3fbb70f22..ff0a7239b 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CurvedEdgeView.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.views; +package org.eclipse.gemoc.sequential_addons.stategraph.views; import javafx.beans.binding.DoubleBinding; import javafx.beans.property.DoubleProperty; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CycleView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CycleView.java index 152284eb8..ace3e0dd6 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CycleView.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/CycleView.java @@ -1,10 +1,10 @@ -package org.gemoc.sequential_addons.stategraph.views; +package org.eclipse.gemoc.sequential_addons.stategraph.views; import java.util.ArrayList; import java.util.List; -import org.gemoc.sequential_addons.stategraph.logic.alg.IHullAlgorithm; -import org.gemoc.sequential_addons.stategraph.logic.alg.JarvisMarch; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.alg.IHullAlgorithm; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.alg.JarvisMarch; import javafx.beans.value.ChangeListener; import javafx.scene.Node; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/EdgeView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/EdgeView.java index 6bfdef1c0..5e082405e 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/EdgeView.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/EdgeView.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.views; +package org.eclipse.gemoc.sequential_addons.stategraph.views; import javafx.beans.binding.DoubleBinding; import javafx.beans.property.DoubleProperty; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java index e8aab11d2..53f1bf34f 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphRenderer.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.views; +package org.eclipse.gemoc.sequential_addons.stategraph.views; import java.util.ArrayList; import java.util.HashMap; @@ -8,11 +8,11 @@ import java.util.Set; import java.util.stream.Collectors; -import org.gemoc.sequential_addons.stategraph.layout.StateGraphLayoutCommand; -import org.gemoc.sequential_addons.stategraph.logic.DirectedGraph.Edge; -import org.gemoc.sequential_addons.stategraph.logic.StateGraph; -import org.gemoc.sequential_addons.stategraph.logic.StateVertex; -import org.gemoc.sequential_addons.stategraph.logic.alg.JohnsonSimpleCycles; +import org.eclipse.gemoc.sequential_addons.stategraph.layout.StateGraphLayoutCommand; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.DirectedGraph.Edge; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.StateGraph; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.StateVertex; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.alg.JohnsonSimpleCycles; import javafx.application.Platform; import javafx.scene.Group; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java index 9e1d3a106..8c5482062 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StateGraphViewPart.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.views; +package org.eclipse.gemoc.sequential_addons.stategraph.views; import java.util.Map; import java.util.Set; @@ -25,10 +25,10 @@ import org.eclipse.ui.IActionBars; import org.eclipse.gemoc.executionframework.ui.views.engine.EngineSelectionDependentViewPart; import org.eclipse.gemoc.executionframework.ui.views.engine.actions.AbstractEngineAction; -import org.gemoc.sequential_addons.stategraph.Activator; -import org.gemoc.sequential_addons.stategraph.layout.StateGraphLayoutCommand; -import org.gemoc.sequential_addons.stategraph.logic.StateGraph; -import org.gemoc.sequential_addons.stategraph.logic.StateVertex; +import org.eclipse.gemoc.sequential_addons.stategraph.Activator; +import org.eclipse.gemoc.sequential_addons.stategraph.layout.StateGraphLayoutCommand; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.StateGraph; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.StateVertex; import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine; import org.eclipse.gemoc.trace.gemoc.api.IMultiDimensionalTraceAddon; @@ -43,7 +43,7 @@ public class StateGraphViewPart extends EngineSelectionDependentViewPart { - public static final String ID = "org.gemoc.sequential_addons.multidimensional.timeline.views.timeline.StateGraphViewPart"; + public static final String ID = "org.eclipse.gemoc.sequential_addons.multidimensional.timeline.views.timeline.StateGraphViewPart"; private FXCanvas fxCanvas; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java index b9e7b502c..1dd7f53a5 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/StraightEdgeView.java @@ -1,4 +1,4 @@ -package org.gemoc.sequential_addons.stategraph.views; +package org.eclipse.gemoc.sequential_addons.stategraph.views; import javafx.beans.binding.DoubleBinding; import javafx.beans.property.DoubleProperty; diff --git a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/VertexView.java b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/VertexView.java index ed8f038a6..d4b07c882 100644 --- a/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/VertexView.java +++ b/trace/manager/plugins/org.eclipse.gemoc.sequential_addons.stategraph/src/org/eclipse/gemoc/sequential_addons/stategraph/views/VertexView.java @@ -1,6 +1,6 @@ -package org.gemoc.sequential_addons.stategraph.views; +package org.eclipse.gemoc.sequential_addons.stategraph.views; -import org.gemoc.sequential_addons.stategraph.logic.StateVertex; +import org.eclipse.gemoc.sequential_addons.stategraph.logic.StateVertex; import javafx.application.Platform; import javafx.geometry.Pos; diff --git a/trace/manager/pom.xml b/trace/manager/pom.xml index cc8516963..d4fb6cd96 100644 --- a/trace/manager/pom.xml +++ b/trace/manager/pom.xml @@ -17,9 +17,9 @@ - plugins/org.gemoc.sequential_addons.multidimensional.timeline - plugins/org.gemoc.sequential_addons.stategraph - plugins/org.gemoc.sequential_addons.diffviewer + plugins/org.eclipse.gemoc.sequential_addons.multidimensional.timeline + plugins/org.eclipse.gemoc.sequential_addons.stategraph + plugins/org.eclipse.gemoc.sequential_addons.diffviewer releng/org.eclipse.gemoc.trace.manager.feature diff --git a/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/feature.xml b/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/feature.xml index b29ea728e..06f5b7e46 100644 --- a/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/feature.xml +++ b/trace/manager/releng/org.eclipse.gemoc.trace.manager.feature/feature.xml @@ -17,19 +17,19 @@ Date: Fri, 16 Jun 2017 11:55:17 +0200 Subject: [PATCH 242/267] rename org.gemoc.execution.sequential* in org.eclipse.gemoc.execution.sequential* --- .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../icons/IconeGemocModel-10.png | Bin .../icons/IconeGemocModel-16.png | Bin .../icons/debugt_obj.png | Bin .../icons/gemoc-logo-12.png | Bin .../icons/gemoc-logo-16.png | Bin .../icons/gemoc-logo-32.png | Bin .../icons/stepbackinto_co.png | Bin .../icons/stepbackout_co.png | Bin .../icons/stepbackover_co.png | Bin .../plugin.xml | 0 .../pom.xml | 0 .../sequential/javaengine/ui/Activator.java | 0 .../ui/ModelingWorkbenchEarlyStartup.java | 0 .../ui/commands/GemocToggleBreakpointHandler.java | 0 .../ui/debug/GenericSequentialModelDebugger.java | 0 .../OmniscientGenericSequentialModelDebugger.xtend | 0 .../debug/sirius/action/GemocSequentialDebugAs.java | 0 .../GemocSequentialToggleBreakpointAction.java | 0 .../javaengine/ui/handlers/StepBackIntoHandler.java | 0 .../javaengine/ui/handlers/StepBackOutHandler.java | 0 .../javaengine/ui/handlers/StepBackOverHandler.java | 0 .../ui/launcher/GemocDebugModelPresentation.java | 0 .../javaengine/ui/launcher/GemocSourceLocator.java | 0 .../sequential/javaengine/ui/launcher/Launcher.java | 0 .../javaengine/ui/launcher/LauncherMessages.java | 0 .../ui/launcher/LauncherMessages.properties | 0 .../javaengine/ui/launcher/LauncherTabGroup.java | 0 .../ui/launcher/PlainK3DebugModelPresentation.java | 0 .../ui/launcher/SequentialRunConfiguration.java | 0 .../javaengine/ui/launcher/XtextLocator.java | 0 .../tabs/LaunchConfigurationBackendsTab.java | 0 .../tabs/LaunchConfigurationDataProcessingTab.java | 0 .../launcher/tabs/LaunchConfigurationMainTab.java | 0 .../ui/launcher/tabs/LaunchConfigurationTab.java | 0 .../GemocSequentialPropertyTester.java | 0 .../xtend-gen/.gitignore | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../pom.xml | 0 .../execution/sequential/javaengine/Activator.java | 0 .../javaengine/PlainK3ExecutionEngine.java | 0 .../javaengine/SequentialModelExecutionContext.java | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../JavaEngineTests.launch | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../javaengine/tests/JavaEngineTests.xtend | 0 .../javaengine/tests/languages/LegacyFSM.xtend | 0 .../javaengine/tests/languages/TFSM.xtend | 0 .../tests/wrapper/JavaEngineWrapper.xtend | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../plugin.xml | 0 .../pom.xml | 0 ...c.gemoc_language_workbench.sequential.xdsml.exsd | 0 .../SequentialLanguageDefinitionExtension.java | 0 .../SequentialLanguageDefinitionExtensionPoint.java | 0 .../.checkstyle | 0 .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../META-INF/MANIFEST.MF | 0 .../about.html | 0 .../build.properties | 0 .../icons/IconeGemocLanguage-10.png | Bin .../icons/IconeGemocLanguage-16.png | Bin .../icons/gemoc-logo-12.png | Bin .../icons/gemoc-logo-16.png | Bin .../icons/gemoc-logo-32.png | Bin .../icons/plus-16.png | Bin .../plugin.xml | 0 .../pom.xml | 0 .../sequential/javaxdsml/ide/ui/Activator.java | 0 ...dRemoveGemocSequentialLanguageNatureHandler.java | 0 .../ui/builder/GemocSequentialLanguageBuilder.java | 0 .../ui/builder/GemocSequentialLanguageNature.java | 0 .../ui/commands/CreateAnimatorProjectHandler.java | 0 .../ide/ui/commands/CreateDSAProjectHandler.java | 0 .../commands/CreateDomainModelProjectHandler.java | 0 .../commands/CreateSiriusEditorProjectHandler.java | 0 .../commands/CreateXtextEditorProjectHandler.java | 0 .../ide/ui/dialogs/SelectDSAIProjectDialog.java | 0 .../javaxdsml/ide/ui/editor/CreateDSAProposal.java | 0 .../ide/ui/editor/CreateEcoreProposal.java | 0 .../javaxdsml/ide/ui/editor/SelectDsaProposal.java | 0 .../ide/ui/editor/SelectEcoreProposal.java | 0 .../sequential/javaxdsml/ide/ui/menu/AddDSA.xtend | 0 .../ide/ui/templates/SequentialNewWizard.java | 0 .../ide/ui/templates/SequentialTemplate.java | 0 .../javaxdsml/ide/ui/wizards/CreateDSAWizard.java | 0 .../ui/wizards/CreateDSAWizardContextAction.java | 0 .../ui/wizards/CreateDSAWizardContextActionDSA.java | 0 .../wizards/CreateDSAWizardContextActionDSAK3.java | 0 .../ide/ui/wizards/CreateDSAWizardContextBase.java | 0 .../ide/ui/wizards/CreateDSAWizardPage.java | 0 .../CreateNewGemocSequentialLanguageProject.java | 0 .../java/$melangeFileName$.melange | 0 .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../pom.xml | 0 .../javaxdsml/tests/SequentialFsmTest.xtend | 0 .../tests-inputs-gen/.gitignore | 0 .../tests-inputs-gen/readme.md | 0 .../.gitignore | 0 .../build.properties | 0 .../feature.xml | 0 .../pom.xml | 0 .../.gitignore | 0 .../build.properties | 0 .../feature.xml | 0 .../pom.xml | 0 .../.gitignore | 0 .../build.properties | 0 .../feature.xml | 0 .../pom.xml | 0 137 files changed, 0 insertions(+), 0 deletions(-) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/.checkstyle (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/.classpath (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/.gitignore (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/.project (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/META-INF/MANIFEST.MF (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/about.html (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/build.properties (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/icons/IconeGemocModel-10.png (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/icons/IconeGemocModel-16.png (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/icons/debugt_obj.png (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/icons/gemoc-logo-12.png (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/icons/gemoc-logo-16.png (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/icons/gemoc-logo-32.png (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/icons/stepbackinto_co.png (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/icons/stepbackout_co.png (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/icons/stepbackover_co.png (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/plugin.xml (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/pom.xml (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/Activator.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/ModelingWorkbenchEarlyStartup.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialDebugAs.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/handlers/StepBackIntoHandler.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOutHandler.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOverHandler.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.properties (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/LauncherTabGroup.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/SequentialRunConfiguration.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationBackendsTab.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationTab.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui/src/org => org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse}/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine.ui => org.eclipse.gemoc.execution.sequential.javaengine.ui}/xtend-gen/.gitignore (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine => org.eclipse.gemoc.execution.sequential.javaengine}/.checkstyle (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine => org.eclipse.gemoc.execution.sequential.javaengine}/.classpath (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine => org.eclipse.gemoc.execution.sequential.javaengine}/.gitignore (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine => org.eclipse.gemoc.execution.sequential.javaengine}/.project (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine => org.eclipse.gemoc.execution.sequential.javaengine}/META-INF/MANIFEST.MF (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine => org.eclipse.gemoc.execution.sequential.javaengine}/about.html (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine => org.eclipse.gemoc.execution.sequential.javaengine}/build.properties (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine => org.eclipse.gemoc.execution.sequential.javaengine}/pom.xml (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine/src/org => org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse}/gemoc/execution/sequential/javaengine/Activator.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine/src/org => org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse}/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java (100%) rename java_execution/java_engine/plugins/{org.gemoc.execution.sequential.javaengine/src/org => org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse}/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java (100%) rename java_execution/java_engine/tests/{org.gemoc.execution.sequential.javaengine.tests => org.eclipse.gemoc.execution.sequential.javaengine.tests}/.classpath (100%) rename java_execution/java_engine/tests/{org.gemoc.execution.sequential.javaengine.tests => org.eclipse.gemoc.execution.sequential.javaengine.tests}/.project (100%) rename java_execution/java_engine/tests/{org.gemoc.execution.sequential.javaengine.tests => org.eclipse.gemoc.execution.sequential.javaengine.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename java_execution/java_engine/tests/{org.gemoc.execution.sequential.javaengine.tests => org.eclipse.gemoc.execution.sequential.javaengine.tests}/JavaEngineTests.launch (100%) rename java_execution/java_engine/tests/{org.gemoc.execution.sequential.javaengine.tests => org.eclipse.gemoc.execution.sequential.javaengine.tests}/META-INF/MANIFEST.MF (100%) rename java_execution/java_engine/tests/{org.gemoc.execution.sequential.javaengine.tests => org.eclipse.gemoc.execution.sequential.javaengine.tests}/build.properties (100%) rename java_execution/java_engine/tests/{org.gemoc.execution.sequential.javaengine.tests/src/org => org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse}/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend (100%) rename java_execution/java_engine/tests/{org.gemoc.execution.sequential.javaengine.tests/src/org => org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse}/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend (100%) rename java_execution/java_engine/tests/{org.gemoc.execution.sequential.javaengine.tests/src/org => org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse}/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend (100%) rename java_execution/java_engine/tests/{org.gemoc.execution.sequential.javaengine.tests/src/org => org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse}/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/.checkstyle (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/.classpath (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/.gitignore (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/.project (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/META-INF/MANIFEST.MF (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/about.html (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/build.properties (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/plugin.xml (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/pom.xml (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/schema/org.gemoc.gemoc_language_workbench.sequential.xdsml.exsd (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.api => org.eclipse.gemoc.execution.sequential.javaxdsml.api}/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtensionPoint.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/.checkstyle (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/.classpath (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/.gitignore (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/.project (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/META-INF/MANIFEST.MF (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/about.html (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/build.properties (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/icons/IconeGemocLanguage-10.png (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/icons/IconeGemocLanguage-16.png (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/icons/gemoc-logo-12.png (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/icons/gemoc-logo-16.png (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/icons/gemoc-logo-32.png (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/icons/plus-16.png (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/plugin.xml (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/pom.xml (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/Activator.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageNature.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateAnimatorProjectHandler.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDSAProjectHandler.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDomainModelProjectHandler.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateSiriusEditorProjectHandler.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateXtextEditorProjectHandler.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/dialogs/SelectDSAIProjectDialog.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectDsaProposal.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/menu/AddDSA.xtend (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialNewWizard.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizard.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextAction.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSA.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextBase.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardPage.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java (100%) rename java_execution/java_xdsml/plugins/{org.gemoc.execution.sequential.javaxdsml.ide.ui => org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui}/templates/SequentialLanguage/java/$melangeFileName$.melange (100%) rename java_execution/java_xdsml/tests/{org.gemoc.execution.sequential.javaxdsml.tests => org.eclipse.gemoc.execution.sequential.javaxdsml.tests}/.classpath (100%) rename java_execution/java_xdsml/tests/{org.gemoc.execution.sequential.javaxdsml.tests => org.eclipse.gemoc.execution.sequential.javaxdsml.tests}/.project (100%) rename java_execution/java_xdsml/tests/{org.gemoc.execution.sequential.javaxdsml.tests => org.eclipse.gemoc.execution.sequential.javaxdsml.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename java_execution/java_xdsml/tests/{org.gemoc.execution.sequential.javaxdsml.tests => org.eclipse.gemoc.execution.sequential.javaxdsml.tests}/META-INF/MANIFEST.MF (100%) rename java_execution/java_xdsml/tests/{org.gemoc.execution.sequential.javaxdsml.tests => org.eclipse.gemoc.execution.sequential.javaxdsml.tests}/build.properties (100%) rename java_execution/java_xdsml/tests/{org.gemoc.execution.sequential.javaxdsml.tests => org.eclipse.gemoc.execution.sequential.javaxdsml.tests}/pom.xml (100%) rename java_execution/java_xdsml/tests/{org.gemoc.execution.sequential.javaxdsml.tests => org.eclipse.gemoc.execution.sequential.javaxdsml.tests}/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend (100%) rename java_execution/java_xdsml/tests/{org.gemoc.execution.sequential.javaxdsml.tests => org.eclipse.gemoc.execution.sequential.javaxdsml.tests}/tests-inputs-gen/.gitignore (100%) rename java_execution/java_xdsml/tests/{org.gemoc.execution.sequential.javaxdsml.tests => org.eclipse.gemoc.execution.sequential.javaxdsml.tests}/tests-inputs-gen/readme.md (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaengine.feature => org.eclipse.gemoc.execution.sequential.javaengine.feature}/.gitignore (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaengine.feature => org.eclipse.gemoc.execution.sequential.javaengine.feature}/build.properties (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaengine.feature => org.eclipse.gemoc.execution.sequential.javaengine.feature}/feature.xml (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaengine.feature => org.eclipse.gemoc.execution.sequential.javaengine.feature}/pom.xml (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaengine.ui.feature => org.eclipse.gemoc.execution.sequential.javaengine.ui.feature}/.gitignore (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaengine.ui.feature => org.eclipse.gemoc.execution.sequential.javaengine.ui.feature}/build.properties (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaengine.ui.feature => org.eclipse.gemoc.execution.sequential.javaengine.ui.feature}/feature.xml (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaengine.ui.feature => org.eclipse.gemoc.execution.sequential.javaengine.ui.feature}/pom.xml (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaxdsml.feature => org.eclipse.gemoc.execution.sequential.javaxdsml.feature}/.gitignore (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaxdsml.feature => org.eclipse.gemoc.execution.sequential.javaxdsml.feature}/build.properties (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaxdsml.feature => org.eclipse.gemoc.execution.sequential.javaxdsml.feature}/feature.xml (100%) rename java_execution/releng/{org.gemoc.execution.sequential.javaxdsml.feature => org.eclipse.gemoc.execution.sequential.javaxdsml.feature}/pom.xml (100%) diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.checkstyle b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.checkstyle similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.checkstyle rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.checkstyle diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.classpath b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.classpath similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.classpath rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.classpath diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.gitignore b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.gitignore similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.gitignore rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.gitignore diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.project b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.project similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/.project rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.project diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/about.html b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/about.html similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/about.html rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/about.html diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/build.properties b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/build.properties similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/build.properties rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/build.properties diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/IconeGemocModel-10.png b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/IconeGemocModel-10.png similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/IconeGemocModel-10.png rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/IconeGemocModel-10.png diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/IconeGemocModel-16.png b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/IconeGemocModel-16.png similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/IconeGemocModel-16.png rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/IconeGemocModel-16.png diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/debugt_obj.png b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/debugt_obj.png similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/debugt_obj.png rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/debugt_obj.png diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-12.png b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-12.png similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-12.png rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-12.png diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-16.png b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-16.png similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-16.png rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-16.png diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-32.png b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-32.png similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-32.png rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/gemoc-logo-32.png diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/stepbackinto_co.png b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/stepbackinto_co.png similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/stepbackinto_co.png rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/stepbackinto_co.png diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/stepbackout_co.png b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/stepbackout_co.png similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/stepbackout_co.png rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/stepbackout_co.png diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/stepbackover_co.png b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/stepbackover_co.png similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/icons/stepbackover_co.png rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/icons/stepbackover_co.png diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/plugin.xml b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/plugin.xml similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/plugin.xml rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/plugin.xml diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/pom.xml b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/pom.xml similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/pom.xml rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/pom.xml diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/Activator.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/Activator.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/Activator.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/Activator.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/ModelingWorkbenchEarlyStartup.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/ModelingWorkbenchEarlyStartup.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/ModelingWorkbenchEarlyStartup.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/ModelingWorkbenchEarlyStartup.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialDebugAs.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialDebugAs.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialDebugAs.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialDebugAs.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/handlers/StepBackIntoHandler.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackIntoHandler.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/handlers/StepBackIntoHandler.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackIntoHandler.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOutHandler.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOutHandler.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOutHandler.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOutHandler.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOverHandler.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOverHandler.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOverHandler.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOverHandler.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.properties b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.properties similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.properties rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.properties diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/LauncherTabGroup.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherTabGroup.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/LauncherTabGroup.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherTabGroup.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/SequentialRunConfiguration.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/SequentialRunConfiguration.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/SequentialRunConfiguration.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/SequentialRunConfiguration.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationBackendsTab.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationBackendsTab.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationBackendsTab.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationBackendsTab.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationTab.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationTab.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationTab.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationTab.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/xtend-gen/.gitignore b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/xtend-gen/.gitignore similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/xtend-gen/.gitignore rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/xtend-gen/.gitignore diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.checkstyle b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.checkstyle similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.checkstyle rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.checkstyle diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.classpath b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.classpath similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.classpath rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.classpath diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.gitignore b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.gitignore similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.gitignore rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.gitignore diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.project b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.project similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/.project rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.project diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/about.html b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/about.html similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/about.html rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/about.html diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/build.properties b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/build.properties similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/build.properties rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/build.properties diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/pom.xml b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/pom.xml similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/pom.xml rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/pom.xml diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/Activator.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/Activator.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/Activator.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/Activator.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java similarity index 100% rename from java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine/src/org/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java rename to java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java diff --git a/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.classpath b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/.classpath similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.classpath rename to java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/.classpath diff --git a/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.project b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/.project similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.project rename to java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/.project diff --git a/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.settings/org.eclipse.jdt.core.prefs b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/.settings/org.eclipse.jdt.core.prefs rename to java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/JavaEngineTests.launch b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/JavaEngineTests.launch similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/JavaEngineTests.launch rename to java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/JavaEngineTests.launch diff --git a/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF rename to java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF diff --git a/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/build.properties b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/build.properties similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/build.properties rename to java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/build.properties diff --git a/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend rename to java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend diff --git a/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend rename to java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend diff --git a/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend rename to java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend diff --git a/java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend similarity index 100% rename from java_execution/java_engine/tests/org.gemoc.execution.sequential.javaengine.tests/src/org/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend rename to java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.checkstyle b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.checkstyle similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.checkstyle rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.checkstyle diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.classpath b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.classpath similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.classpath rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.classpath diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.gitignore b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.gitignore similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.gitignore rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.gitignore diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.project b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.project similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/.project rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.project diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/about.html b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/about.html similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/about.html rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/about.html diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/build.properties b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/build.properties similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/build.properties rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/build.properties diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/plugin.xml b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/plugin.xml similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/plugin.xml rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/plugin.xml diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/pom.xml b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/pom.xml similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/pom.xml rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/pom.xml diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/schema/org.gemoc.gemoc_language_workbench.sequential.xdsml.exsd b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/schema/org.gemoc.gemoc_language_workbench.sequential.xdsml.exsd similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/schema/org.gemoc.gemoc_language_workbench.sequential.xdsml.exsd rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/schema/org.gemoc.gemoc_language_workbench.sequential.xdsml.exsd diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtensionPoint.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtensionPoint.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtensionPoint.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtensionPoint.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.checkstyle b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.checkstyle similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.checkstyle rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.checkstyle diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.classpath b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.classpath similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.classpath rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.classpath diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.gitignore b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.gitignore similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.gitignore rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.gitignore diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.project b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.project similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/.project rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.project diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/about.html b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/about.html similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/about.html rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/about.html diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/build.properties b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/build.properties similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/build.properties rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/build.properties diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/IconeGemocLanguage-10.png b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/IconeGemocLanguage-10.png similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/IconeGemocLanguage-10.png rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/IconeGemocLanguage-10.png diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/IconeGemocLanguage-16.png b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/IconeGemocLanguage-16.png similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/IconeGemocLanguage-16.png rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/IconeGemocLanguage-16.png diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-12.png b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-12.png similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-12.png rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-12.png diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-16.png b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-16.png similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-16.png rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-16.png diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-32.png b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-32.png similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-32.png rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/gemoc-logo-32.png diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/plus-16.png b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/plus-16.png similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/icons/plus-16.png rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/icons/plus-16.png diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/pom.xml diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/Activator.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/Activator.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/Activator.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/Activator.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/AddRemoveGemocSequentialLanguageNatureHandler.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageBuilder.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageNature.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageNature.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageNature.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/builder/GemocSequentialLanguageNature.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateAnimatorProjectHandler.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateAnimatorProjectHandler.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateAnimatorProjectHandler.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateAnimatorProjectHandler.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDSAProjectHandler.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDSAProjectHandler.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDSAProjectHandler.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDSAProjectHandler.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDomainModelProjectHandler.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDomainModelProjectHandler.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDomainModelProjectHandler.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateDomainModelProjectHandler.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateSiriusEditorProjectHandler.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateSiriusEditorProjectHandler.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateSiriusEditorProjectHandler.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateSiriusEditorProjectHandler.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateXtextEditorProjectHandler.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateXtextEditorProjectHandler.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateXtextEditorProjectHandler.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/commands/CreateXtextEditorProjectHandler.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/dialogs/SelectDSAIProjectDialog.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/dialogs/SelectDSAIProjectDialog.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/dialogs/SelectDSAIProjectDialog.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/dialogs/SelectDSAIProjectDialog.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateDSAProposal.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/CreateEcoreProposal.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectDsaProposal.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectDsaProposal.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectDsaProposal.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectDsaProposal.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/editor/SelectEcoreProposal.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/menu/AddDSA.xtend b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/menu/AddDSA.xtend similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/menu/AddDSA.xtend rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/menu/AddDSA.xtend diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialNewWizard.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialNewWizard.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialNewWizard.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialNewWizard.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/templates/SequentialTemplate.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizard.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizard.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizard.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizard.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextAction.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextAction.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextAction.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextAction.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSA.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSA.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSA.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSA.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextActionDSAK3.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextBase.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextBase.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextBase.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardContextBase.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardPage.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardPage.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardPage.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateDSAWizardPage.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java diff --git a/java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/templates/SequentialLanguage/java/$melangeFileName$.melange b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/templates/SequentialLanguage/java/$melangeFileName$.melange similarity index 100% rename from java_execution/java_xdsml/plugins/org.gemoc.execution.sequential.javaxdsml.ide.ui/templates/SequentialLanguage/java/$melangeFileName$.melange rename to java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/templates/SequentialLanguage/java/$melangeFileName$.melange diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.classpath b/java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/.classpath similarity index 100% rename from java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.classpath rename to java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/.classpath diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.project b/java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/.project similarity index 100% rename from java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.project rename to java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/.project diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.settings/org.eclipse.jdt.core.prefs b/java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/.settings/org.eclipse.jdt.core.prefs rename to java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF b/java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF similarity index 100% rename from java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF rename to java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/META-INF/MANIFEST.MF diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/build.properties b/java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/build.properties similarity index 100% rename from java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/build.properties rename to java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/build.properties diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml b/java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/pom.xml similarity index 100% rename from java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/pom.xml rename to java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/pom.xml diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend b/java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend similarity index 100% rename from java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend rename to java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/src/org/gemoc/execution/sequential/javaxdsml/tests/SequentialFsmTest.xtend diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/.gitignore b/java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/.gitignore similarity index 100% rename from java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/.gitignore rename to java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/.gitignore diff --git a/java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/readme.md b/java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/readme.md similarity index 100% rename from java_execution/java_xdsml/tests/org.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/readme.md rename to java_execution/java_xdsml/tests/org.eclipse.gemoc.execution.sequential.javaxdsml.tests/tests-inputs-gen/readme.md diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/.gitignore b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.feature/.gitignore similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/.gitignore rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.feature/.gitignore diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/build.properties b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.feature/build.properties similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/build.properties rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.feature/build.properties diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/feature.xml b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.feature/feature.xml similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/feature.xml rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.feature/feature.xml diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/pom.xml b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.feature/pom.xml similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaengine.feature/pom.xml rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.feature/pom.xml diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/.gitignore b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.ui.feature/.gitignore similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/.gitignore rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.ui.feature/.gitignore diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/build.properties b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.ui.feature/build.properties similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/build.properties rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.ui.feature/build.properties diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/feature.xml b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.ui.feature/feature.xml similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/feature.xml rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.ui.feature/feature.xml diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/pom.xml b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.ui.feature/pom.xml similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaengine.ui.feature/pom.xml rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaengine.ui.feature/pom.xml diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/.gitignore b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaxdsml.feature/.gitignore similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/.gitignore rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaxdsml.feature/.gitignore diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/build.properties b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaxdsml.feature/build.properties similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/build.properties rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaxdsml.feature/build.properties diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/feature.xml b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaxdsml.feature/feature.xml similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/feature.xml rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaxdsml.feature/feature.xml diff --git a/java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/pom.xml b/java_execution/releng/org.eclipse.gemoc.execution.sequential.javaxdsml.feature/pom.xml similarity index 100% rename from java_execution/releng/org.gemoc.execution.sequential.javaxdsml.feature/pom.xml rename to java_execution/releng/org.eclipse.gemoc.execution.sequential.javaxdsml.feature/pom.xml From 9ebba96ff8d0a3ef3a9129947b52553a13c50e92 Mon Sep 17 00:00:00 2001 From: dvojtise Date: Fri, 16 Jun 2017 11:59:21 +0200 Subject: [PATCH 243/267] rename org.gemoc.execution.sequential* in org.eclipse.gemoc.execution.sequential* --- .../test/lib/impl/TestRunConfiguration.xtend | 2 +- .../sirius/command/AddDebugLayerHandler.java | 10 +- .../test/lib/WorkspaceTestHelper.xtend | 2 +- java_execution/.project | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 14 +-- .../plugin.xml | 100 +++++++++--------- .../pom.xml | 6 +- .../sequential/javaengine/ui/Activator.java | 6 +- .../ui/ModelingWorkbenchEarlyStartup.java | 2 +- .../GemocToggleBreakpointHandler.java | 4 +- .../debug/GenericSequentialModelDebugger.java | 4 +- ...scientGenericSequentialModelDebugger.xtend | 4 +- .../sirius/action/GemocSequentialDebugAs.java | 4 +- ...GemocSequentialToggleBreakpointAction.java | 4 +- .../ui/handlers/StepBackIntoHandler.java | 6 +- .../ui/handlers/StepBackOutHandler.java | 6 +- .../ui/handlers/StepBackOverHandler.java | 6 +- .../launcher/GemocDebugModelPresentation.java | 2 +- .../ui/launcher/GemocSourceLocator.java | 4 +- .../javaengine/ui/launcher/Launcher.java | 12 +-- .../ui/launcher/LauncherMessages.java | 4 +- .../ui/launcher/LauncherTabGroup.java | 6 +- .../PlainK3DebugModelPresentation.java | 4 +- .../launcher/SequentialRunConfiguration.java | 2 +- .../javaengine/ui/launcher/XtextLocator.java | 2 +- .../tabs/LaunchConfigurationBackendsTab.java | 2 +- .../LaunchConfigurationDataProcessingTab.java | 2 +- .../tabs/LaunchConfigurationMainTab.java | 8 +- .../launcher/tabs/LaunchConfigurationTab.java | 2 +- .../GemocSequentialPropertyTester.java | 6 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 8 +- .../pom.xml | 6 +- .../sequential/javaengine/Activator.java | 4 +- .../javaengine/PlainK3ExecutionEngine.java | 4 +- .../SequentialModelExecutionContext.java | 6 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 10 +- .../javaengine/tests/JavaEngineTests.xtend | 8 +- .../tests/languages/LegacyFSM.xtend | 2 +- .../javaengine/tests/languages/TFSM.xtend | 2 +- .../tests/wrapper/JavaEngineWrapper.xtend | 6 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../pom.xml | 6 +- ...SequentialLanguageDefinitionExtension.java | 2 +- ...ntialLanguageDefinitionExtensionPoint.java | 2 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- .../plugin.xml | 94 ++++++++-------- .../pom.xml | 6 +- .../javaxdsml/ide/ui/Activator.java | 4 +- ...eGemocSequentialLanguageNatureHandler.java | 6 +- .../GemocSequentialLanguageBuilder.java | 6 +- .../GemocSequentialLanguageNature.java | 4 +- .../CreateAnimatorProjectHandler.java | 2 +- .../ui/commands/CreateDSAProjectHandler.java | 6 +- .../CreateDomainModelProjectHandler.java | 2 +- .../CreateSiriusEditorProjectHandler.java | 2 +- .../CreateXtextEditorProjectHandler.java | 2 +- .../ui/dialogs/SelectDSAIProjectDialog.java | 2 +- .../ide/ui/editor/CreateDSAProposal.java | 6 +- .../ide/ui/editor/CreateEcoreProposal.java | 2 +- .../ide/ui/editor/SelectDsaProposal.java | 4 +- .../ide/ui/editor/SelectEcoreProposal.java | 2 +- .../javaxdsml/ide/ui/menu/AddDSA.xtend | 4 +- .../ide/ui/templates/SequentialNewWizard.java | 2 +- .../ide/ui/templates/SequentialTemplate.java | 6 +- .../ide/ui/wizards/CreateDSAWizard.java | 2 +- .../wizards/CreateDSAWizardContextAction.java | 2 +- .../CreateDSAWizardContextActionDSA.java | 4 +- .../CreateDSAWizardContextActionDSAK3.java | 4 +- .../wizards/CreateDSAWizardContextBase.java | 2 +- .../ide/ui/wizards/CreateDSAWizardPage.java | 4 +- ...eateNewGemocSequentialLanguageProject.java | 4 +- .../.project | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../pom.xml | 8 +- .../javaxdsml/tests/SequentialFsmTest.xtend | 2 +- java_execution/pom.xml | 20 ++-- .../feature.xml | 6 +- .../pom.xml | 6 +- .../feature.xml | 6 +- .../pom.xml | 6 +- .../feature.xml | 10 +- .../pom.xml | 6 +- .../category.xml | 12 +-- .../plugin.xml | 10 +- trace/generator/pom.xml | 2 +- trace/manager/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../trace/benchmark/api/IDebuggerHelper.java | 2 +- .../runconf/BenchmarkRunConfiguration.xtend | 4 +- .../BenchmarkExecutionModelContext.xtend | 2 +- .../trace/benchmark/utils/EngineHelper.java | 4 +- 96 files changed, 321 insertions(+), 321 deletions(-) diff --git a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend index c9361c42c..ee2a26002 100644 --- a/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend +++ b/framework/execution_framework/tests/org.eclipse.gemoc.executionframework.test.lib/src/org/eclipse/gemoc/executionframework/test/lib/impl/TestRunConfiguration.xtend @@ -77,7 +77,7 @@ class TestRunConfiguration implements IRunConfiguration { } override getDebugModelID() { - "org.gemoc.execution.sequential.javaengine.ui.debugModel" + "org.eclipse.gemoc.execution.sequential.javaengine.ui.debugModel" } override getModelEntryPoint() { diff --git a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java index de78a2ce2..ffd220212 100644 --- a/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java +++ b/framework/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/src/main/java/org/eclipse/gemoc/xdsmlframework/extensions/sirius/command/AddDebugLayerHandler.java @@ -135,7 +135,7 @@ public static void updateManifest(final IProject project){ ManifestChanger changer = new ManifestChanger(project); try { changer.addPluginDependency("org.eclipse.gemoc.executionframework.extensions.sirius"); - changer.addPluginDependency("org.gemoc.execution.sequential.javaengine.ui"); + changer.addPluginDependency("org.eclipse.gemoc.execution.sequential.javaengine.ui"); changer.commit(); } catch (BundleException | IOException | CoreException e) { Activator.getMessagingSystem().error(e.getMessage(), @@ -260,7 +260,7 @@ public static Layer createLayer(DiagramDescription description, .getToolFactory().createExternalJavaAction(); debugJavaAction.setName("Debug"); debugJavaAction - .setId("org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.gemocDebugAs"); + .setId("org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.gemocDebugAs"); debugJavaAction .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); InitialOperation initialOperation = ToolPackage.eINSTANCE @@ -278,7 +278,7 @@ public static Layer createLayer(DiagramDescription description, .getToolFactory().createExternalJavaAction(); toogleBreakpointJavaAction.setName("Toggle Gemoc breakpoint"); toogleBreakpointJavaAction - .setId("org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.GemocSequentialToggleBreakpointAction"); + .setId("org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.GemocSequentialToggleBreakpointAction"); toogleBreakpointJavaAction .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint.gif"); initialOperation = ToolPackage.eINSTANCE.getToolFactory() @@ -378,7 +378,7 @@ public static Layer createLayer(DiagramExtensionDescription descriptionExtension .getToolFactory().createExternalJavaAction(); debugJavaAction.setName("Debug"); debugJavaAction - .setId("org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.gemocDebugAs"); + .setId("org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.gemocDebugAs"); debugJavaAction .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/debug_exc.gif"); InitialOperation initialOperation = ToolPackage.eINSTANCE @@ -396,7 +396,7 @@ public static Layer createLayer(DiagramExtensionDescription descriptionExtension .getToolFactory().createExternalJavaAction(); toogleBreakpointJavaAction.setName("Toggle Gemoc breakpoint"); toogleBreakpointJavaAction - .setId("org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.GemocSequentialToggleBreakpointAction"); + .setId("org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.GemocSequentialToggleBreakpointAction"); toogleBreakpointJavaAction .setIcon("/org.eclipse.gemoc.executionframework.extensions.sirius/icons/breakpoint.gif"); initialOperation = ToolPackage.eINSTANCE.getToolFactory() diff --git a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend index 4880cee4d..d026b40b1 100644 --- a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend +++ b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend @@ -100,7 +100,7 @@ class WorkspaceTestHelper { static final String MELANGE_CMD_GENERATE_ADAPTERS = "fr.inria.diverse.melange.GenerateAdapters" static final String MELANGE_CMD_GENERATE_LANGUAGES = "fr.inria.diverse.melange.GenerateLanguages" static final String MELANGE_CMD_GENERATE_INTERFACES = "fr.inria.diverse.melange.GenerateInterfaces" - static final String MELANGE_CMD_GENERATE_TRACE = "org.gemoc.execution.sequential.javaxdsml.ide.ui.commands.GenerateTraceAddonPlugin" + static final String MELANGE_CMD_GENERATE_TRACE = "org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.commands.GenerateTraceAddonPlugin" static final String MELANGE_CMD_CLEAN_ALL = "fr.inria.diverse.melange.CleanAll" static final String MELANGE_EDITOR_ID = "fr.inria.diverse.melange.Melange" diff --git a/java_execution/.project b/java_execution/.project index fe94c2c72..c7d5d0a1f 100644 --- a/java_execution/.project +++ b/java_execution/.project @@ -1,6 +1,6 @@ - org.gemoc.execution.sequential.java.root + org.eclipse.gemoc.execution.sequential.java.root diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.project b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.project index c69f228ab..940f6bad7 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.project +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/.project @@ -1,6 +1,6 @@ - org.gemoc.execution.sequential.javaengine.ui + org.eclipse.gemoc.execution.sequential.javaengine.ui diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF index f88b59ef8..bb370f613 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Sequential Language Workbench UI -Bundle-SymbolicName: org.gemoc.execution.sequential.javaengine.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.execution.sequential.javaengine.ui;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.execution.sequential.javaengine.ui.Activator +Bundle-Activator: org.eclipse.gemoc.execution.sequential.javaengine.ui.Activator Bundle-Vendor: INRIA Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.debug.ui;bundle-version="3.8.2", @@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.sirius.diagram.ui;bundle-version="1.0.0", org.eclipse.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", org.eclipse.emf.edit.ui, - org.gemoc.execution.sequential.javaxdsml.api;bundle-version="0.1.0", + org.eclipse.gemoc.execution.sequential.javaxdsml.api;bundle-version="0.1.0", org.eclipse.gemoc.executionframework.ui, - org.gemoc.execution.sequential.javaengine;bundle-version="0.1.0", + org.eclipse.gemoc.execution.sequential.javaengine;bundle-version="0.1.0", org.eclipse.gemoc.trace.gemoc;bundle-version="1.0.0", org.eclipse.gemoc.trace.gemoc.api;bundle-version="1.0.0", fr.inria.diverse.k3.al.annotationprocessor.plugin, @@ -40,6 +40,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Export-Package: org.gemoc.execution.sequential.javaengine.ui, - org.gemoc.execution.sequential.javaengine.ui.debug, - org.gemoc.execution.sequential.javaengine.ui.launcher +Export-Package: org.eclipse.gemoc.execution.sequential.javaengine.ui, + org.eclipse.gemoc.execution.sequential.javaengine.ui.debug, + org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/plugin.xml b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/plugin.xml index 9edcdb6a7..7c2fcb0b6 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/plugin.xml +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/plugin.xml @@ -64,48 +64,48 @@ + sourceLocatorId="org.eclipse.gemoc.execution.sequential.javaengine.ui.sourceLocator"> + class="org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.GemocDebugModelPresentation" + id="org.eclipse.gemoc.execution.sequential.javaengine.ui.debugModel"> + class="org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.PlainK3DebugModelPresentation" + id="org.eclipse.gemoc.execution.sequential.javaengine.ui.debugModel"> + configTypeID="org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher" + id="org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.image"> + class="org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.LauncherTabGroup" + id="org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.tabGroup" + type="org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher"> @@ -113,14 +113,14 @@ + id="org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher"> @@ -128,7 +128,7 @@ - + @@ -150,19 +150,19 @@ + actionClass="org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.GemocSequentialDebugAs" + id="org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.gemocDebugAs"> + actionClass="org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.GemocSequentialToggleBreakpointAction" + id="org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.sirius.action.GemocSequentialToggleBreakpointAction"> @@ -203,30 +203,30 @@ @@ -236,7 +236,7 @@ allPopups="false" locationURI="popup:org.eclipse.gemoc.executionframework.engine.io.views.timeline.TimeLineView"> @@ -264,9 +264,9 @@ id="org.eclipse.debug.ui.main.toolbar" label="Debug"> @@ -276,9 +276,9 @@ @@ -288,9 +288,9 @@ @@ -305,7 +305,7 @@ + class="org.eclipse.gemoc.execution.sequential.javaengine.ui.ModelingWorkbenchEarlyStartup"> + class="org.eclipse.gemoc.execution.sequential.javaengine.ui.handlers.StepBackIntoHandler" + commandId="org.eclipse.gemoc.execution.sequential.javaengine.ui.commands.stepBackInto"> --> @@ -334,8 +334,8 @@ diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/pom.xml b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/pom.xml index befa024da..5cedafcf6 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/pom.xml +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/pom.xml @@ -4,12 +4,12 @@ ../../.. - org.gemoc.execution.sequential.java - org.gemoc.execution.sequential.java.root + org.eclipse.gemoc.execution.sequential.java + org.eclipse.gemoc.execution.sequential.java.root 2.3.0-SNAPSHOT - org.gemoc.execution.sequential.javaengine.ui + org.eclipse.gemoc.execution.sequential.javaengine.ui eclipse-plugin diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/Activator.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/Activator.java index aa61b6ab1..cfb03fab9 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/Activator.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/Activator.java @@ -8,14 +8,14 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui; +package org.eclipse.gemoc.execution.sequential.javaengine.ui; import java.util.function.Supplier; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; import org.eclipse.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices; import org.osgi.framework.BundleContext; @@ -28,7 +28,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.execution.sequential.javaengine.ui"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.execution.sequential.javaengine.ui"; //$NON-NLS-1$ public static final String DEBUG_MODEL_ID = PLUGIN_ID + ".debugModel"; //$NON-NLS-1$ diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/ModelingWorkbenchEarlyStartup.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/ModelingWorkbenchEarlyStartup.java index 7cf5ba24b..83fe76414 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/ModelingWorkbenchEarlyStartup.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/ModelingWorkbenchEarlyStartup.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui; +package org.eclipse.gemoc.execution.sequential.javaengine.ui; import org.eclipse.ui.IStartup; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java index 9d2dac6e8..257b9e17e 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/commands/GemocToggleBreakpointHandler.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.commands; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.commands; import java.util.Iterator; @@ -24,7 +24,7 @@ import org.eclipse.ui.ISelectionService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.HandlerUtil; -import org.gemoc.execution.sequential.javaengine.ui.launcher.Launcher; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.Launcher; import org.eclipse.gemoc.executionframework.debugger.GemocBreakpoint; import fr.inria.diverse.melange.resource.MelangeResource; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java index a985279ae..4be2478a3 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.debug; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.debug; import java.util.ArrayDeque; import java.util.ArrayList; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; -import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; +import org.eclipse.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; import org.eclipse.gemoc.executionframework.debugger.AbstractGemocDebugger; import org.eclipse.gemoc.executionframework.debugger.GemocBreakpoint; import org.eclipse.gemoc.executionframework.engine.core.EngineStoppedException; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend index 38ea09f4e..6826634ae 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ - package org.gemoc.execution.sequential.javaengine.ui.debug; + package org.eclipse.gemoc.execution.sequential.javaengine.ui.debug; import org.eclipse.gemoc.trace.commons.model.trace.Dimension import org.eclipse.gemoc.trace.commons.model.trace.MSE @@ -29,7 +29,7 @@ import org.eclipse.core.runtime.Status import org.eclipse.emf.ecore.EObject import org.eclipse.jface.dialogs.ErrorDialog import org.eclipse.xtext.naming.QualifiedName -import org.gemoc.execution.sequential.javaengine.ui.Activator +import org.eclipse.gemoc.execution.sequential.javaengine.ui.Activator import org.eclipse.gemoc.executionframework.engine.core.EngineStoppedException import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialDebugAs.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialDebugAs.java index 275598f46..ae9159e5c 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialDebugAs.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialDebugAs.java @@ -8,10 +8,10 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.sirius.action; -import org.gemoc.execution.sequential.javaengine.ui.launcher.Launcher; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.Launcher; import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.action.AbstractDebugAsAction; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java index 110fde3b5..01e1ccff9 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/debug/sirius/action/GemocSequentialToggleBreakpointAction.java @@ -8,9 +8,9 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.debug.sirius.action; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.sirius.action; -import org.gemoc.execution.sequential.javaengine.ui.Activator; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.Activator; import org.eclipse.gemoc.executionframework.debugger.ui.breakpoints.GemocToggleBreakpointAction; /** diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackIntoHandler.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackIntoHandler.java index 8913d4432..ef5a6085d 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackIntoHandler.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackIntoHandler.java @@ -8,15 +8,15 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.handlers; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.handlers; import java.util.function.Supplier; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.gemoc.execution.sequential.javaengine.ui.Activator; -import org.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.Activator; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; /** * Our sample handler extends AbstractHandler, an IHandler base class. diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOutHandler.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOutHandler.java index 58c0681c8..39c5f7307 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOutHandler.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOutHandler.java @@ -8,15 +8,15 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.handlers; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.handlers; import java.util.function.Supplier; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.gemoc.execution.sequential.javaengine.ui.Activator; -import org.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.Activator; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; /** * Our sample handler extends AbstractHandler, an IHandler base class. diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOverHandler.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOverHandler.java index cde6aa099..c98c09d07 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOverHandler.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/handlers/StepBackOverHandler.java @@ -8,15 +8,15 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.handlers; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.handlers; import java.util.function.Supplier; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.gemoc.execution.sequential.javaengine.ui.Activator; -import org.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.Activator; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; /** * Our sample handler extends AbstractHandler, an IHandler base class. diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java index f4093bd18..2bf46fed5 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocDebugModelPresentation.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java index c767aad48..e39852af7 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/GemocSourceLocator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; @@ -24,7 +24,7 @@ import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.xtext.resource.XtextResource; -import org.gemoc.execution.sequential.javaengine.ui.Activator; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.Activator; import fr.inria.diverse.melange.resource.MelangeResourceImpl; import org.eclipse.gemoc.trace.commons.model.trace.Step; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java index b378870c9..13492a8c7 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/Launcher.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher; import java.util.ArrayList; import java.util.HashMap; @@ -25,11 +25,11 @@ import org.eclipse.gemoc.executionframework.debugger.AnnotationMutableFieldExtractor; import org.eclipse.gemoc.executionframework.debugger.IntrospectiveMutableFieldExtractor; import org.eclipse.gemoc.commons.eclipse.ui.ViewHelper; -import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; -import org.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext; -import org.gemoc.execution.sequential.javaengine.ui.Activator; -import org.gemoc.execution.sequential.javaengine.ui.debug.GenericSequentialModelDebugger; -import org.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; +import org.eclipse.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; +import org.eclipse.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.Activator; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.GenericSequentialModelDebugger; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.debug.OmniscientGenericSequentialModelDebugger; import org.eclipse.gemoc.executionframework.debugger.AbstractGemocDebugger; import org.eclipse.gemoc.executionframework.debugger.IMutableFieldExtractor; import org.eclipse.gemoc.executionframework.engine.commons.EngineContextException; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.java index 97957bc1b..60ee2db93 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherMessages.java @@ -10,12 +10,12 @@ * BEA - Daniel R Somerfield - Bug 88939 * Remy Chi Jian Suen - Bug 221973 *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher; import org.eclipse.osgi.util.NLS; public class LauncherMessages extends NLS { - private static final String PACKAGE_NAME = "org.gemoc.execution.sequential.javaengine.ui.launcher.LauncherMessages";//$NON-NLS-1$ + private static final String PACKAGE_NAME = "org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.LauncherMessages";//$NON-NLS-1$ diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherTabGroup.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherTabGroup.java index 3369c3d55..8f07e97a4 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherTabGroup.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/LauncherTabGroup.java @@ -8,14 +8,14 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher; import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup; import org.eclipse.debug.ui.CommonTab; import org.eclipse.debug.ui.ILaunchConfigurationDialog; import org.eclipse.debug.ui.ILaunchConfigurationTab; -import org.gemoc.execution.sequential.javaengine.ui.launcher.tabs.LaunchConfigurationBackendsTab; -import org.gemoc.execution.sequential.javaengine.ui.launcher.tabs.LaunchConfigurationMainTab; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.tabs.LaunchConfigurationBackendsTab; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.tabs.LaunchConfigurationMainTab; public class LauncherTabGroup extends AbstractLaunchConfigurationTabGroup { diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java index 47a9b18e5..f41e56107 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java @@ -8,13 +8,13 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; -import org.gemoc.execution.sequential.javaengine.ui.Activator; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.Activator; import org.eclipse.gemoc.dsl.debug.DebugTarget; import org.eclipse.gemoc.dsl.debug.StackFrame; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/SequentialRunConfiguration.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/SequentialRunConfiguration.java index e7f3e6918..4ff2f1dbf 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/SequentialRunConfiguration.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/SequentialRunConfiguration.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java index 7a208ea62..c2036f9d7 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/XtextLocator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.nodemodel.INode; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationBackendsTab.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationBackendsTab.java index b8a7f1e2f..290f3309d 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationBackendsTab.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationBackendsTab.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher.tabs; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.tabs; import java.util.ArrayList; import java.util.Collection; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java index 49f4016c2..995c629e6 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationDataProcessingTab.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher.tabs; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.tabs; import java.util.ArrayList; import java.util.Collection; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index 459392280..a340542e3 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher.tabs; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.tabs; import java.lang.reflect.Method; import java.util.List; @@ -47,9 +47,9 @@ import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.gemoc.commons.eclipse.emf.URIHelper; import org.eclipse.gemoc.commons.eclipse.ui.dialogs.SelectAnyIFileDialog; -import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; -import org.gemoc.execution.sequential.javaengine.ui.Activator; -import org.gemoc.execution.sequential.javaengine.ui.launcher.LauncherMessages; +import org.eclipse.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.Activator; +import org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.LauncherMessages; import org.eclipse.gemoc.executionframework.engine.commons.MelangeHelper; import org.eclipse.gemoc.executionframework.engine.ui.commons.RunConfiguration; import org.eclipse.gemoc.executionframework.ui.utils.ENamedElementQualifiedNameLabelProvider; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationTab.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationTab.java index 304c61542..dc6cd53a9 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationTab.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationTab.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.launcher.tabs; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher.tabs; import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; import org.eclipse.swt.SWT; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java index e4e5a0a79..594181589 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/propertytesters/GemocSequentialPropertyTester.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine.ui.propertytesters; +package org.eclipse.gemoc.execution.sequential.javaengine.ui.propertytesters; import org.eclipse.core.expressions.PropertyTester; import org.eclipse.core.resources.IFile; @@ -17,8 +17,8 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtension; -import org.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtensionPoint; +import org.eclipse.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtension; +import org.eclipse.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtensionPoint; /** * Property tester for context launching menu. diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.project b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.project index d6facc159..0c102308c 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.project +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/.project @@ -1,6 +1,6 @@ - org.gemoc.execution.sequential.javaengine + org.eclipse.gemoc.execution.sequential.javaengine diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF index 8b40e68b5..a52371287 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Sequential Language Api -Bundle-SymbolicName: org.gemoc.execution.sequential.javaengine;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.execution.sequential.javaengine;singleton:=true Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, - org.gemoc.execution.sequential.javaxdsml.api, + org.eclipse.gemoc.execution.sequential.javaxdsml.api, org.eclipse.gemoc.executionframework.engine, fr.inria.diverse.k3.al.annotationprocessor.plugin, org.eclipse.jdt.core, @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.trace.commons.model;bundle-version="0.1.0", org.eclipse.gemoc.trace.commons;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.gemoc.execution.sequential.javaengine -Bundle-Activator: org.gemoc.execution.sequential.javaengine.Activator +Export-Package: org.eclipse.gemoc.execution.sequential.javaengine +Bundle-Activator: org.eclipse.gemoc.execution.sequential.javaengine.Activator Bundle-ActivationPolicy: lazy diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/pom.xml b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/pom.xml index 6a8070562..5dfaf839f 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/pom.xml +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/pom.xml @@ -4,11 +4,11 @@ ../../.. - org.gemoc.execution.sequential.java - org.gemoc.execution.sequential.java.root + org.eclipse.gemoc.execution.sequential.java + org.eclipse.gemoc.execution.sequential.java.root 2.3.0-SNAPSHOT - org.gemoc.execution.sequential.javaengine + org.eclipse.gemoc.execution.sequential.javaengine eclipse-plugin \ No newline at end of file diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/Activator.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/Activator.java index 5bad4aa1e..3467eafd1 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/Activator.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine; +package org.eclipse.gemoc.execution.sequential.javaengine; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; @@ -18,7 +18,7 @@ public class Activator implements BundleActivator { // The plug-in ID - public static final String PLUGIN_ID = "org.gemoc.execution.sequential.javaengine"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.gemoc.execution.sequential.javaengine"; //$NON-NLS-1$ private static BundleContext context; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java index 844c7ec16..287e1e479 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/PlainK3ExecutionEngine.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine; +package org.eclipse.gemoc.execution.sequential.javaengine; import java.io.IOException; import java.lang.reflect.Method; @@ -75,7 +75,7 @@ public class PlainK3ExecutionEngine extends AbstractCommandBasedSequentialExecut private List entryPointMethodParameters; private Class entryPointClass; - private static final String LAUNCH_CONFIGURATION_TYPE = "org.gemoc.execution.sequential.javaengine.ui.launcher"; + private static final String LAUNCH_CONFIGURATION_TYPE = "org.eclipse.gemoc.execution.sequential.javaengine.ui.launcher"; @Override public String engineKindName() { diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java index 7e9129623..700437b77 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine/src/org/eclipse/gemoc/execution/sequential/javaengine/SequentialModelExecutionContext.java @@ -8,10 +8,10 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaengine; +package org.eclipse.gemoc.execution.sequential.javaengine; -import org.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtension; -import org.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtensionPoint; +import org.eclipse.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtension; +import org.eclipse.gemoc.execution.sequential.javaxdsml.api.extensions.languages.SequentialLanguageDefinitionExtensionPoint; import org.eclipse.gemoc.executionframework.engine.commons.EngineContextException; import org.eclipse.gemoc.executionframework.engine.commons.ModelExecutionContext; import org.eclipse.gemoc.xdsmlframework.api.core.ExecutionMode; diff --git a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/.project b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/.project index 38705632c..81af0ddfb 100644 --- a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/.project +++ b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/.project @@ -1,6 +1,6 @@ - org.gemoc.execution.sequential.javaengine.tests + org.eclipse.gemoc.execution.sequential.javaengine.tests diff --git a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF index e55f06e43..eb18d1ce6 100644 --- a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF +++ b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Javaengine -Bundle-SymbolicName: org.gemoc.execution.sequential.javaengine.tests +Bundle-SymbolicName: org.eclipse.gemoc.execution.sequential.javaengine.tests Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.google.guava, @@ -9,13 +9,13 @@ Require-Bundle: com.google.guava, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, org.eclipse.gemoc.executionframework.test.lib;bundle-version="1.0.0", - org.gemoc.execution.sequential.javaengine;bundle-version="2.3.0", + org.eclipse.gemoc.execution.sequential.javaengine;bundle-version="2.3.0", org.eclipse.emf.common;bundle-version="2.12.0", org.junit;bundle-version="4.12.0", org.eclipse.gemoc.executionframework.engine;bundle-version="2.3.0", org.eclipse.gemoc.xdsmlframework.api;bundle-version="2.3.0", fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="3.2.1" -Export-Package: org.gemoc.execution.sequential.javaengine.tests, - org.gemoc.execution.sequential.javaengine.tests.languages, - org.gemoc.execution.sequential.javaengine.tests.wrapper +Export-Package: org.eclipse.gemoc.execution.sequential.javaengine.tests, + org.eclipse.gemoc.execution.sequential.javaengine.tests.languages, + org.eclipse.gemoc.execution.sequential.javaengine.tests.wrapper diff --git a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend index ba7df9858..50a163194 100644 --- a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend +++ b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/JavaEngineTests.xtend @@ -1,8 +1,8 @@ -package org.gemoc.execution.sequential.javaengine.tests +package org.eclipse.gemoc.execution.sequential.javaengine.tests -import org.gemoc.execution.sequential.javaengine.tests.languages.LegacyFSM -import org.gemoc.execution.sequential.javaengine.tests.languages.TFSM -import org.gemoc.execution.sequential.javaengine.tests.wrapper.JavaEngineWrapper +import org.eclipse.gemoc.execution.sequential.javaengine.tests.languages.LegacyFSM +import org.eclipse.gemoc.execution.sequential.javaengine.tests.languages.TFSM +import org.eclipse.gemoc.execution.sequential.javaengine.tests.wrapper.JavaEngineWrapper import org.eclipse.gemoc.executionframework.test.lib.impl.TestHelper import org.eclipse.gemoc.executionframework.test.lib.impl.TestModel import org.junit.Test diff --git a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend index 63e22d57f..d5dbc96c0 100644 --- a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend +++ b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/LegacyFSM.xtend @@ -1,4 +1,4 @@ -package org.gemoc.execution.sequential.javaengine.tests.languages +package org.eclipse.gemoc.execution.sequential.javaengine.tests.languages import org.eclipse.gemoc.executionframework.test.lib.ILanguageWrapper diff --git a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend index 257c63553..fd80ede4a 100644 --- a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend +++ b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/languages/TFSM.xtend @@ -1,4 +1,4 @@ -package org.gemoc.execution.sequential.javaengine.tests.languages +package org.eclipse.gemoc.execution.sequential.javaengine.tests.languages import org.eclipse.gemoc.executionframework.test.lib.ILanguageWrapper diff --git a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend index 7cad61107..2b50f5392 100644 --- a/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend +++ b/java_execution/java_engine/tests/org.eclipse.gemoc.execution.sequential.javaengine.tests/src/org/eclipse/gemoc/execution/sequential/javaengine/tests/wrapper/JavaEngineWrapper.xtend @@ -1,9 +1,9 @@ -package org.gemoc.execution.sequential.javaengine.tests.wrapper +package org.eclipse.gemoc.execution.sequential.javaengine.tests.wrapper import java.util.Set import org.eclipse.emf.common.util.URI -import org.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine -import org.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext +import org.eclipse.gemoc.execution.sequential.javaengine.PlainK3ExecutionEngine +import org.eclipse.gemoc.execution.sequential.javaengine.SequentialModelExecutionContext import org.eclipse.gemoc.executionframework.test.lib.IEngineWrapper import org.eclipse.gemoc.executionframework.test.lib.ILanguageWrapper import org.eclipse.gemoc.executionframework.test.lib.impl.TestRunConfiguration diff --git a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.project b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.project index 422ebf1e5..02e0bde2e 100644 --- a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.project +++ b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/.project @@ -1,6 +1,6 @@ - org.gemoc.execution.sequential.javaxdsml.api + org.eclipse.gemoc.execution.sequential.javaxdsml.api diff --git a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF index e9aafbb65..d43b5cb6f 100644 --- a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Gemoc Sequential Language Api -Bundle-SymbolicName: org.gemoc.execution.sequential.javaxdsml.api;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.execution.sequential.javaxdsml.api;singleton:=true Bundle-Version: 2.3.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.gemoc.xdsmlframework.api, @@ -9,5 +9,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.gemoc.executionframework.debugger;bundle-version="2.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.gemoc.execution.sequential.javaxdsml.api.extensions.languages +Export-Package: org.eclipse.gemoc.execution.sequential.javaxdsml.api.extensions.languages diff --git a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/pom.xml b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/pom.xml index 0f0edcbe5..b4b76462d 100644 --- a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/pom.xml +++ b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/pom.xml @@ -4,11 +4,11 @@ ../../.. - org.gemoc.execution.sequential.java - org.gemoc.execution.sequential.java.root + org.eclipse.gemoc.execution.sequential.java + org.eclipse.gemoc.execution.sequential.java.root 2.3.0-SNAPSHOT - org.gemoc.execution.sequential.javaxdsml.api + org.eclipse.gemoc.execution.sequential.javaxdsml.api eclipse-plugin \ No newline at end of file diff --git a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java index aadfe0e34..acfdba0a8 100644 --- a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java +++ b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtension.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaxdsml.api.extensions.languages; +package org.eclipse.gemoc.execution.sequential.javaxdsml.api.extensions.languages; import org.eclipse.core.runtime.CoreException; import org.eclipse.gemoc.executionframework.debugger.AbstractGemocDebuggerFactory; diff --git a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtensionPoint.java b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtensionPoint.java index 52edfe725..b304dbdcd 100644 --- a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtensionPoint.java +++ b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.api/src/org/gemoc/execution/sequential/javaxdsml/api/extensions/languages/SequentialLanguageDefinitionExtensionPoint.java @@ -8,7 +8,7 @@ * Contributors: * Inria - initial API and implementation *******************************************************************************/ -package org.gemoc.execution.sequential.javaxdsml.api.extensions.languages; +package org.eclipse.gemoc.execution.sequential.javaxdsml.api.extensions.languages; import java.util.Collection; diff --git a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.project b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.project index a33595749..02b84318e 100644 --- a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.project +++ b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/.project @@ -1,6 +1,6 @@ - org.gemoc.execution.sequential.javaxdsml.ide.ui + org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui diff --git a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF index f7583bf64..4b5a4909c 100644 --- a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF +++ b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Sequential Java XDSML UI -Bundle-SymbolicName: org.gemoc.execution.sequential.javaxdsml.ide.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui;singleton:=true Bundle-Version: 2.3.0.qualifier -Bundle-Activator: org.gemoc.execution.sequential.javaxdsml.ide.ui.Activator +Bundle-Activator: org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.Activator Bundle-Vendor: INRIA Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.gemoc.executionframework.ui, org.eclipse.gemoc.xdsmlframework.ide.ui, org.eclipse.gemoc.xdsmlframework.api, - org.gemoc.execution.sequential.javaxdsml.api, + org.eclipse.gemoc.execution.sequential.javaxdsml.api, org.eclipse.gemoc.xdsmlframework.extensions.sirius;bundle-version="0.1.0", org.eclipse.emf.ecore.xmi;bundle-version="2.10.2", org.eclipse.gemoc.executionframework.extensions.sirius;bundle-version="0.1.0", @@ -31,12 +31,12 @@ Require-Bundle: org.eclipse.core.runtime, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Export-Package: org.gemoc.execution.sequential.javaxdsml.ide.ui, - org.gemoc.execution.sequential.javaxdsml.ide.ui.builder, - org.gemoc.execution.sequential.javaxdsml.ide.ui.commands, - org.gemoc.execution.sequential.javaxdsml.ide.ui.dialogs, - org.gemoc.execution.sequential.javaxdsml.ide.ui.editor, - org.gemoc.execution.sequential.javaxdsml.ide.ui.menu, - org.gemoc.execution.sequential.javaxdsml.ide.ui.templates, - org.gemoc.execution.sequential.javaxdsml.ide.ui.wizards +Export-Package: org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui, + org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.builder, + org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.commands, + org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.dialogs, + org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.editor, + org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.menu, + org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.templates, + org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.wizards diff --git a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml index 2e71bdb4f..fb0ea586c 100644 --- a/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml +++ b/java_execution/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/plugin.xml @@ -8,7 +8,7 @@ + class="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.builder.GemocSequentialLanguageBuilder"> @@ -18,61 +18,61 @@ point="org.eclipse.core.resources.natures"> + class="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.builder.GemocSequentialLanguageNature"> + id="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageBuilder"> + id="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageNature.image" + natureId="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageNature"> @@ -89,7 +89,7 @@ allPopups="false" locationURI="popup:org.eclipse.ui.projectConfigure?after=additions"> @@ -105,7 +105,7 @@ type="org.eclipse.core.resources.IProject"> + value="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageNature"> @@ -113,7 +113,7 @@ @@ -130,7 +130,7 @@ + value="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.GemocSequentialLanguageNature"> @@ -147,7 +147,7 @@ id="GemocLanguage.menu" label="GEMOC Language"> @@ -161,14 +161,14 @@ + definitionId="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.definitions.IsSelectionInGemocSequentialLanguageProject"> @@ -182,14 +182,14 @@ + definitionId="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.definitions.IsSelectionInGemocSequentialLanguageProject"> @@ -203,14 +203,14 @@ + definitionId="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.definitions.IsSelectionInGemocSequentialLanguageProject"> @@ -224,14 +224,14 @@ + definitionId="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.definitions.IsSelectionInGemocSequentialLanguageProject"> @@ -245,7 +245,7 @@ + definitionId="org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui.definitions.IsSelectionInGemocSequentialLanguageProject"> @@ -267,7 +267,7 @@ @@ -304,7 +304,7 @@